Update trigger path naming

JobConfig/digitize/OnSpill_epilog.fcl

@@ -2,17 +2,17 @@
 # It produces functionally equivalent output as the standard module but is slower, so don't use this script for timing studies
 # add the trigger MC matching to the appropriate paths
 # apr
-physics.apr_highP : [@sequence::physics.apr_highP, TTAprKSFMC ]
-physics.apr_highP_stopTarg : [@sequence::physics.apr_highP_stopTarg, TTAprKSFMC ]
-physics.apr_lowP_stopTarg : [@sequence::physics.apr_lowP_stopTarg, TTAprKSFMC ]
-physics.apr_highP_stopTarg_multiTrk : [@sequence::physics.apr_highP_stopTarg_multiTrk, TTAprKSFMC ]
+physics.apr_TrkDe_80m70p : [@sequence::physics.apr_TrkDe_80m70p, TTAprKSFMC ]
+physics.apr_TrkDe_80m70p_D0200 : [@sequence::physics.apr_TrkDe_80m70p_D0200, TTAprKSFMC ]
+physics.apr_TrkDe_50_D0200 : [@sequence::physics.apr_TrkDe_50_D0200, TTAprKSFMC ]
+physics.apr_TwoTrkDe_80m70p_D0200 : [@sequence::physics.apr_TwoTrkDe_80m70p_D0200, TTAprKSFMC ]
 # tpr
-physics.tprDe_highP : [@sequence::physics.tprDe_highP, TTTprDeKSFMC ]
-physics.tprDe_highP_stopTarg : [@sequence::physics.tprDe_highP_stopTarg, TTTprDeKSFMC ]
-physics.tprDe_lowP_stopTarg : [@sequence::physics.tprDe_lowP_stopTarg, TTTprDeKSFMC ]
+physics.tpr_TrkDe_80m70p : [@sequence::physics.tpr_TrkDe_80m70p, TTTprDeKSFMC ]
+physics.tpr_TrkDe_80m70p_D0200 : [@sequence::physics.tpr_TrkDe_80m70p_D0200, TTTprDeKSFMC ]
+physics.tpr_TrkDe_50_D0200 : [@sequence::physics.tpr_TrkDe_50_D0200, TTTprDeKSFMC ]
 # cpr
-physics.cprDe_highP : [@sequence::physics.cprDe_highP, TTCprDeKSFMC ]
-physics.cprDe_highP_stopTarg : [@sequence::physics.cprDe_highP_stopTarg, TTCprDeKSFMC ]
-physics.cprDe_lowP_stopTarg : [@sequence::physics.cprDe_lowP_stopTarg, TTCprDeKSFMC ]
+physics.cpr_TrkDe_80m70p : [@sequence::physics.cpr_TrkDe_80m70p, TTCprDeKSFMC ]
+physics.cpr_TrkDe_80m70p_D0200 : [@sequence::physics.cpr_TrkDe_80m70p_D0200, TTCprDeKSFMC ]
+physics.cpr_TrkDe_50_D0200 : [@sequence::physics.cpr_TrkDe_50_D0200, TTCprDeKSFMC ]
 # mpr
-physics.mprDe_highP_stopTarg : [@sequence::physics.mprDe_highP_stopTarg, TTMprDeKSFMC ]
+physics.mpr_TrkDe_80m70p_D0200 : [@sequence::physics.mpr_TrkDe_80m70p_D0200, TTMprDeKSFMC ]

JobConfig/digitize/prolog.fcl

@@ -54,19 +54,23 @@ Digitize: {
 # Trigger MC matching instances for each helix algorithm
     TTAprKSFMC : {
       @table::CommonMC.TTSelectRecoMC
-      KalSeedCollections  : [ "TTAprKSF" ]
+      ComboHitCollection : "TrigFlagPH"
+      KalSeedCollections  : [ "TrigAprKSF" ]
     }
     TTTprDeKSFMC : {
       @table::CommonMC.TTSelectRecoMC
-      KalSeedCollections  : [ "TTKSFDe" ]
+      ComboHitCollection : "TrigFlagPH"
+      KalSeedCollections  : [ "TrigKSFDe" ]
     }
     TTMprDeKSFMC : {
       @table::CommonMC.TTSelectRecoMC
-      KalSeedCollections  : [ "TTKSFMprDe" ]
+      ComboHitCollection : "TrigFlagPH"
+      KalSeedCollections  : [ "TrigKSFMprDe" ]
     }
     TTCprDeKSFMC : {
       @table::CommonMC.TTSelectRecoMC
-      KalSeedCollections  : [ "TTCalSeedFitDe" ]
+      ComboHitCollection : "TrigFlagPH"
+      KalSeedCollections  : [ "TrigCalSeedFitDe" ]
     }
   }
   filters : {
@@ -140,7 +144,7 @@ Digitize: {
     "keep art::TriggerResults_*_*_*",
     "keep mu2e::CaloClusters_*_*_*",
     "keep mu2e::TriggerInfo_*_*_*",
-    "keep mu2e::KalSeeds_TT*_*_*",
+    "keep mu2e::KalSeeds_Trig*_*_*",
     "keep mu2e::KalSeedMCs_TT*KSFMC_*_*",
     "keep mu2e::KalSeedmu2e::KalSeedMCvoidart::Assns_TT*KSFMC_*_*",
     "keep mu2e::RecoCount_TT*KSFMC_*_*"
@@ -184,10 +188,10 @@ Digitize: {
   #
   # trigger selections that can be used to finalize the triggerOutput selection, depending on digitization mode and source
   #
-  SignalTriggers : [ "cpr*_highP*", "apr_highP*" ]  # active trigger lines selecting events with 'high' momentum tracks with KinKal fits
-  TrkTriggers : [ "*_lowP_*","*_ipa_*", "cst*" ] # events useful only for tracker calibration
-  CaloTriggers : [ "calo*" ] # events useful only for calo calibration
-  DiagTriggers : [ "minBias_*" , "*Helix*M", "*Helix*P"] # events useful for trigger diagnostics
+  SignalTriggers : [ "cpr_Trk*_80*", "apr_Trk*_80*" ]  # active trigger lines selecting events with 'high' momentum tracks with KinKal fits
+  TrkTriggers : [ "*_TrkDe_50*","*_IPA*", "cst_*" ] # events useful only for tracker calibration
+  CaloTriggers : [ "calo_*" ] # events useful only for calo calibration
+  DiagTriggers : [ "minBias_*" , "*_Hlx*"] # events useful for trigger diagnostics
 
   EndSequence : [digiCompressionCheck]
 }
@@ -214,7 +218,7 @@ Digitize.Outputs : {
 }
 Digitize.EndPath : [ @sequence::Digitize.EndSequence, TriggeredOutput, TriggerableOutput ]
 # override the trigger digitization sequence
-TrigRecoSequences.cfoDataGen : [ @sequence::Digitize.DigitizeSequence, processCFOData ]
+TrigRecoSequences.cfoDataGen : [ @sequence::Digitize.DigitizeSequence, ProcessCFOData ]
 END_PROLOG
 # Trigger Sequences have to come after
 #include "mu2e-trig-config/core/trigSequences.fcl"

JobConfig/mixing/prolog.fcl

@@ -93,7 +93,7 @@ Mixing : {
 Mixing.PileupMixSequence : [ PBISim, DTSFilter, @sequence::Mixing.StepMixSequence, @sequence::Mixing.StepFilterSequence ]
 Mixing.MixSequence : [ @sequence::Mixing.PileupMixSequence, @sequence::Digitize.DigitizeSequence ]
 # override the Trigger 'PrepareDigis' sequence; the mixers must preceed the digi making
-TrigRecoSequences.cfoDataGen: [ @sequence::Mixing.PileupMixSequence, @sequence::Digitize.DigitizeSequence, processCFOData ]
+TrigRecoSequences.cfoDataGen: [ @sequence::Mixing.PileupMixSequence, @sequence::Digitize.DigitizeSequence, ProcessCFOData ]
 #
 # The following is used to guarantee consistency when filtering pileup when mixing a primary that could also be part of pileup
 #