Skip to content

Commit 2377098

Browse files
AndrewEdmonds11AndrewEdmonds11
committed
First pass from Sonnet on this
1 parent 1694b7f commit 2377098

17 files changed

Lines changed: 612 additions & 709 deletions

‎fcl/CompareDeTracks.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ physics.end_paths : [ EndPath ]
5555
physics.producers.TrkQualDe.KalSeedPtrCollection : "MergeKKDeCalib"
5656
services.TimeTracker.printSummary: true
5757
services.TFileService.fileName: "nts.owner.EventNtupleDeCalib.version.sequence.root"
58-
physics.analyzers.EventNtuple.KalSeedMCAssns : @nil # module which created the MC truth matching (KalSeedMC). including both primary and 2ndary tracks.
58+
physics.analyzers.EventNtuple.trk.mc.kalSeedMCAssns : @nil # module which created the MC truth matching (KalSeedMC). including both primary and 2ndary tracks.
5959

‎fcl/TrkAnaLineFromDigis.fcl‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,14 @@ physics :
3838
@table::EventNtupleMaker
3939
FitType : KinematicLine
4040
diagLevel : 2
41-
FillMCInfo : true
42-
FillTrkPIDInfo : false
43-
FillHitInfo : true
4441
FillTriggerInfo : false
45-
branches : [
42+
trk.branches : [
4643
{ input: "KKLine"
4744
branch : "kl"
48-
options : { fillMC : true genealogyDepth : 5 }
45+
options : { genealogyDepth : 5 }
4946
}
5047
]
51-
ExtraMCStepCollectionTags : [ "compressDigiMCs:protonabsorber", "compressDigiMCs:stoppingtarget" ]
48+
trk.mc.extraMCStepTags : [ "compressDigiMCs:protonabsorber", "compressDigiMCs:stoppingtarget" ]
5249
}
5350

5451
@table::TrkAnaReco.analyzers

‎fcl/from_dig-OnSpill.fcl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,44 @@ physics : {
1616
# apr
1717
EventNtupleTTMCApr : {
1818
@table::EventNtupleMakerTTMC
19-
branches : [ {
19+
trk.branches : [ {
2020
@table::TTMCBranch
2121
input : "MergeTTApr"
2222
} ]
23-
KalSeedMCAssns: "TTAprKSFMC"
23+
trk.mc.kalSeedMCAssns : "TTAprKSFMC"
2424
RecoCountTag : "TTAprKSFMC"
2525
SelectEvents : [ "Digitize:apr_highP*" ]
2626
}
2727
# tpr
2828
EventNtupleTTMCTpr : {
2929
@table::EventNtupleMakerTTMC
30-
branches : [ {
30+
trk.branches : [ {
3131
@table::TTMCBranch
3232
input : "MergeTTTpr"
3333
} ]
34-
KalSeedMCAssns: "TTTprDeKSFMC"
34+
trk.mc.kalSeedMCAssns : "TTTprDeKSFMC"
3535
RecoCountTag : "TTTprDeKSFMC"
3636
SelectEvents : [ "Digitize:tprDe_highP*" ]
3737
}
3838
# cpr
3939
EventNtupleTTMCCpr : {
4040
@table::EventNtupleMakerTTMC
41-
branches : [ {
41+
trk.branches : [ {
4242
@table::TTMCBranch
4343
input : "MergeTTCpr"
4444
} ]
45-
KalSeedMCAssns: "TTCprDeKSFMC"
45+
trk.mc.kalSeedMCAssns : "TTCprDeKSFMC"
4646
RecoCountTag : "TTCprDeKSFMC"
4747
SelectEvents : [ "Digitize:cprDe_highP*" ]
4848
}
4949
# mpr
5050
EventNtupleTTMCMpr : {
5151
@table::EventNtupleMakerTTMC
52-
branches : [ {
52+
trk.branches : [ {
5353
@table::TTMCBranch
5454
input : "MergeTTMpr"
5555
} ]
56-
KalSeedMCAssns: "TTMprDeKSFMC"
56+
trk.mc.kalSeedMCAssns : "TTMprDeKSFMC"
5757
RecoCountTag : "TTMprDeKSFMC"
5858
SelectEvents : [ "Digitize:mprDe_highP*" ]
5959
}

‎fcl/from_dig-calo.fcl‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,35 @@ physics.end_paths : [ e1 ]
2424

2525
#Tags to fill PBI information
2626
#physics.analyzers.EventNtuple.PBTTag : "EWMProducer"
27-
#physics.analyzers.EventNtuple.PBTMCTag : "EWMProducer"
27+
#physics.analyzers.EventNtuple.mc.PBTMCTag : "EWMProducer"
2828
physics.analyzers.EventNtuple.RecoCountTag : ""
2929
physics.analyzers.EventNtuple.PBTTag : ""
30-
physics.analyzers.EventNtuple.PBTMCTag : ""
31-
physics.analyzers.EventNtuple.SimParticlesTag : "CaloShowerStepMaker"
30+
physics.analyzers.EventNtuple.mc.PBTMCTag : ""
31+
physics.analyzers.EventNtuple.mc.simParticlesTag : "CaloShowerStepMaker"
3232
#Turn off tracker and other branches
33-
physics.analyzers.EventNtuple.branches : [ ]
34-
physics.analyzers.EventNtuple.FillTrkQual : false
33+
physics.analyzers.EventNtuple.trk.branches : [ ]
34+
physics.analyzers.EventNtuple.trk.fillTrkQual : false
3535
physics.analyzers.EventNtuple.FillTriggerInfo : false
36-
physics.analyzers.EventNtuple.FillHitInfo : false
37-
physics.analyzers.EventNtuple.FillCRVCoincs : false
36+
physics.analyzers.EventNtuple.trk.fillHits : false
37+
physics.analyzers.EventNtuple.crv.fillCoincs : false
3838

3939
#Toggle calo branches
40-
physics.analyzers.EventNtuple.FillCaloClusters : false
41-
physics.analyzers.EventNtuple.FillCaloHits : false
42-
physics.analyzers.EventNtuple.FillCaloRecoDigis : false
43-
physics.analyzers.EventNtuple.FillCaloDigis : true
40+
physics.analyzers.EventNtuple.calo.fillClusters : false
41+
physics.analyzers.EventNtuple.calo.fillHits : false
42+
physics.analyzers.EventNtuple.calo.fillRecoDigis : false
43+
physics.analyzers.EventNtuple.calo.fillDigis : true
4444

45-
physics.analyzers.EventNtuple.CaloShowerSimTag : "CaloShowerROMaker"
46-
physics.analyzers.EventNtuple.CaloDigisTag : "CaloDigiMaker"
45+
physics.analyzers.EventNtuple.calo.mc.showerSimTag : "CaloShowerROMaker"
46+
physics.analyzers.EventNtuple.calo.digisTag : "CaloDigiMaker"
4747

4848
#Toggle calo MC branches
49-
physics.analyzers.EventNtuple.FillMCInfo : false
50-
physics.analyzers.EventNtuple.FillCaloMC : true
51-
physics.analyzers.EventNtuple.FillCaloClustersMC : false
52-
physics.analyzers.EventNtuple.FillCaloHitsMC : false
53-
physics.analyzers.EventNtuple.FillCaloSimInfos : false
54-
physics.analyzers.EventNtuple.FillCaloDigiSimInfos : true
55-
physics.analyzers.EventNtuple.FillCaloDigisMC : true
49+
# mc.fill is false so tracker/CRV MC and evtinfomc are disabled;
50+
# calo MC is controlled independently via calo.mc.fill (independent of mc.fill)
51+
physics.analyzers.EventNtuple.mc.fill : false
52+
physics.analyzers.EventNtuple.calo.mc.fillClusters : false
53+
physics.analyzers.EventNtuple.calo.mc.fillHits : false
54+
physics.analyzers.EventNtuple.calo.mc.fillSim : false
55+
physics.analyzers.EventNtuple.calo.mc.fillDigiSim : true
56+
physics.analyzers.EventNtuple.calo.mc.fillDigis : true
5657

5758
services.TFileService.fileName: "nts.owner.description.version.sequencer.root"

‎fcl/from_mcs-Run1B.fcl‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
# we start from mcs-extracted since Run-1B wants the straight line track fit
22
#include "EventNtuple/fcl/from_mcs-extracted.fcl"
33

4-
physics.analyzers.EventNtuple.FillMCInfo : true
5-
physics.analyzers.EventNtuple.StepPointMCTags : [ "compressRecoMCs:virtualdetector" ] # we add the mcsteps_virtualdetector branch
6-
physics.analyzers.EventNtuple.FillTimeClusterInfo : true
7-
physics.analyzers.EventNtuple.TimeClustersTag : "SimpleTimeCluster" # Store time clusters for straight line track finding
8-
physics.analyzers.EventNtuple.FillCaloMC : true
9-
physics.analyzers.EventNtuple.FillCaloClustersMC : true
10-
physics.analyzers.EventNtuple.FillCaloSimInfos : true
4+
physics.analyzers.EventNtuple.trk.mc.stepPointMCTags : [ "compressRecoMCs:virtualdetector" ] # we add the mcsteps_virtualdetector branch
5+
physics.analyzers.EventNtuple.trk.fillTimeClusters : true
6+
physics.analyzers.EventNtuple.trk.timeClustersTag : "SimpleTimeCluster" # Store time clusters for straight line track finding
117
services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common.txt" # we can use the standard geometry
128

139
physics.EventNtupleEndPath : [ @sequence::EventNtuple.EndPath ] # add back genCountLogger

‎fcl/from_mcs-ceSimRecoVal.fcl‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#include "EventNtuple/fcl/from_mcs-ceSimReco.fcl"
22

3-
physics.analyzers.EventNtuple.branches[0].options.fillHits : true
4-
physics.analyzers.EventNtuple.FillHitInfo : true
5-
physics.analyzers.EventNtuple.FillHitCalibInfo : true
3+
physics.analyzers.EventNtuple.trk.fillHitCalibs : true
64
physics.analyzers.EventNtuple.FillTriggerInfo : true
75
physics.analyzers.EventNtuple.TriggerProcessName : "ceTrig"

‎fcl/from_mcs-extracted.fcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "EventNtuple/fcl/from_mcs-mockdata.fcl"
22

33
physics.EventNtuplePath : [ @sequence::EventNtuple.PathExt ] # path for extracted position cosmics
4-
physics.analyzers.EventNtuple.branches : [ @local::Ext ]
4+
physics.analyzers.EventNtuple.trk.branches : [ @local::Ext ]
55
physics.analyzers.EventNtuple.FitType : KinematicLine
6-
physics.analyzers.EventNtuple.FillTrkQual : false
6+
physics.analyzers.EventNtuple.trk.fillTrkQual : false
77

88
services.GeometryService.inputFile: "Production/JobConfig/cosmic/geom_cosmic_extracted.txt"

‎fcl/from_mcs-mixed_trkQualCompare.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ physics.EventNtuplePath : [ @sequence::EventNtuple.Path, TrkQualAllV10, TrkQualA
1414
physics.analyzers.EventNtuple.branches[0].trkQualTags : [ "TrkQualAllV10", "TrkQualAllV11", "TrkQualAllV2" ]
1515

1616
# Removin hits
17-
physics.analyzers.EventNtuple.FillHitInfo : false
17+
physics.analyzers.EventNtuple.trk.fillHits : false

‎fcl/from_mcs-mockdata_crvInf.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ physics.producers.CrvInference : {
99
}
1010

1111
physics.EventNtuplePath : [ @sequence::EventNtuple.Path, CrvInference ]
12-
physics.analyzers.EventNtuple.CrvInferenceTag : "CrvInference"
12+
physics.analyzers.EventNtuple.crv.inferenceTag : "CrvInference"

‎fcl/from_mcs-mockdata_noMC.fcl‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#include "EventNtuple/fcl/from_mcs-mockdata.fcl"
22

3-
physics.analyzers.EventNtuple.FillMCInfo : false
4-
physics.analyzers.EventNtuple.FillCaloMC : false
5-
physics.analyzers.EventNtuple.FillCaloClustersMC : false
6-
physics.analyzers.EventNtuple.FillCaloSimInfos : false
3+
physics.analyzers.EventNtuple.mc.fill : false
4+
physics.analyzers.EventNtuple.calo.mc.fill : false
75

86
physics.EventNtuplePath : [ @sequence::EventNtuple.PathNoMC ]
97
physics.EventNtupleEndPath : [ @sequence::EventNtuple.EndPathNoMC ]

0 commit comments

Comments
 (0)