Skip to content

Commit f7a3f64

Browse files
authored
Merge pull request #464 from Mu2e/legacy
Create extracted for legacy
2 parents 0448a44 + 97b9140 commit f7a3f64

24 files changed

Lines changed: 229 additions & 45 deletions
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Overrides for extracted
2+
services.GeometryService.inputFile: "Production/JobConfig/cosmic/geom_cosmic_extracted.txt"
3+
services.GeometryService.bFieldFile: "Offline/Mu2eG4/geom/bfgeom_no_field.txt"
4+

JobConfig/cosmic/ExtractedCORSIKA.fcl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ physics.producers.generate : {
1212
targetBoxYmax : 9880
1313
}
1414
outputs.PrimaryOutput.fileName : "dts.owner.CosmicCORSIKAExtracted.version.sequencer.art"
15-
services.GeometryService.inputFile: "Production/JobConfig/cosmic/geom_cosmic_extracted.txt"
16-
services.GeometryService.bFieldFile: "Offline/Mu2eG4/geom/bfgeom_no_field.txt"
15+
#include "Production/JobConfig/common/epilog_Extracted.fcl"

JobConfig/cosmic/ExtractedCRY.fcl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ physics.producers.generate : {
77
inputFile : "Production/JobConfig/cosmic/extractedCRYconfig.txt"
88
}
99
outputs.PrimaryOutput.fileName : "dts.owner.CosmicCRYExtracted.version.sequencer.art"
10-
services.GeometryService.inputFile: "Production/JobConfig/cosmic/geom_cosmic_extracted.txt"
11-
services.GeometryService.bFieldFile: "Offline/Mu2eG4/geom/bfgeom_no_field.txt"
1210
physics.filters.PrimaryFilter.CrvSteps: [ "CrvSteps" ]
1311
physics.producers.g4run.physics.minRangeCut : 10
1412
physics.producers.g4run.physics.minRangeRegionCuts: { CalorimeterMother : 0.1 TrackerMother : 0.001 CRSmother_CRV_EX : 0.1 CRSmother_CRV_T1: 0.1 CRSmother_CRV_T2: 0.1 garageFakeDS3Vacuum: 0.01} // {RegionName : mm }
1513
physics.producers.g4run.TrajectoryControl.defaultMinPointDistance: 15
14+
#include "Production/JobConfig/common/epilog_Extracted.fcl"

JobConfig/cosmic/geom_cosmic_extracted.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#include "Offline/Mu2eG4/geom/geom_common_extracted.txt"
2-
3-
// Cosmis s1 samples for CD3 were generated with the TDR target geometry.
4-
// Keep using it for the subsequent stages.
1+
#include "Offline/Mu2eG4/geom/geom_common_extracted_MDC2020.txt"
52

63
double world.minimalMargin.xmin = 500000;
74
double world.minimalMargin.xmax = 500000;

JobConfig/digitize/Extracted.fcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# configure Extracted digitization
22
#include "Production/JobConfig/digitize/NoField.fcl"
33
# use extracted geometry
4-
services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_extracted.txt"
4+
#include "Production/JobConfig/common/epilog_Extracted.fcl"
55
# override CRV lookup tables, photon yields, etc. for the extracted position
66
#include "Offline/CRVResponse/fcl/epilog_extracted.fcl"

JobConfig/digitize/OnSpill_epilog.fcl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
# It produces functionally equivalent output as the standard module but is slower, so don't use this script for timing studies
33
# add the trigger MC matching to the appropriate paths
44
# apr
5-
physics.apr_highP : [@sequence::physics.apr_highP, TTAprKSFMC ]
6-
physics.apr_highP_stopTarg : [@sequence::physics.apr_highP_stopTarg, TTAprKSFMC ]
7-
physics.apr_lowP_stopTarg : [@sequence::physics.apr_lowP_stopTarg, TTAprKSFMC ]
8-
physics.apr_highP_stopTarg_multiTrk : [@sequence::physics.apr_highP_stopTarg_multiTrk, TTAprKSFMC ]
5+
physics.apr_TrkDe_80m70p : [@sequence::physics.apr_TrkDe_80m70p, TTAprKSFMC ]
6+
physics.apr_TrkDe_80m70p_D0200 : [@sequence::physics.apr_TrkDe_80m70p_D0200, TTAprKSFMC ]
7+
physics.apr_TrkDe_50_D0200 : [@sequence::physics.apr_TrkDe_50_D0200, TTAprKSFMC ]
8+
physics.apr_TwoTrkDe_80m70p_D0200 : [@sequence::physics.apr_TwoTrkDe_80m70p_D0200, TTAprKSFMC ]
99
# tpr
10-
physics.tprDe_highP : [@sequence::physics.tprDe_highP, TTTprDeKSFMC ]
11-
physics.tprDe_highP_stopTarg : [@sequence::physics.tprDe_highP_stopTarg, TTTprDeKSFMC ]
12-
physics.tprDe_lowP_stopTarg : [@sequence::physics.tprDe_lowP_stopTarg, TTTprDeKSFMC ]
10+
physics.tpr_TrkDe_80m70p : [@sequence::physics.tpr_TrkDe_80m70p, TTTprDeKSFMC ]
11+
physics.tpr_TrkDe_80m70p_D0200 : [@sequence::physics.tpr_TrkDe_80m70p_D0200, TTTprDeKSFMC ]
12+
physics.tpr_TrkDe_50_D0200 : [@sequence::physics.tpr_TrkDe_50_D0200, TTTprDeKSFMC ]
1313
# cpr
14-
physics.cprDe_highP : [@sequence::physics.cprDe_highP, TTCprDeKSFMC ]
15-
physics.cprDe_highP_stopTarg : [@sequence::physics.cprDe_highP_stopTarg, TTCprDeKSFMC ]
16-
physics.cprDe_lowP_stopTarg : [@sequence::physics.cprDe_lowP_stopTarg, TTCprDeKSFMC ]
14+
physics.cpr_TrkDe_80m70p : [@sequence::physics.cpr_TrkDe_80m70p, TTCprDeKSFMC ]
15+
physics.cpr_TrkDe_80m70p_D0200 : [@sequence::physics.cpr_TrkDe_80m70p_D0200, TTCprDeKSFMC ]
16+
physics.cpr_TrkDe_50_D0200 : [@sequence::physics.cpr_TrkDe_50_D0200, TTCprDeKSFMC ]
1717
# mpr
18-
physics.mprDe_highP_stopTarg : [@sequence::physics.mprDe_highP_stopTarg, TTMprDeKSFMC ]
18+
physics.mpr_TrkDe_80m70p_D0200 : [@sequence::physics.mpr_TrkDe_80m70p_D0200, TTMprDeKSFMC ]

JobConfig/digitize/prolog.fcl

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "Offline/fcl/standardServices.fcl"
77
#include "Offline/TrackerMC/fcl/prolog.fcl"
88
#include "Offline/CaloMC/fcl/prolog.fcl"
9-
#include "Offline/CRVResponse/fcl/prolog.fcl"
9+
#include "Offline/CRVResponse/fcl/prolog_v11.fcl"
1010
#include "Offline/Filters/fcl/prolog.fcl"
1111
#include "Offline/Compression/fcl/prolog.fcl"
1212
#include "Offline/CommonMC/fcl/prolog.fcl"
@@ -54,19 +54,23 @@ Digitize: {
5454
# Trigger MC matching instances for each helix algorithm
5555
TTAprKSFMC : {
5656
@table::CommonMC.TTSelectRecoMC
57-
KalSeedCollections : [ "TTAprKSF" ]
57+
ComboHitCollection : "TrigFlagPH"
58+
KalSeedCollections : [ "TrigAprKSF" ]
5859
}
5960
TTTprDeKSFMC : {
6061
@table::CommonMC.TTSelectRecoMC
61-
KalSeedCollections : [ "TTKSFDe" ]
62+
ComboHitCollection : "TrigFlagPH"
63+
KalSeedCollections : [ "TrigKSFDe" ]
6264
}
6365
TTMprDeKSFMC : {
6466
@table::CommonMC.TTSelectRecoMC
65-
KalSeedCollections : [ "TTKSFMprDe" ]
67+
ComboHitCollection : "TrigFlagPH"
68+
KalSeedCollections : [ "TrigKSFMprDe" ]
6669
}
6770
TTCprDeKSFMC : {
6871
@table::CommonMC.TTSelectRecoMC
69-
KalSeedCollections : [ "TTCalSeedFitDe" ]
72+
ComboHitCollection : "TrigFlagPH"
73+
KalSeedCollections : [ "TrigCalSeedFitDe" ]
7074
}
7175
}
7276
filters : {
@@ -140,7 +144,7 @@ Digitize: {
140144
"keep art::TriggerResults_*_*_*",
141145
"keep mu2e::CaloClusters_*_*_*",
142146
"keep mu2e::TriggerInfo_*_*_*",
143-
"keep mu2e::KalSeeds_TT*_*_*",
147+
"keep mu2e::KalSeeds_Trig*_*_*",
144148
"keep mu2e::KalSeedMCs_TT*KSFMC_*_*",
145149
"keep mu2e::KalSeedmu2e::KalSeedMCvoidart::Assns_TT*KSFMC_*_*",
146150
"keep mu2e::RecoCount_TT*KSFMC_*_*"
@@ -184,10 +188,10 @@ Digitize: {
184188
#
185189
# trigger selections that can be used to finalize the triggerOutput selection, depending on digitization mode and source
186190
#
187-
SignalTriggers : [ "cpr*_highP*", "apr_highP*" ] # active trigger lines selecting events with 'high' momentum tracks with KinKal fits
188-
TrkTriggers : [ "*_lowP_*","*_ipa_*", "cst*" ] # events useful only for tracker calibration
189-
CaloTriggers : [ "calo*" ] # events useful only for calo calibration
190-
DiagTriggers : [ "minBias_*" , "*Helix*M", "*Helix*P"] # events useful for trigger diagnostics
191+
SignalTriggers : [ "cpr_Trk*_80*", "apr_Trk*_80*" ] # active trigger lines selecting events with 'high' momentum tracks with KinKal fits
192+
TrkTriggers : [ "*_TrkDe_50*","*_IPA*", "cst_*" ] # events useful only for tracker calibration
193+
CaloTriggers : [ "calo_*" ] # events useful only for calo calibration
194+
DiagTriggers : [ "minBias_*" , "*_Hlx*"] # events useful for trigger diagnostics
191195

192196
EndSequence : [digiCompressionCheck]
193197
}
@@ -214,7 +218,7 @@ Digitize.Outputs : {
214218
}
215219
Digitize.EndPath : [ @sequence::Digitize.EndSequence, TriggeredOutput, TriggerableOutput ]
216220
# override the trigger digitization sequence
217-
TrigRecoSequences.cfoDataGen : [ @sequence::Digitize.DigitizeSequence, processCFOData ]
221+
TrigRecoSequences.cfoDataGen : [ @sequence::Digitize.DigitizeSequence, ProcessCFOData ]
218222
END_PROLOG
219223
# Trigger Sequences have to come after
220224
#include "mu2e-trig-config/core/trigSequences.fcl"

JobConfig/mixing/prolog.fcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Mixing : {
9393
Mixing.PileupMixSequence : [ PBISim, DTSFilter, @sequence::Mixing.StepMixSequence, @sequence::Mixing.StepFilterSequence ]
9494
Mixing.MixSequence : [ @sequence::Mixing.PileupMixSequence, @sequence::Digitize.DigitizeSequence ]
9595
# override the Trigger 'PrepareDigis' sequence; the mixers must preceed the digi making
96-
TrigRecoSequences.cfoDataGen: [ @sequence::Mixing.PileupMixSequence, @sequence::Digitize.DigitizeSequence, processCFOData ]
96+
TrigRecoSequences.cfoDataGen: [ @sequence::Mixing.PileupMixSequence, @sequence::Digitize.DigitizeSequence, ProcessCFOData ]
9797
#
9898
# The following is used to guarantee consistency when filtering pileup when mixing a primary that could also be part of pileup
9999
#

JobConfig/pileup/prolog.fcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
#include "Offline/TrackerMC/fcl/prolog.fcl"
55
#include "Offline/CaloMC/fcl/prolog.fcl"
6-
#include "Offline/CRVResponse/fcl/prolog.fcl"
6+
#include "Offline/CRVResponse/fcl/prolog_v11.fcl"
77
#include "Offline/Filters/fcl/prolog.fcl"
88
#include "Offline/Compression/fcl/prolog.fcl"
99
#include "Production/JobConfig/beam/prolog.fcl"
@@ -344,4 +344,4 @@ Pileup.filters.DetStepFilter : {
344344
}
345345
}
346346

347-
END_PROLOG
347+
END_PROLOG

JobConfig/primary/prolog.fcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
#include "Offline/TrackerMC/fcl/prolog.fcl"
55
#include "Offline/CaloMC/fcl/prolog.fcl"
6-
#include "Offline/CRVResponse/fcl/prolog.fcl"
6+
#include "Offline/CRVResponse/fcl/prolog_v11.fcl"
77
#include "Offline/Filters/fcl/prolog.fcl"
88
#include "Offline/Compression/fcl/prolog.fcl"
99
#include "Offline/CommonMC/fcl/prolog.fcl"

0 commit comments

Comments
 (0)