Updates to fhicl configuration everywhere

AndrewEdmonds11 · AndrewEdmonds11 · commit 613335f3e201 · 2026-06-04T15:40:28.000-05:00
diff --git a/fcl/TrkAnaLineFromDigis.fcl b/fcl/TrkAnaLineFromDigis.fcl
@@ -39,13 +39,6 @@ physics :
       FitType : KinematicLine
       diagLevel : 2
       FillTriggerInfo : false
-      trk.branches :  [
-        { input: "KKLine"
-          branch : "kl"
-          options : { genealogyDepth : 5 }
-        }
-      ]
-      trk.mc.extraMCStepTags : [ "compressDigiMCs:protonabsorber", "compressDigiMCs:stoppingtarget" ]
     }
 
     @table::TrkAnaReco.analyzers
@@ -78,6 +71,13 @@ physics.producers.KKLine.ModuleSettings.SaveAllFits : true
 physics.producers.KKLine.ExtensionSettings.BFieldCorrection : false
 
 physics.end_paths : [ EndPath ]
+physics.analyzers.TrkAnaLine.trk.fits : [
+  { input: "KKLine"
+    branchname : "kl"
+    options : { genealogyDepth : 5 }
+  }
+]
+physics.analyzers.TrkAnaLine.mcsteps.extraMCStepTags : [ "compressDigiMCs:protonabsorber", "compressDigiMCs:stoppingtarget" ]
 services.TimeTracker.printSummary: true
 services.TFileService.fileName: "nts.owner.TALineDigis.version.sequence.root"
 #include "Offline/CRVResponse/fcl/epilog_extracted.fcl"
diff --git a/fcl/from_dig-OnSpill.fcl b/fcl/from_dig-OnSpill.fcl
@@ -16,44 +16,24 @@ physics : {
     # apr
     EventNtupleTTMCApr : {
       @table::EventNtupleMakerTTMC
-      trk.branches : [ {
-        @table::TTMCBranch
-        input : "MergeTTApr"
-      } ]
-      trk.mc.kalSeedMCAssns : "TTAprKSFMC"
       RecoCountTag : "TTAprKSFMC"
       SelectEvents : [ "Digitize:apr_highP*"  ]
     }
     # tpr
     EventNtupleTTMCTpr : {
       @table::EventNtupleMakerTTMC
-      trk.branches : [ {
-        @table::TTMCBranch
-        input : "MergeTTTpr"
-      } ]
-      trk.mc.kalSeedMCAssns : "TTTprDeKSFMC"
       RecoCountTag : "TTTprDeKSFMC"
       SelectEvents : [ "Digitize:tprDe_highP*"  ]
     }
     # cpr
     EventNtupleTTMCCpr : {
       @table::EventNtupleMakerTTMC
-      trk.branches : [ {
-        @table::TTMCBranch
-        input : "MergeTTCpr"
-      } ]
-      trk.mc.kalSeedMCAssns : "TTCprDeKSFMC"
       RecoCountTag : "TTCprDeKSFMC"
       SelectEvents : [ "Digitize:cprDe_highP*"  ]
     }
     # mpr
     EventNtupleTTMCMpr : {
       @table::EventNtupleMakerTTMC
-      trk.branches : [ {
-        @table::TTMCBranch
-        input : "MergeTTMpr"
-      } ]
-      trk.mc.kalSeedMCAssns : "TTMprDeKSFMC"
       RecoCountTag : "TTMprDeKSFMC"
       SelectEvents : [ "Digitize:mprDe_highP*"  ]
    }
@@ -64,6 +44,15 @@ physics : {
 }
 #physics.analyzers.TAapr.InfoMCStructHelper.SimParticleCollectionTag: "compressDetStepMCs"
 
+physics.analyzers.EventNtupleTTMCApr.trk.fits : [ { @table::TTMCBranch input : "MergeTTApr" } ]
+physics.analyzers.EventNtupleTTMCApr.trk.mc.kalSeedMCAssns : "TTAprKSFMC"
+physics.analyzers.EventNtupleTTMCTpr.trk.fits : [ { @table::TTMCBranch input : "MergeTTTpr" } ]
+physics.analyzers.EventNtupleTTMCTpr.trk.mc.kalSeedMCAssns : "TTTprDeKSFMC"
+physics.analyzers.EventNtupleTTMCCpr.trk.fits : [ { @table::TTMCBranch input : "MergeTTCpr" } ]
+physics.analyzers.EventNtupleTTMCCpr.trk.mc.kalSeedMCAssns : "TTCprDeKSFMC"
+physics.analyzers.EventNtupleTTMCMpr.trk.fits : [ { @table::TTMCBranch input : "MergeTTMpr" } ]
+physics.analyzers.EventNtupleTTMCMpr.trk.mc.kalSeedMCAssns : "TTMprDeKSFMC"
+
 end_paths : [ EndPath ]
 physics.trigger_paths : [ "TrigPath" ]
 services.TFileService.fileName: "nts.owner.trkana-triggerMC.version.sequencer.root"
diff --git a/fcl/from_dig-calo.fcl b/fcl/from_dig-calo.fcl
@@ -30,10 +30,8 @@ physics.analyzers.EventNtuple.PBTTag : ""
 physics.analyzers.EventNtuple.mc.PBTMCTag : ""
 physics.analyzers.EventNtuple.mc.simParticlesTag : "CaloShowerStepMaker"
 #Turn off tracker and other branches
-physics.analyzers.EventNtuple.trk.branches : [ ]
-physics.analyzers.EventNtuple.trk.fillTrkQual : false
+physics.analyzers.EventNtuple.trk.fill : false
 physics.analyzers.EventNtuple.FillTriggerInfo : false
-physics.analyzers.EventNtuple.trk.fillHits : false
 physics.analyzers.EventNtuple.crv.fillCoincs : false
 
 #Toggle calo branches
diff --git a/fcl/from_mcs-Run1B.fcl b/fcl/from_mcs-Run1B.fcl
@@ -1,9 +1,9 @@
 # we start from mcs-extracted since Run-1B wants the straight line track fit
 #include "EventNtuple/fcl/from_mcs-extracted.fcl"
 
-physics.analyzers.EventNtuple.trk.mc.stepPointMCTags : [ "compressRecoMCs:virtualdetector" ] # we add the mcsteps_virtualdetector branch
-physics.analyzers.EventNtuple.trk.fillTimeClusters : true
-physics.analyzers.EventNtuple.trk.timeClustersTag : "SimpleTimeCluster" # Store time clusters for straight line track finding
+physics.analyzers.EventNtuple.mcsteps.stepPointMCTags : [ "compressRecoMCs:virtualdetector" ] # we add the mcsteps_virtualdetector branch
+physics.analyzers.EventNtuple.timeclusters.fill : true
+physics.analyzers.EventNtuple.timeclusters.tag  : "SimpleTimeCluster" # Store time clusters for straight line track finding
 services.GeometryService.inputFile : "Offline/Mu2eG4/geom/geom_common.txt" # we can use the standard geometry
 
 physics.EventNtupleEndPath : [ @sequence::EventNtuple.EndPath ] # add back genCountLogger
diff --git a/fcl/from_mcs-ceSimReco.fcl b/fcl/from_mcs-ceSimReco.fcl
@@ -1,7 +1,7 @@
 #include "EventNtuple/fcl/from_mcs-mockdata.fcl"
 
-physics.analyzers.EventNtuple.branches : [ @local::De ]
-physics.analyzers.EventNtuple.branches[0].branch : "trk"
+physics.analyzers.EventNtuple.trk.fits : [ @local::De ]
+physics.analyzers.EventNtuple.trk.fits[0].branchname : "trk"
 physics.analyzers.EventNtuple.FillTriggerInfo : false
 physics.EventNtuplePath : [ MergeKKDe, PBIWeight, TrkQualDe, TrkPIDDe ]
 physics.EventNtupleEndPath : [ EventNtuple, genCountLogger ]
diff --git a/fcl/from_mcs-ceSimRecoVal.fcl b/fcl/from_mcs-ceSimRecoVal.fcl
@@ -2,4 +2,4 @@
 
 physics.analyzers.EventNtuple.trk.fillHitCalibs : true
 physics.analyzers.EventNtuple.FillTriggerInfo : true
-physics.analyzers.EventNtuple.TriggerProcessName : "ceTrig"
+physics.analyzers.EventNtuple.TriggerProcessName : "ceTrig"
diff --git a/fcl/from_mcs-extracted.fcl b/fcl/from_mcs-extracted.fcl
@@ -1,7 +1,7 @@
 #include "EventNtuple/fcl/from_mcs-mockdata.fcl"
 
 physics.EventNtuplePath : [ @sequence::EventNtuple.PathExt ] # path for extracted position cosmics
-physics.analyzers.EventNtuple.trk.branches : [ @local::Ext ]
+physics.analyzers.EventNtuple.trk.fits : [ @local::Ext ]
 physics.analyzers.EventNtuple.FitType : KinematicLine
 physics.analyzers.EventNtuple.trk.fillTrkQual : false
 
diff --git a/fcl/from_mcs-mockdata_separateTrkBranches.fcl b/fcl/from_mcs-mockdata_separateTrkBranches.fcl
@@ -1,5 +1,5 @@
 #include "EventNtuple/fcl/from_mcs-mockdata.fcl"
 
-physics.analyzers.EventNtuple.trk.branches : [ @local::DeM, @local::DeP, @local::UeM, @local::UeP,
+physics.analyzers.EventNtuple.trk.fits : [ @local::DeM, @local::DeP, @local::UeM, @local::UeP,
   @local::DmuM, @local::DmuP, @local::UmuM, @local::UmuP ]
 physics.EventNtuplePath : [ @sequence::EventNtuple.PathSeparate ]
diff --git a/fcl/from_mcs-primary_addVDSteps.fcl b/fcl/from_mcs-primary_addVDSteps.fcl
@@ -1,3 +1,3 @@
 #include "EventNtuple/fcl/from_mcs-primary.fcl"
 
-physics.analyzers.EventNtuple.trk.mc.stepPointMCTags : [ "compressRecoMCs:virtualdetector" ]
+physics.analyzers.EventNtuple.mcsteps.stepPointMCTags : [ "compressRecoMCs:virtualdetector" ]
diff --git a/fcl/from_mcs-reflection.fcl b/fcl/from_mcs-reflection.fcl
@@ -9,10 +9,10 @@ EN : {
   FitType : LoopHelix
   diagLevel : 2
   FillTriggerInfo : false
-  trk.fillHits : false
-  trk.fillTrkQual : false
-  trk.fillTrkPID : false
 }
+EN.trk.fillHits : false
+EN.trk.fillTrkQual : false
+EN.trk.fillTrkPID : false
 ENBranch : {
   branch : "trk"
 }
@@ -60,25 +60,10 @@ physics :
     ENe : {
       @table::EN
       SelectEvents : [ "eTrig" ]
-      trk.branches : [
-        { @table::ENBranch
-          trkQualTags : ["TrkQualReflecte"]
-          trkPIDTags : ["TrkPIDReflecte"]
-          input: "Reflecte"
-        }
-      ]
     }
     ENmu : {
       @table::EN
       SelectEvents : [ "muTrig" ]
-      trk.branches : [
-        { @table::ENBranch
-          trkQualTags : ["TrkQualReflectmu"]
-          trkPIDTags : ["TrkPIDReflectmu"]
-          input: "Reflectmu"
-        }
-
-      ]
     }
     printModule : {
       module_type : PrintModule
@@ -96,5 +81,19 @@ physics :
 
 physics.trigger_paths : [ "eTrig", "muTrig"]
 physics.end_paths : [ "eEnd", "muEnd", "CLPrint" ]
+physics.analyzers.ENe.trk.fits : [
+  { @table::ENBranch
+    trkQualTags : ["TrkQualReflecte"]
+    trkPIDTags : ["TrkPIDReflecte"]
+    input: "Reflecte"
+  }
+]
+physics.analyzers.ENmu.trk.fits : [
+  { @table::ENBranch
+    trkQualTags : ["TrkQualReflectmu"]
+    trkPIDTags : ["TrkPIDReflectmu"]
+    input: "Reflectmu"
+  }
+]
 services.TimeTracker.printSummary: true
 services.TFileService.fileName: "nts.owner.ENreflection.version.sequence.root"
diff --git a/fcl/from_rec-crv-kpp.fcl b/fcl/from_rec-crv-kpp.fcl
@@ -1,8 +1,7 @@
 #include "EventNtuple/fcl/from_mcs-mockdata_noMC.fcl"
 
-physics.analyzers.EventNtuple.trk.branches : [ ] # no track branches
-physics.analyzers.EventNtuple.calo.fillClusters : false # no calorimeter
-physics.analyzers.EventNtuple.calo.fillHits : false # no calorimeter
+physics.analyzers.EventNtuple.trk.fill : false
+physics.analyzers.EventNtuple.calo.fill : false # no calorimeter
 physics.analyzers.EventNtuple.RecoCountTag : ""
 physics.analyzers.EventNtuple.PBTTag : ""
 physics.analyzers.EventNtuple.hasCRV : false #false keeps events that have no CRV coincidences
diff --git a/fcl/prolog.fcl b/fcl/prolog.fcl
diff --git a/src/EventNtupleMaker_module.cc b/src/EventNtupleMaker_module.cc

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#include "EventNtuple/fcl/from_mcs-primary.fcl"`
`2`	`2`
`3`		`-physics.analyzers.EventNtuple.trk.mc.stepPointMCTags : [ "compressRecoMCs:virtualdetector" ]`
	`3`	`+physics.analyzers.EventNtuple.mcsteps.stepPointMCTags : [ "compressRecoMCs:virtualdetector" ]`