diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/generateCFChains.py b/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/generateCFChains.py
index 6b443923453d964f10f7563b45bf38cdef2e11da..04ac7acf5e8895054b15e60b820340f1e710c4e6 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/generateCFChains.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/generateCFChains.py
@@ -19,13 +19,13 @@ def generateCFChains(flags):
# egamma chains
##################################################################
if 'Egamma' in flags.Trigger.enabledSignatures:
- from TriggerMenuMT.HLT.CommonSequences.CaloSequences import fastCaloMenuSequenceCfg
- from TriggerMenuMT.HLT.Electron.FastElectronMenuSequences import fastElectronSequenceCfg
- from TriggerMenuMT.HLT.Electron.PrecisionCaloMenuSequences import precisionCaloSequenceCfg
+ from TriggerMenuMT.HLT.CommonSequences.CaloSequences import fastCaloSequenceGenCfg
+ from TriggerMenuMT.HLT.Electron.FastElectronMenuSequences import fastElectronSequenceGenCfg
+ from TriggerMenuMT.HLT.Electron.PrecisionCaloMenuSequences import precisionCaloSequenceGenCfg
- fastCaloSeq = functools.partial(fastCaloMenuSequenceCfg, flags, name='Electron' )
- electronSeq = functools.partial(fastElectronSequenceCfg, flags )
- precisionCaloSeq = functools.partial(precisionCaloSequenceCfg, flags )
+ fastCaloSeq = functools.partial(fastCaloSequenceGenCfg, flags, name='Electron' )
+ electronSeq = functools.partial(fastElectronSequenceGenCfg, flags )
+ precisionCaloSeq = functools.partial(precisionCaloSequenceGenCfg, flags )
FastCaloStep = makeChainStep("ElectronFastCaloStep", [fastCaloSeq])
FastElectronStep = makeChainStep("ElectronFastTrackStep", [electronSeq])
@@ -39,12 +39,12 @@ def generateCFChains(flags):
]
menu.chainsInMenu['Egamma'] += electronChains
- from TriggerMenuMT.HLT.Photon.FastPhotonMenuSequences import fastPhotonSequenceCfg
- from TriggerMenuMT.HLT.Photon.PrecisionCaloMenuSequences import precisionCaloSequenceCfg
+ from TriggerMenuMT.HLT.Photon.FastPhotonMenuSequences import fastPhotonSequenceGenCfg
+ from TriggerMenuMT.HLT.Photon.PrecisionCaloMenuSequences import precisionCaloSequenceGenCfg
- fastCaloSeq = functools.partial(fastCaloMenuSequenceCfg, flags, name='Photon' )
- fastPhotonSeq = functools.partial(fastPhotonSequenceCfg, flags )
- precisionCaloPhotonSeq = functools.partial(precisionCaloSequenceCfg, flags )
+ fastCaloSeq = functools.partial(fastCaloSequenceGenCfg, flags, name='Photon' )
+ fastPhotonSeq = functools.partial(fastPhotonSequenceGenCfg, flags )
+ precisionCaloPhotonSeq = functools.partial(precisionCaloSequenceGenCfg, flags )
FastCaloStep = makeChainStep("PhotonFastCaloStep", [fastCaloSeq])
fastPhotonStep = makeChainStep("PhotonStep2", [fastPhotonSeq])
@@ -59,21 +59,24 @@ def generateCFChains(flags):
# muon chains
##################################################################
if 'Muon' in flags.Trigger.enabledSignatures:
- from TriggerMenuMT.HLT.Muon.MuonMenuSequences import muFastSequence, muCombSequence, muEFSASequence, muEFCBSequence, muEFSAFSSequence, muEFCBFSSequence
+ from TriggerMenuMT.HLT.Muon.MuonMenuSequences import (
+ muFastSequenceGenCfg, muCombSequenceGenCfg,
+ muEFSASequenceGenCfg, muEFCBSequenceGenCfg, muEFSAFSSequenceGenCfg, muEFCBFSSequenceGenCfg
+ )
MuonChains = []
# step1
- mufastS= functools.partial(muFastSequence,flags)
+ mufastS= functools.partial(muFastSequenceGenCfg,flags)
step1mufast=makeChainStep("Step1_muFast", [ mufastS ])
# step2
- mucombS = functools.partial(muCombSequence,flags)
+ mucombS = functools.partial(muCombSequenceGenCfg,flags)
step2muComb=makeChainStep("Step2_muComb", [ mucombS ])
# step3
- muEFSAS = functools.partial(muEFSASequence,flags)
+ muEFSAS = functools.partial(muEFSASequenceGenCfg,flags)
step3muEFSA=makeChainStep("Step3_muEFSA", [ muEFSAS ])
#/step3muIso =makeChainStep("Step3_muIso", [ muIsoSequence() ])
# step4
- muEFCBS = functools.partial(muEFCBSequence,flags)
+ muEFCBS = functools.partial(muEFCBSequenceGenCfg,flags)
step4muEFCB = makeChainStep("Step4_muEFCB", [ muEFCBS ])
emptyStep = makeChainStep("Step2_empty", multiplicity=[])
@@ -101,8 +104,8 @@ def generateCFChains(flags):
#FS Muon trigger
# Full scan MS tracking step
- muEFSAFSS = functools.partial(muEFSAFSSequence,flags)
- muEFCBFSS = functools.partial(muEFCBFSSequence,flags)
+ muEFSAFSS = functools.partial(muEFSAFSSequenceGenCfg,flags)
+ muEFCBFSS = functools.partial(muEFCBFSSequenceGenCfg,flags)
stepFSmuEFSA=makeChainStep("Step_FSmuEFSA", [muEFSAFSS])
stepFSmuEFCB=makeChainStep("Step_FSmuEFCB", [muEFCBFSS])
MuonChains += [ makeChain(flags, name='HLT_mu6noL1_L1MU5VF', L1Thresholds=["FSNOSEED"], ChainSteps=[stepFSmuEFSA, stepFSmuEFCB])]
@@ -117,18 +120,18 @@ def generateCFChains(flags):
from TriggerMenuMT.HLT.Jet.JetRecoCommon import jetRecoDictFromString
def jetCaloHypoMenuSequenceFromString(jet_def_str):
jetRecoDict = jetRecoDictFromString(jet_def_str)
- from TriggerMenuMT.HLT.Jet.JetMenuSequencesConfig import jetCaloHypoMenuSequence
- return jetCaloHypoMenuSequence(flags, isPerf=False, **jetRecoDict)
+ from TriggerMenuMT.HLT.Jet.JetMenuSequencesConfig import jetCaloHypoMenuSequenceGenCfg
+ return jetCaloHypoMenuSequenceGenCfg(flags, isPerf=False, **jetRecoDict)
def jetCaloPreselMenuSequenceFromString(jet_def_str):
jetRecoDict = jetRecoDictFromString(jet_def_str)
- from TriggerMenuMT.HLT.Jet.JetMenuSequencesConfig import jetCaloPreselMenuSequence
- return jetCaloPreselMenuSequence(flags, **jetRecoDict)
+ from TriggerMenuMT.HLT.Jet.JetMenuSequencesConfig import jetCaloPreselMenuSequenceGenCfg
+ return jetCaloPreselMenuSequenceGenCfg(flags, **jetRecoDict)
def jetTrackingHypoMenuSequenceFromString(jet_def_str,clustersKey):
jetRecoDict = jetRecoDictFromString(jet_def_str)
- from TriggerMenuMT.HLT.Jet.JetMenuSequencesConfig import jetFSTrackingHypoMenuSequence
- return jetFSTrackingHypoMenuSequence(flags, clustersKey=clustersKey, isPerf=False, **jetRecoDict)
+ from TriggerMenuMT.HLT.Jet.JetMenuSequencesConfig import jetFSTrackingHypoMenuSequenceGenCfg
+ return jetFSTrackingHypoMenuSequenceGenCfg(flags, clustersKey=clustersKey, isPerf=False, **jetRecoDict)
if 'Jet' in flags.Trigger.enabledSignatures:
@@ -170,13 +173,13 @@ def generateCFChains(flags):
# bjet chains
##################################################################
if 'Bjet' in flags.Trigger.enabledSignatures:
- from TriggerMenuMT.HLT.Bjet.BjetMenuSequences import getBJetSequenceCfg
+ from TriggerMenuMT.HLT.Bjet.BjetMenuSequences import getBJetSequenceGenCfg
jetSeq_a4_tc_em_presel, jetDef, emclusters = jetCaloPreselMenuSequenceFromString("a4_tc_em_subjesIS")
jetSeq_a4_tc_em_gsc_ftf, jetDef = jetTrackingHypoMenuSequenceFromString("a4_tc_em_subjesgscIS_ftf",emclusters)
jc_name = "HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf"
- bjet_sec= functools.partial(getBJetSequenceCfg, flags, jc_name)
+ bjet_sec= functools.partial(getBJetSequenceGenCfg, flags, jc_name)
step1 = makeChainStep("Step_jet_a4_tc_em_presel", [jetSeq_a4_tc_em_presel])
step2 = makeChainStep("Step_jet_a4_tc_em_gsc_ftf", [jetSeq_a4_tc_em_gsc_ftf])
@@ -213,15 +216,15 @@ def generateCFChains(flags):
# B-physics and light states chains
##################################################################
if 'Bphysics' in flags.Trigger.enabledSignatures:
- from TriggerMenuMT.HLT.Muon.MuonMenuSequences import muFastSequence, muCombSequence, muEFSASequence, muEFCBSequence
+ from TriggerMenuMT.HLT.Muon.MuonMenuSequences import muFastSequenceGenCfg, muCombSequenceGenCfg, muEFSASequenceGenCfg, muEFCBSequenceGenCfg
from TrigBphysHypo.TrigMultiTrkComboHypoConfig import StreamerDimuL2ComboHypoCfg, DimuEFComboHypoCfg
- muFast = functools.partial(muFastSequence, flags)
+ muFast = functools.partial(muFastSequenceGenCfg, flags)
step1_dimufast=makeChainStep("Step1_dimuFast", [muFast], multiplicity=[2])
- mucombS = functools.partial(muCombSequence, flags)
+ mucombS = functools.partial(muCombSequenceGenCfg, flags)
step2_dimuComb=makeChainStep("Step2_dimuComb", [mucombS], multiplicity=[2], comboHypoCfg=functools.partial(StreamerDimuL2ComboHypoCfg,flags))
- muEFSAS = functools.partial(muEFSASequence, flags)
- muEFCBS = functools.partial(muEFCBSequence, flags)
+ muEFSAS = functools.partial(muEFSASequenceGenCfg, flags)
+ muEFCBS = functools.partial(muEFCBSequenceGenCfg, flags)
step3_dimuEFSA=makeChainStep("Step3_dimuEFSA", [muEFSAS], multiplicity=[2])
step4_dimuEFCB=makeChainStep("Step4_dimuEFCB", [muEFCBS], multiplicity=[2], comboHypoCfg=functools.partial(DimuEFComboHypoCfg,flags))
@@ -240,11 +243,11 @@ def generateCFChains(flags):
##################################################################
doCombinedSlice = True
if doCombinedSlice:
- from TriggerMenuMT.HLT.CommonSequences.CaloSequences import fastCaloMenuSequenceCfg
- fastCaloSeq = functools.partial(fastCaloMenuSequenceCfg,flags, name='Electron')
+ from TriggerMenuMT.HLT.CommonSequences.CaloSequences import fastCaloSequenceGenCfg
+ fastCaloSeq = functools.partial(fastCaloSequenceGenCfg,flags, name='Electron')
- from TriggerMenuMT.HLT.Muon.MuonMenuSequences import muFastSequence
- muFast = functools.partial(muFastSequence,flags)
+ from TriggerMenuMT.HLT.Muon.MuonMenuSequences import muFastSequenceGenCfg
+ muFast = functools.partial(muFastSequenceGenCfg,flags)
comboStep_et_mufast = makeChainStep("Step1_et_mufast", [fastCaloSeq, muFast], multiplicity=[1,1])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetChainConfiguration.py
index 8c525a8941ac18c36fbf5fa1c36759bf15f52b88..0390858242c26473956a65a4ca30b114c70e7de2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetChainConfiguration.py
@@ -5,7 +5,7 @@ logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger(__name__)
from ..Config.ChainConfigurationBase import ChainConfigurationBase
-from .BjetMenuSequences import getBJetSequenceCfg
+from .BjetMenuSequences import getBJetSequenceGenCfg
#----------------------------------------------------------------
@@ -25,7 +25,7 @@ class BjetChainConfiguration(ChainConfigurationBase):
log.debug("Assembling chain for %s", self.chainName)
stepName = f"Step2_{self.jc_name}_bjet"
- chainSteps = [self.getStep(flags,2, stepName, [getBJetSequenceCfg], jc_name=self.jc_name)]
+ chainSteps = [self.getStep(flags,2, stepName, [getBJetSequenceGenCfg], jc_name=self.jc_name)]
myChain = self.buildChain(chainSteps)
return myChain
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py
index e95bfb5817ab05117992dc5ce6c109ed7b6062c2..78ad3320b02542b63b4c8ced8e86429a12466ae8 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py
@@ -8,7 +8,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
@AccumulatorCache
-def getBJetSequenceCfg(flags, jc_name=None):
+def getBJetSequenceGenCfg(flags, jc_name=None):
if not jc_name:
raise ValueError("jet collection name is empty - pass the full HLT jet collection name to getBJetSequenceCfg().")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsChainConfiguration.py
index dfc623e29c1b3610fb86eaf829dd0ac0515a6573..4e0904052f8de9e2528ba29d218a943e015170f4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsChainConfiguration.py
@@ -11,9 +11,9 @@ log = logging.getLogger(__name__)
from ..Config.ChainConfigurationBase import ChainConfigurationBase
from ..Muon.MuonChainConfiguration import MuonChainConfiguration
-from ..Muon.MuonMenuSequences import mul2IOOvlpRmSequence, mul2mtCBOvlpRmSequence, muEFCBSequence
+from ..Muon.MuonMenuSequences import mul2IOOvlpRmSequenceGenCfg, mul2mtCBOvlpRmSequenceGenCfg, muEFCBSequenceGenCfg
-from .BphysicsMenuSequences import dimuL2Sequence, dimuEFSequence, bmumuxSequence
+from .BphysicsMenuSequences import dimuL2SequenceGenCfg, dimuEFSequenceGenCfg, bmumuxSequenceGenCfg
from TrigBphysHypo.TrigMultiTrkComboHypoConfig import StreamerDimuL2ComboHypoCfg, StreamerDimuL2IOComboHypoCfg, StreamerDimuL2MTComboHypoCfg, DimuEFComboHypoCfg, BmutrkComboHypoCfg, StreamerDimuEFComboHypoCfg, TrigMultiTrkComboHypoToolFromDict
from TrigBphysHypo.TrigBmumuxComboHypoConfig import BmumuxComboHypoCfg, TrigBmumuxComboHypoToolFromDict
from TrigBphysHypo.TrigBmuxComboHypoConfig import BmuxComboHypoCfg
@@ -87,23 +87,23 @@ class BphysicsChainConfiguration(MuonChainConfiguration):
def getDimuL2(self, flags):
if 'noL2Comb' in self.chainPart['extra']:
- return self.getStep(flags, 2, 'dimuL2', [dimuL2Sequence], comboHypoCfg=StreamerDimuL2ComboHypoCfg)
+ return self.getStep(flags, 2, 'dimuL2', [dimuL2SequenceGenCfg], comboHypoCfg=StreamerDimuL2ComboHypoCfg)
elif 'l2mt' in self.chainPart['l2AlgInfo']:
- return self.getStep(flags, 2, 'dimuL2MT', [mul2mtCBOvlpRmSequence], comboHypoCfg=StreamerDimuL2MTComboHypoCfg)
+ return self.getStep(flags, 2, 'dimuL2MT', [mul2mtCBOvlpRmSequenceGenCfg], comboHypoCfg=StreamerDimuL2MTComboHypoCfg)
else:
- return self.getStep(flags, 2, 'dimuL2IO', [mul2IOOvlpRmSequence], comboHypoCfg=StreamerDimuL2IOComboHypoCfg)
+ return self.getStep(flags, 2, 'dimuL2IO', [mul2IOOvlpRmSequenceGenCfg], comboHypoCfg=StreamerDimuL2IOComboHypoCfg)
def getDimuEF(self, flags):
- return self.getStep(flags, 5, 'dimuEF', [dimuEFSequence], comboHypoCfg=DimuEFComboHypoCfg, comboTools=[TrigMultiTrkComboHypoToolFromDict])
+ return self.getStep(flags, 5, 'dimuEF', [dimuEFSequenceGenCfg], comboHypoCfg=DimuEFComboHypoCfg, comboTools=[TrigMultiTrkComboHypoToolFromDict])
def getDimuEFCB(self, flags):
- return self.getStep(flags, 4, 'dimuEFCB', [muEFCBSequence], comboHypoCfg=StreamerDimuEFComboHypoCfg)
+ return self.getStep(flags, 4, 'dimuEFCB', [muEFCBSequenceGenCfg], comboHypoCfg=StreamerDimuEFComboHypoCfg)
def getBmux(self, flags):
- return self.getStep(flags, 5, 'bmux', [bmumuxSequence], comboHypoCfg=BmuxComboHypoCfg, comboTools=[TrigBmumuxComboHypoToolFromDict])
+ return self.getStep(flags, 5, 'bmux', [bmumuxSequenceGenCfg], comboHypoCfg=BmuxComboHypoCfg, comboTools=[TrigBmumuxComboHypoToolFromDict])
def getBmumux(self, flags):
- return self.getStep(flags, 5, 'bmumux', [bmumuxSequence], comboHypoCfg=BmumuxComboHypoCfg, comboTools=[TrigBmumuxComboHypoToolFromDict])
+ return self.getStep(flags, 5, 'bmumux', [bmumuxSequenceGenCfg], comboHypoCfg=BmumuxComboHypoCfg, comboTools=[TrigBmumuxComboHypoToolFromDict])
def getBmutrk(self, flags):
- return self.getStep(flags, 5, 'bmutrk', [bmumuxSequence], comboHypoCfg=BmutrkComboHypoCfg, comboTools=[TrigMultiTrkComboHypoToolFromDict])
+ return self.getStep(flags, 5, 'bmutrk', [bmumuxSequenceGenCfg], comboHypoCfg=BmutrkComboHypoCfg, comboTools=[TrigMultiTrkComboHypoToolFromDict])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py
index 1a464b712a86be26ba2099e542b16861a1042eff..80cb9e49a84b821d3b643f50b04d50494c788576 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py
@@ -10,7 +10,7 @@ from TrigEDMConfig.TriggerEDM import recordable
@AccumulatorCache
-def bmumuxSequence(flags):
+def bmumuxSequenceGenCfg(flags):
RoIToolCreator = CompFactory.ViewCreatorMuonSuperROITool if flags.Trigger.InDetTracking.bmumux.SuperRoI else CompFactory.ViewCreatorCentredOnIParticleROITool
@@ -43,7 +43,7 @@ def bmumuxSequence(flags):
return MenuSequenceCA(flags, selAcc, HypoToolGen=TrigBphysStreamerHypoToolFromDict)
-def dimuL2Sequence(flags):
+def dimuL2SequenceGenCfg(flags):
from ..Muon.MuonMenuSequences import muCombAlgSequenceCfg
from TrigBphysHypo.TrigBphysStreamerHypoConfig import TrigBphysStreamerHypoToolFromDict
@@ -58,7 +58,7 @@ def dimuL2Sequence(flags):
@AccumulatorCache
-def dimuEFSequence(flags):
+def dimuEFSequenceGenCfg(flags):
selAcc = SelectionCA('dimuSequence')
inputMakerAlg = CompFactory.InputMakerForRoI('IM_bphysStreamerDimuEF',
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/BeamspotChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/BeamspotChainConfiguration.py
index e3e74ada724b4c6f7c53016566ff065b9a4c8472..c4674d20f8dcae73ee7360a1ced95289f50445b3 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/BeamspotChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/BeamspotChainConfiguration.py
@@ -13,7 +13,7 @@ from TrigInDetConfig.TrigInDetConfig import trigInDetFastTrackingCfg
from ..Config.MenuComponents import MenuSequenceCA, SelectionCA, InEventRecoCA, InViewRecoCA
-def allTE_trkfast( flags, signature="FS" ):
+def allTE_trkfastSequenceGenCfg( flags, signature="FS" ):
@@ -52,7 +52,7 @@ def allTE_trkfast( flags, signature="FS" ):
HypoToolGen = beamspotHypoToolGen )
-def getBeamspotVtx(flags):
+def getBeamspotVtxSequenceGenCfg(flags):
signature = "BeamspotJet"
# run at event level
@@ -102,7 +102,7 @@ class BeamspotChainConfiguration(ChainConfigurationBase):
if self.chainPart['beamspotChain'] != '':
stepName = f"Step4_{self.jc_name}_beamspotJet"
- chainSteps = [self.getStep(flags, 4, stepName, [getBeamspotVtx])]
+ chainSteps = [self.getStep(flags, 4, stepName, [getBeamspotVtxSequenceGenCfg])]
else:
key = self.chainPart['addInfo'][0] + "_" + self.chainPart['l2IDAlg'][0] #TODO: hardcoded index
@@ -129,10 +129,10 @@ class BeamspotChainConfiguration(ChainConfigurationBase):
# Configuration TrkFS step
# --------------------
def getTrkFSStep(self, flags):
- return self.getStep(flags,1,"trkFS_trkfast",[allTE_trkfast],signature="FS")
+ return self.getStep(flags,1,"trkFS_trkfast",[allTE_trkfastSequenceGenCfg],signature="FS")
# --------------------
# Configuration of costmonitor (costmonitor ?? but isn't this is the actua chain configuration ??)
# --------------------
def getAllTEStep(self, flags):
- return self.getStep(flags,1,"allTE_trkfast",[allTE_trkfast],signature="beamSpot")
+ return self.getStep(flags,1,"allTE_trkfast",[allTE_trkfastSequenceGenCfg],signature="beamSpot")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CalibChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CalibChainConfiguration.py
index eb3072da8a2d698bd38a8a955d1e7e511466cf79..94cae020518566635b9abe11f718f48580c9cde0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CalibChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CalibChainConfiguration.py
@@ -33,7 +33,7 @@ def getLArNoiseBurstRecoCfg(flags):
# LArNoiseBurst configuration
# --------------------
@AccumulatorCache
-def getLArNoiseBurstSequenceCfg(flags):
+def getLArNoiseBurstSequenceGenCfg(flags):
hypoAlg = CompFactory.TrigLArNoiseBurstAlg("NoiseBurstAlg")
InEventReco = InEventRecoCA("LArNoiseBurstRecoSequence", inputMaker=clusterFSInputMaker())
@@ -52,7 +52,7 @@ def getLArNoiseBurstSequenceCfg(flags):
# LArPS Noise Detection EM configuration
# --------------------
@AccumulatorCache
-def getCaloAllEMLayersPSSequenceCfg(flags,doAllorAllEM=False):
+def getCaloAllEMLayersPSSequenceGenCfg(flags,doAllorAllEM=False):
from TrigT2CaloCommon.CaloDef import fastCaloVDVCfg
nameselAcc = "LArPSSequence_All"
@@ -129,25 +129,25 @@ class CalibChainConfiguration(ChainConfigurationBase):
def getAcceptedEventsStep(self, flags, i):
- return self.getStep(flags,1, 'AcceptedEvents', [acceptedEventsCfg])
+ return self.getStep(flags,1, 'AcceptedEvents', [acceptedEventsSequenceGenCfg])
def getAllTEStep(self, flags, i):
- return self.getStep(flags,1, 'LArNoiseBurst', [getLArNoiseBurstSequenceCfg])
+ return self.getStep(flags,1, 'LArNoiseBurst', [getLArNoiseBurstSequenceGenCfg])
def getCaloAllEMStep(self, flags, i):
- return self.getStep(flags,1, 'LArPSALLEM', [getCaloAllEMLayersPSSequenceCfg], doAllorAllEM=False)
+ return self.getStep(flags,1, 'LArPSALLEM', [getCaloAllEMLayersPSSequenceGenCfg], doAllorAllEM=False)
def getCaloAllStep(self, flags, i):
- return self.getStep(flags,1, 'LArPSALL', [getCaloAllEMLayersPSSequenceCfg], doAllorAllEM=True)
+ return self.getStep(flags,1, 'LArPSALL', [getCaloAllEMLayersPSSequenceGenCfg], doAllorAllEM=True)
def getIDCalibEmpty(self, flags, i):
return self.getEmptyStep(1, 'IDCalibEmptyStep')
def getIDCalibFTFReco(self, flags, i):
- return self.getStep(flags,2,'IDCalibFTFCfg',[IDCalibFTFCfg])
+ return self.getStep(flags,2,'IDCalibFTFCfg',[IDCalibFTFSequenceGenCfg])
def getIDCalibTrigger(self, flags, i):
- return self.getStep(flags,3,'IDCalibTriggerCfg',[IDCalibTriggerCfg])
+ return self.getStep(flags,3,'IDCalibTriggerCfg',[IDCalibTriggerSequenceGenCfg])
#----------------------------------------------------------------
@@ -156,7 +156,7 @@ class CalibChainConfiguration(ChainConfigurationBase):
# --------------------
@AccumulatorCache
-def IDCalibTriggerCfg(flags):
+def IDCalibTriggerSequenceGenCfg(flags):
DummyInputMakerAlg = CompFactory.InputMakerForRoI( "IM_IDCalib_HypoOnlyStep" )
DummyInputMakerAlg.RoITool = CompFactory.ViewCreatorInitialROITool()
@@ -179,7 +179,7 @@ def IDCalibTriggerCfg(flags):
# --------------------
@AccumulatorCache
-def IDCalibFTFCfg(flags):
+def IDCalibFTFSequenceGenCfg(flags):
reco = InEventRecoCA('IDCalibTrkrecoSeq_reco',inputMaker=getTrackingInputMaker(flags, "ftf"))
reco.mergeReco(commonInDetFullScanCfg(flags))
@@ -200,7 +200,7 @@ def IDCalibFTFCfg(flags):
# HLT step for the AcceptedEvents chains
# --------------------
@AccumulatorCache
-def acceptedEventsCfg(flags):
+def acceptedEventsSequenceGenCfg(flags):
'''
Return MenuSequenceCA for an HLT step used by the AcceptedEvents chains. This step is a trivial
always-reject hypo with no reco. The step itself should be noop as only the HLTSeeding and the
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CosmicChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CosmicChainConfiguration.py
index 1bd125ae352b4ae1b976ea6b20ac389576085d13..d3e5abc8a39c91fa20919d59ad5ca0488ab7bb78 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CosmicChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CosmicChainConfiguration.py
@@ -16,7 +16,7 @@ def TrackCountHypoToolGen(chainDict):
hypo.minNtrks = 1
return hypo
-def CosmicsTrkSequenceCfg(flags):
+def CosmicsTrkSequenceGenCfg(flags):
trkRecoSeq = InViewRecoCA("CosmicTrkRecoSeq", InViewRoIs = "CosmicRoIs")
@@ -71,7 +71,7 @@ class CosmicChainConfiguration(ChainConfigurationBase):
# --------------------
if 'cosmic_id' in self.chainName:
steps += [ self.getStep(flags, 1, 'Empty', [EmptyMenuSequenceCfg], name="EmptyBeforeCosmicID"),
- self.getStep(flags, 2, 'CosmicTracking', [CosmicsTrkSequenceCfg]) ]
+ self.getStep(flags, 2, 'CosmicTracking', [CosmicsTrkSequenceGenCfg]) ]
return self.buildChain(steps)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py
index 55836f8e6ab24a815426d984093f1f93a500c961..d1f6a2b4537ee5cf4dd621aeaba7b543ee70aeea 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py
@@ -84,7 +84,7 @@ def EnhancedBiasHypoToolGen(chainDict):
return tool
-def enhancedBiasMenuSequence(flags):
+def enhancedBiasMenuSequenceGenCfg(flags):
reco = enhancedBiasReco(flags)
selAcc = SelectionCA("enhancedBiasSequence")
@@ -105,6 +105,6 @@ class EnhancedBiasChainConfiguration(ChainConfigurationBase):
chainSteps = []
log.debug("Assembling chain for %s", self.chainName)
- chainSteps.append( self.getStep(flags, 1, "EnhancedBias", [enhancedBiasMenuSequence]) )
+ chainSteps.append( self.getStep(flags, 1, "EnhancedBias", [enhancedBiasMenuSequenceGenCfg]) )
return self.buildChain(chainSteps)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences.py
index 9d1c26defc2287ab94b1e8605f16152632003c42..c7dee307fa8d079ab496245639682873267a05bb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences.py
@@ -16,7 +16,7 @@ class CaloMenuDefs(object):
#
@AccumulatorCache
-def fastCaloMenuSequenceCfg(flags, name, doRinger=True, is_probe_leg=False):
+def fastCaloSequenceGenCfg(flags, name, doRinger=True, is_probe_leg=False):
""" Creates Egamma Fast Calo MENU sequence
The Hypo name changes depending on name, so for different implementations (Electron, Gamma,....)
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences_FWD.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences_FWD.py
index 3fa8d5e8c3bf9bd777979666298391b25c009af6..af47a221163439f21a33fdefbde3402e8b364511 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences_FWD.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences_FWD.py
@@ -17,7 +17,7 @@ class CaloMenuDefs_FWD(object):
#
@AccumulatorCache
-def fastCaloMenuSequence_FWDCfg(flags,name,doRinger=True, is_probe_leg=False):
+def fastCalo_FWDSequenceGenCfg(flags,name,doRinger=True, is_probe_leg=False):
""" Creates Egamma Fast Calo FWD MENU sequence (Reco and Hypo)
The Hypo name changes depending on name, so for different implementations (Electron, Gamma,....)
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py
index bfbddb798db02778928ee30f980718756ddb3747..91bc616585f1c7540014756f861b2a07996bf5e4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py
@@ -26,7 +26,7 @@ def addEventBuildingSequence(flags, chain, eventBuildType, chainDict):
log.error('eventBuildType \'%s\' not found in the allowed Event Building identifiers', eventBuildType)
return
- seq = functools.partial(pebMenuSequenceCfg, flags, chain=chain, eventBuildType=eventBuildType, chainDict=chainDict)
+ seq = functools.partial(pebMenuSequenceGenCfg, flags, chain=chain, eventBuildType=eventBuildType, chainDict=chainDict)
if len(chain.steps)==0:
# noalg PEB chain
@@ -285,7 +285,7 @@ def pebInputMaker(flags, chain, eventBuildType):
return maker
-def pebMenuSequenceCfg(flags, chain, eventBuildType, chainDict):
+def pebMenuSequenceGenCfg(flags, chain, eventBuildType, chainDict):
'''
Return the MenuSequenceCA for the PEB input maker for this chain.
'''
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/TLABuildingSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/TLABuildingSequences.py
index 784726aaa029fc22ee5bd112b97e26c67a5a1326..e26285d1df98eaf9dc83de7005ae09b085682d08 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/TLABuildingSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/TLABuildingSequences.py
@@ -5,9 +5,9 @@ import functools
from TriggerMenuMT.HLT.Config.MenuComponents import ChainStep
from AthenaCommon.Logging import logging
from ..Jet.JetChainConfiguration import JetChainConfiguration
-from ..Photon.PrecisionPhotonTLAMenuSequenceConfig import PhotonTLAMenuSequenceCfg
-from ..Jet.JetTLASequenceConfig import JetTLAMenuSequenceCfg
-from ..Muon.MuonTLASequenceConfig import MuonTLAMenuSequenceCfg
+from ..Photon.PrecisionPhotonTLAMenuSequenceConfig import PhotonTLAMenuSequenceGenCfg
+from ..Jet.JetTLASequenceConfig import JetTLAMenuSequenceGenCfg
+from ..Muon.MuonTLASequenceConfig import MuonTLAMenuSequenceGenCfg
log = logging.getLogger(__name__)
@@ -24,7 +24,7 @@ def addTLAStep(flags, chain, chainDict):
log.debug("addTLAStep: processing signature: %s", cPart['signature'] )
# call the sequence from their respective signatures
- tlaSequencesList.append(functools.partial(getTLASignatureSequence, flags, chainDict=chainDict, chainPart=cPart))
+ tlaSequencesList.append(functools.partial(getTLASignatureSequenceGenCfg, flags, chainDict=chainDict, chainPart=cPart))
log.debug("addTLAStep: About to add a step with: %d parallel sequences.", len(tlaSequencesList))
@@ -42,16 +42,16 @@ def addTLAStep(flags, chain, chainDict):
-def getTLASignatureSequence(flags, chainDict, chainPart):
+def getTLASignatureSequenceGenCfg(flags, chainDict, chainPart):
# Here we simply retrieve the TLA sequence from the existing signature code
signature= chainPart['signature']
if signature == 'Photon':
photonOutCollectionName = "HLT_egamma_Photons"
- return PhotonTLAMenuSequenceCfg(flags, photonsIn=photonOutCollectionName)
+ return PhotonTLAMenuSequenceGenCfg(flags, photonsIn=photonOutCollectionName)
elif signature == 'Muon':
- return MuonTLAMenuSequenceCfg(flags, muChainPart=chainPart)
+ return MuonTLAMenuSequenceGenCfg(flags, muChainPart=chainPart)
elif signature == 'Jet' or signature == 'Bjet':
jetDef = JetChainConfiguration(chainDict)
@@ -64,7 +64,7 @@ def getTLASignatureSequence(flags, chainDict, chainPart):
# Thus, BTag recording will always run for PFlow jets, creating an empty container if no btagging exists.
attachBtag = True
if jetDef.recoDict["trkopt"] == "notrk": attachBtag = False
- return JetTLAMenuSequenceCfg(flags, jetsIn=jetInputCollectionName, attachBtag=attachBtag)
+ return JetTLAMenuSequenceGenCfg(flags, jetsIn=jetInputCollectionName, attachBtag=attachBtag)
def findTLAStep(chainConfig):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/ElectronChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/ElectronChainConfiguration.py
index 55bbfa835ac6840ac5cc13fa316619eaa572db9a..a2bbe497e15a8a4cbbd796f370e2dddc175bde0a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/ElectronChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/ElectronChainConfiguration.py
@@ -5,16 +5,16 @@ logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger(__name__)
from ..Config.ChainConfigurationBase import ChainConfigurationBase
-from ..CommonSequences.CaloSequences import fastCaloMenuSequenceCfg
-from ..CommonSequences.CaloSequences_FWD import fastCaloMenuSequence_FWDCfg
-from ..Electron.FastElectronMenuSequences import fastElectronSequenceCfg, fastElectronSequence_LRTCfg
-from ..Electron.FastTrackingMenuSequences import fastTrackingSequenceCfg, fastTrackingSequence_LRTCfg
-from ..Electron.PrecisionCaloMenuSequences import precisionCaloSequenceCfg, precisionCaloSequence_LRTCfg
-from ..Electron.PrecisionElectronMenuSequences import precisionElectronSequenceCfg, precisionElectronSequence_LRTCfg
-from ..Electron.PrecisionElectronMenuSequences_GSF import precisionElectronSequence_GSFCfg, precisionElectronSequence_GSF_LRTCfg
+from ..CommonSequences.CaloSequences import fastCaloSequenceGenCfg
+from ..CommonSequences.CaloSequences_FWD import fastCalo_FWDSequenceGenCfg
+from ..Electron.FastElectronMenuSequences import fastElectronSequenceGenCfg, fastElectron_LRTSequenceGenCfg
+from ..Electron.FastTrackingMenuSequences import fastTrackingSequenceGenCfg, fastTracking_LRTSequenceGenCfg
+from ..Electron.PrecisionCaloMenuSequences import precisionCaloSequenceGenCfg, precisionCalo_LRTSequenceGenCfg
+from ..Electron.PrecisionElectronMenuSequences import precisionElectronSequenceGenCfg, precisionElectron_LRTSequenceGenCfg
+from ..Electron.PrecisionElectronMenuSequences_GSF import precisionElectron_GSFSequenceGenCfg, precisionElectron_GSF_LRTSequenceGenCfg
from TrigBphysHypo.TrigMultiTrkComboHypoConfig import NoMuonDiElecPrecisionGSFComboHypoCfg, DiElecPrecisionGSFComboHypoCfg, TrigMultiTrkComboHypoToolFromDict
-from ..Electron.PrecisionTrackingMenuSequences import precisionTrackingSequenceCfg, precisionTrackingSequence_LRTCfg
-from ..Electron.PrecisionTracks_GSFRefittedMenuSequences import precisionTracks_GSFRefittedSequenceCfg, precisionTracks_GSFRefittedSequence_LRTCfg
+from ..Electron.PrecisionTrackingMenuSequences import precisionTrackingSequenceGenCfg, precisionTracking_LRTSequenceGenCfg
+from ..Electron.PrecisionTracks_GSFRefittedMenuSequences import precisionTracks_GSFRefittedSequenceGenCfg, precisionTracks_GSFRefitted_LRTSequenceGenCfg
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -217,15 +217,15 @@ class ElectronChainConfiguration(ChainConfigurationBase):
def getFastCalo(self, flags, is_probe_leg=False):
stepName = "FastCalo_electron"
- return self.getStep(flags,1,stepName,[fastCaloMenuSequenceCfg], name='Electron', is_probe_leg=is_probe_leg)
+ return self.getStep(flags,1,stepName,[fastCaloSequenceGenCfg], name='Electron', is_probe_leg=is_probe_leg)
def getFastTracking(self, flags, is_probe_leg=False):
stepName = "fast_tracking"
- return self.getStep(flags,2,stepName,[ fastTrackingSequenceCfg],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,2,stepName,[ fastTrackingSequenceGenCfg],is_probe_leg=is_probe_leg)
def getFastTracking_lrt(self, flags, is_probe_leg=False):
stepName = "fast_tracking_lrt"
- return self.getStep(flags,2,stepName,[ fastTrackingSequence_LRTCfg],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,2,stepName,[ fastTracking_LRTSequenceGenCfg],is_probe_leg=is_probe_leg)
def getFastElectron(self, flags, is_probe_leg=False):
if self.chainPart['idperfInfo']:
@@ -233,7 +233,7 @@ class ElectronChainConfiguration(ChainConfigurationBase):
return self.getEmptyStep(3,stepName)
else:
stepName = "fast_electron"
- return self.getStep(flags,3,stepName,[fastElectronSequenceCfg],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,3,stepName,[fastElectronSequenceGenCfg],is_probe_leg=is_probe_leg)
def getFastElectron_lrt(self, flags, is_probe_leg=False):
if self.chainPart['idperfInfo']:
@@ -241,39 +241,39 @@ class ElectronChainConfiguration(ChainConfigurationBase):
return self.getEmptyStep(3,stepName)
else:
stepName = "fast_electron_lrt"
- return self.getStep(flags,3,stepName,[fastElectronSequence_LRTCfg],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,3,stepName,[fastElectron_LRTSequenceGenCfg],is_probe_leg=is_probe_leg)
def getPrecisionCaloElectron(self, flags, is_probe_leg=False):
if self.chainPart['extra'] == 'ion':
stepName = 'precisionCalo_ion_electron'
- return self.getStep(flags,4, stepName, [precisionCaloSequenceCfg], ion=True, is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4, stepName, [precisionCaloSequenceGenCfg], ion=True, is_probe_leg=is_probe_leg)
stepName = "precisionCalo_electron"
- return self.getStep(flags,4,stepName,[precisionCaloSequenceCfg], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4,stepName,[precisionCaloSequenceGenCfg], is_probe_leg=is_probe_leg)
def getPrecisionCaloElectron_lrt(self, flags, is_probe_leg=False):
stepName = "precisionCalo_electron_lrt"
- return self.getStep(flags,4,stepName,[precisionCaloSequence_LRTCfg],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4,stepName,[precisionCalo_LRTSequenceGenCfg],is_probe_leg=is_probe_leg)
def getPrecisionTracking(self, flags, is_probe_leg=False):
if self.chainPart['extra'] == 'ion':
stepName = 'precisionTracking_ion_electron'
- return self.getStep(flags,5, stepName, [precisionTrackingSequenceCfg], ion=True, is_probe_leg=is_probe_leg)
+ return self.getStep(flags,5, stepName, [precisionTrackingSequenceGenCfg], ion=True, is_probe_leg=is_probe_leg)
stepName = "precisionTracking_electron"
- return self.getStep(flags,5,stepName,[precisionTrackingSequenceCfg], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,5,stepName,[precisionTrackingSequenceGenCfg], is_probe_leg=is_probe_leg)
def getPrecisionTracking_lrt(self, flags, is_probe_leg=False):
stepName = "precisionTracking_electron_lrt"
- return self.getStep(flags,5,stepName,[precisionTrackingSequence_LRTCfg],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,5,stepName,[precisionTracking_LRTSequenceGenCfg],is_probe_leg=is_probe_leg)
def getPrecisionTrack_GSFRefitted(self, flags, is_probe_leg=False):
stepName = "PrecisionTrack_GSFRefitted_electron"
- return self.getStep(flags,6,stepName,[precisionTracks_GSFRefittedSequenceCfg], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,6,stepName,[precisionTracks_GSFRefittedSequenceGenCfg], is_probe_leg=is_probe_leg)
def getPrecisionTrack_GSFRefitted_lrt(self, flags, is_probe_leg=False):
stepName = "PrecisionTrack_GSFRefitted_electron_lrt"
- return self.getStep(flags,6,stepName,[precisionTracks_GSFRefittedSequence_LRTCfg], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,6,stepName,[precisionTracks_GSFRefitted_LRTSequenceGenCfg], is_probe_leg=is_probe_leg)
def getPrecisionElectron(self, flags, is_probe_leg=False):
@@ -282,19 +282,19 @@ class ElectronChainConfiguration(ChainConfigurationBase):
if "Zee" in self.chainDict['topo']:
stepName = "precision_electron_Zee"+str(isocut)
- return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectronSequenceCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectronSequenceGenCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict], is_probe_leg=is_probe_leg)
elif "Jpsiee" in self.chainDict['topo']:
stepName = "precision_topoelectron_Jpsiee"+str(isocut)
- return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectronSequenceCfg], comboTools=[diElectronJpsieeMassComboHypoToolFromDict], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectronSequenceGenCfg], comboTools=[diElectronJpsieeMassComboHypoToolFromDict], is_probe_leg=is_probe_leg)
elif "Heg" in self.chainDict['topo']:
stepName = "precision_electron_Heg"+str(isocut)
- return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectronSequenceCfg], comboTools=[diEgammaHegMassComboHypoToolFromDict], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectronSequenceGenCfg], comboTools=[diEgammaHegMassComboHypoToolFromDict], is_probe_leg=is_probe_leg)
elif self.chainPart['extra'] == 'ion':
stepName = "precision_ion_electron" + str(isocut)
- return self.getStep(flags,7,stepName,[precisionElectronSequenceCfg], ion=True, is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,[precisionElectronSequenceGenCfg], ion=True, is_probe_leg=is_probe_leg)
else:
stepName = "precision_electron_nominal"+str(isocut)
- return self.getStep(flags,7,stepName,[ precisionElectronSequenceCfg ], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,[ precisionElectronSequenceGenCfg ], is_probe_leg=is_probe_leg)
def getPrecisionGSFElectron(self, flags, is_probe_leg=False):
@@ -303,39 +303,39 @@ class ElectronChainConfiguration(ChainConfigurationBase):
if "Zee" in self.chainDict['topo']:
stepName = "precision_topoelectron_Zee_GSF"+str(isocut)
- return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectronSequence_GSFCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectron_GSFSequenceGenCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict], is_probe_leg=is_probe_leg)
elif "Jpsiee" in self.chainDict['topo']:
stepName = "precision_topoelectron_Jpsiee_GSF"+str(isocut)
- return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectronSequence_GSFCfg], comboTools=[diElectronJpsieeMassComboHypoToolFromDict], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectron_GSFSequenceGenCfg], comboTools=[diElectronJpsieeMassComboHypoToolFromDict], is_probe_leg=is_probe_leg)
elif "bBeeM6000" in self.chainDict['topo']:
signatures = self.chainDict['signatures']
if signatures.count(signatures[0]) == len(signatures):
stepName = "noMuon_precision_electron_bBee_GSF"+str(isocut)
- return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectronSequence_GSFCfg], comboHypoCfg=NoMuonDiElecPrecisionGSFComboHypoCfg, comboTools=[TrigMultiTrkComboHypoToolFromDict], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectron_GSFSequenceGenCfg], comboHypoCfg=NoMuonDiElecPrecisionGSFComboHypoCfg, comboTools=[TrigMultiTrkComboHypoToolFromDict], is_probe_leg=is_probe_leg)
else:
stepName = "precision_electron_bBee_GSF"+str(isocut)
- return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectronSequence_GSFCfg], comboHypoCfg=DiElecPrecisionGSFComboHypoCfg, comboTools=[TrigMultiTrkComboHypoToolFromDict], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,sequenceCfgArray=[precisionElectron_GSFSequenceGenCfg], comboHypoCfg=DiElecPrecisionGSFComboHypoCfg, comboTools=[TrigMultiTrkComboHypoToolFromDict], is_probe_leg=is_probe_leg)
else:
stepName = "precision_electron_GSF"+str(isocut)
- return self.getStep(flags,7,stepName,[precisionElectronSequence_GSFCfg], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,[precisionElectron_GSFSequenceGenCfg], is_probe_leg=is_probe_leg)
def getPrecisionGSFElectron_lrt(self, flags, is_probe_leg=False):
isocut = self.chainPart['isoInfo']
log.debug(' isolation cut = %s', isocut)
stepName = "precision_electron_LRTGSF"+str(isocut)
- return self.getStep(flags,7,stepName,[precisionElectronSequence_GSF_LRTCfg], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,[precisionElectron_GSF_LRTSequenceGenCfg], is_probe_leg=is_probe_leg)
def getPrecisionElectron_lrt(self, flags, is_probe_leg=False):
isocut = self.chainPart['isoInfo']
log.debug(' isolation cut = %s', isocut)
stepName = "precision_electron_lrt"+str(isocut)
- return self.getStep(flags,7,stepName,[ precisionElectronSequence_LRTCfg],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,7,stepName,[ precisionElectron_LRTSequenceGenCfg],is_probe_leg=is_probe_leg)
def getFastCalo_fwd(self, flags, is_probe_leg=False):
stepName = "FastCalo_FWD_electron"
- return self.getStep(flags,1, stepName, [fastCaloMenuSequence_FWDCfg], name='Electron', is_probe_leg=is_probe_leg)
+ return self.getStep(flags,1, stepName, [fastCalo_FWDSequenceGenCfg], name='Electron', is_probe_leg=is_probe_leg)
def getEmptyRefitStep(self, flags, is_probe_leg=False):
return self.getEmptyStep(6,'nonGSFEmptyRefit')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py
index 22f057b14d6012128bbb474dc8c97d99980fbcba..6a820ea88c17845e0bdccabc48cb4a21dad8bf72 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py
@@ -10,7 +10,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.AccumulatorCache import AccumulatorCache
@AccumulatorCache
-def fastElectronSequenceCfg(flags, name='FastElectron', variant='', is_probe_leg = False):
+def fastElectronSequenceGenCfg(flags, name='FastElectron', variant='', is_probe_leg = False):
""" second step: tracking....."""
InViewRoIs = "EMFastElectronRoIs"+variant
@@ -40,6 +40,6 @@ def fastElectronSequenceCfg(flags, name='FastElectron', variant='', is_probe_leg
return MenuSequenceCA(flags,selAcc,HypoToolGen=TrigEgammaFastElectronHypoToolFromDict,isProbe=is_probe_leg)
-def fastElectronSequence_LRTCfg(flags, name='FastElectron', is_probe_leg=False):
+def fastElectron_LRTSequenceGenCfg(flags, name='FastElectron', is_probe_leg=False):
# This is to call fastElectronMenuSequence for the _LRT variant
- return fastElectronSequenceCfg(flags, name, is_probe_leg=is_probe_leg, variant='_LRT')
+ return fastElectronSequenceGenCfg(flags, name, is_probe_leg=is_probe_leg, variant='_LRT')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py
index 83eaf521bc0274420ccbcedea3610051518b0a38..8b9ff0268906717ed666e776cea3cb7fb7e89129 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py
@@ -9,7 +9,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
@AccumulatorCache
-def fastTrackingSequenceCfg(flags, variant='', is_probe_leg = False):
+def fastTrackingSequenceGenCfg(flags, variant='', is_probe_leg = False):
""" second step: tracking....."""
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
TrigEgammaKeys = getTrigEgammaKeys(variant)
@@ -49,6 +49,6 @@ def fastTrackingSequenceCfg(flags, variant='', is_probe_leg = False):
return MenuSequenceCA(flags,selAcc,HypoToolGen=acceptAllHypoToolGen,isProbe=is_probe_leg)
-def fastTrackingSequence_LRTCfg(flags, is_probe_leg=False):
+def fastTracking_LRTSequenceGenCfg(flags, is_probe_leg=False):
# This is to call fastElectronMenuSequence for the _LRT variant
- return fastTrackingSequenceCfg(flags, variant='_LRT', is_probe_leg=is_probe_leg)
+ return fastTrackingSequenceGenCfg(flags, variant='_LRT', is_probe_leg=is_probe_leg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py
index ab43a1112df31cafafaf6933010a42134d82e0e9..69cc3ba9c3aa3db4e5c385837a6fc6638c8959d2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py
@@ -12,7 +12,7 @@ def tag(ion):
return 'precision' + ('HI' if ion is True else '') + 'CaloElectron'
@AccumulatorCache
-def precisionCaloSequenceCfg(flags, ion=False, is_probe_leg=False, variant=''):
+def precisionCaloSequenceGenCfg(flags, ion=False, is_probe_leg=False, variant=''):
""" Creates PrecisionCalo sequence """
TrigEgammaKeys = getTrigEgammaKeys(variant, ion=ion)
hiInfo = 'HI' if ion else ''
@@ -56,5 +56,5 @@ def precisionCaloSequenceCfg(flags, ion=False, is_probe_leg=False, variant=''):
return MenuSequenceCA(flags, selAcc, HypoToolGen=TrigEgammaPrecisionCaloHypoToolFromDict, isProbe=is_probe_leg)
-def precisionCaloSequence_LRTCfg(flags, ion=False, is_probe_leg=False):
- return precisionCaloSequenceCfg(flags, ion=ion, is_probe_leg=is_probe_leg, variant='_LRT')
+def precisionCalo_LRTSequenceGenCfg(flags, ion=False, is_probe_leg=False):
+ return precisionCaloSequenceGenCfg(flags, ion=ion, is_probe_leg=is_probe_leg, variant='_LRT')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py
index 8293c5b68e2ccd59778a859814bdc07e03a49ac9..586e4618a9ae952d145a9d07765e6cc70b88f37b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py
@@ -13,7 +13,7 @@ def tag(ion):
return 'precision' + ('HI' if ion is True else '') + 'Electron'
@AccumulatorCache
-def precisionElectronSequenceCfg(flags, ion=False, variant='',is_probe_leg = False):
+def precisionElectronSequenceGenCfg(flags, ion=False, variant='',is_probe_leg = False):
""" seventh step: precision electron....."""
inViewRoIs = "precisionElectron"
@@ -33,6 +33,6 @@ def precisionElectronSequenceCfg(flags, ion=False, variant='',is_probe_leg = Fal
selAcc.mergeHypo(TrigEgammaPrecisionElectronHypoAlgCfg(flags, "TrigEgamma"+tag(ion)+"HypoAlg_noGSF"+variant+probeInfo, TrigEgammaKeys.precisionElectronContainer ))
return MenuSequenceCA(flags,selAcc,HypoToolGen=TrigEgammaPrecisionElectronHypoToolFromDict, isProbe=is_probe_leg)
-def precisionElectronSequence_LRTCfg(flags, is_probe_leg=False):
+def precisionElectron_LRTSequenceGenCfg(flags, is_probe_leg=False):
# This is to call precisionElectronMenuSequence for the _LRT variant
- return precisionElectronSequenceCfg(flags, ion=False, variant='_LRT',is_probe_leg=is_probe_leg)
+ return precisionElectronSequenceGenCfg(flags, ion=False, variant='_LRT',is_probe_leg=is_probe_leg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py
index c450f27b2a9cf4bf0557511fe624db43f053d6aa..5ec7971c2e68d4dcff7b70a3b9974a813b0f95da 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py
@@ -13,7 +13,7 @@ def tag(ion):
@AccumulatorCache
-def precisionElectronSequence_GSFCfg(flags, ion=False, variant='_GSF', is_probe_leg=False):
+def precisionElectron_GSFSequenceGenCfg(flags, ion=False, variant='_GSF', is_probe_leg=False):
"""
Similar setup as ../PrecisionElectronMenuSequences.py; tailored for GSF chains
"""
@@ -34,6 +34,6 @@ def precisionElectronSequence_GSFCfg(flags, ion=False, variant='_GSF', is_probe_
selAcc.mergeHypo(TrigEgammaPrecisionElectronHypoAlgCfg(flags, "TrigEgamma"+tag(ion)+"HypoAlg"+variant+probeInfo, TrigEgammaKeys.precisionElectronContainer ))
return MenuSequenceCA(flags,selAcc,HypoToolGen=TrigEgammaPrecisionElectronHypoToolFromDict, isProbe=is_probe_leg)
-def precisionElectronSequence_GSF_LRTCfg(flags, is_probe_leg=False):
+def precisionElectron_GSF_LRTSequenceGenCfg(flags, is_probe_leg=False):
# This is to call precisionElectronMenuSequence for the _LRT variant
- return precisionElectronSequence_GSFCfg(flags, ion=False, variant='_LRTGSF',is_probe_leg=is_probe_leg)
+ return precisionElectron_GSFSequenceGenCfg(flags, ion=False, variant='_LRTGSF',is_probe_leg=is_probe_leg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py
index 6047db7d3c2d566e5b53e8a0ecfcb14d0cc2942e..be0d8f960dea240df7a6fab9afd2d8a97858c40f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py
@@ -12,7 +12,7 @@ def tag(ion):
@AccumulatorCache
-def precisionTrackingSequenceCfg(flags, ion=False, variant='', is_probe_leg = False):
+def precisionTrackingSequenceGenCfg(flags, ion=False, variant='', is_probe_leg = False):
""" fourth step: precision electron....."""
inViewRoIs = "precisionTracking" + variant
@@ -45,5 +45,5 @@ def precisionTrackingSequenceCfg(flags, ion=False, variant='', is_probe_leg = Fa
return MenuSequenceCA(flags,selAcc,HypoToolGen=acceptAllHypoToolGen,isProbe=is_probe_leg)
-def precisionTrackingSequence_LRTCfg(flags, is_probe_leg=False):
- return precisionTrackingSequenceCfg(flags, is_probe_leg=is_probe_leg, ion=False, variant='_LRT')
+def precisionTracking_LRTSequenceGenCfg(flags, is_probe_leg=False):
+ return precisionTrackingSequenceGenCfg(flags, is_probe_leg=is_probe_leg, ion=False, variant='_LRT')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedMenuSequences.py
index 94ec3af4b0c0880ea02731dfee2931b6399ad889..65b22031dd585083890e5297572458f5e43d8dba 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedMenuSequences.py
@@ -11,7 +11,7 @@ def tag(ion):
return 'precision' + ('HI' if ion is True else '') + 'Tracking_GSFRefitted'
@AccumulatorCache
-def precisionTracks_GSFRefittedSequenceCfg(flags, name='Electron', ion=False, variant='_GSF', is_probe_leg = False):
+def precisionTracks_GSFRefittedSequenceGenCfg(flags, name='Electron', ion=False, variant='_GSF', is_probe_leg = False):
""" sixth step: GSF refitting of precision track....."""
inViewRoIs = "precisionTracks_GSFRefitted"+variant
@@ -42,5 +42,5 @@ def precisionTracks_GSFRefittedSequenceCfg(flags, name='Electron', ion=False, va
return MenuSequenceCA(flags,selAcc,HypoToolGen=acceptAllHypoToolGen,isProbe=is_probe_leg)
-def precisionTracks_GSFRefittedSequence_LRTCfg(flags, name='Electron', is_probe_leg=False):
- return precisionTracks_GSFRefittedSequenceCfg(flags, name, is_probe_leg=is_probe_leg, ion=False, variant='_LRTGSF')
+def precisionTracks_GSFRefitted_LRTSequenceGenCfg(flags, name='Electron', is_probe_leg=False):
+ return precisionTracks_GSFRefittedSequenceGenCfg(flags, name, is_probe_leg=is_probe_leg, ion=False, variant='_LRTGSF')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonChainConfiguration.py
index acc9c90f49e84b4f1b3a0ffb6db1dca6f1634cc7..3e632e52dcdd5cd0c7ac4609bd135592a07fbf6b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonChainConfiguration.py
@@ -4,7 +4,7 @@ from AthenaCommon.Logging import logging
logging.getLogger().info('Importing %s', __name__)
log = logging.getLogger(__name__)
from ..Config.ChainConfigurationBase import ChainConfigurationBase
-from ..HeavyIon.HeavyIonMenuSequences import HIFwdGapMenuSequenceCfg
+from ..HeavyIon.HeavyIonMenuSequences import HIFwdGapMenuSequenceGenCfg
class HeavyIonChainConfig(ChainConfigurationBase):
@@ -19,5 +19,5 @@ class HeavyIonChainConfig(ChainConfigurationBase):
log.debug('Assembling chain for %s', self.chainName)
steps = []
if 'Fgap' in self.chainPart['hypoFgapInfo'][0]:
- steps.append(self.getStep(flags,1, 'Fgap', [HIFwdGapMenuSequenceCfg]))
+ steps.append(self.getStep(flags,1, 'Fgap', [HIFwdGapMenuSequenceGenCfg]))
return self.buildChain(steps)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py
index 7e5863266738944fb3a4b9e427fb7a92338f69e7..b39bb3adfc0b82f6dce6b432797c0206f5ed91df 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py
@@ -30,7 +30,7 @@ def egammaFSHIEventShapeMakerCfg(flags):
-def HIFwdGapMenuSequenceCfg(flags):
+def HIFwdGapMenuSequenceGenCfg(flags):
from ..Config.MenuComponents import InEventRecoCA, SelectionCA, MenuSequenceCA
from AthenaConfiguration.ComponentFactory import CompFactory
from TrigHIHypo.TrigHIFwdGapHypoConfig import TrigHIFwdGapHypoToolFromDict
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequencesConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequencesConfig.py
index c1d2888244e5f5ff8702c0cc5c3d3db1dda4ff96..2d0b6e499dcb780e03f6a1f1a185abadb8e84574 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequencesConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequencesConfig.py
@@ -8,7 +8,7 @@ from ..Config.MenuComponents import MenuSequenceCA, SelectionCA, InEventRecoCA
from AthenaConfiguration.ComponentFactory import CompFactory
import functools
-def jetEJsMenuSequence(flags, jetsIn):
+def jetEJsMenuSequenceGenCfg(flags, jetsIn):
from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetEJsHypoToolFromDict
@@ -40,7 +40,7 @@ def jetEJsMenuSequence(flags, jetsIn):
return MenuSequenceCA(flags, selAcc, HypoToolGen=trigJetEJsHypoToolFromDict)
return functools.partial(makejetEJsMenuSequence)
-def jetCRVARMenuSequence(flags, jetsIn):
+def jetCRVARMenuSequenceGenCfg(flags, jetsIn):
from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetCRVARHypoToolFromDict
# Get track sequence name
@@ -69,7 +69,7 @@ def jetCRVARMenuSequence(flags, jetsIn):
return functools.partial(makejetCRVARMenuSequence)
-def jetCRMenuSequence(flags, jetsIn):
+def jetCRMenuSequenceGenCfg(flags, jetsIn):
from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetCRHypoToolFromDict
@@ -95,8 +95,8 @@ def jetCRMenuSequence(flags, jetsIn):
)
)
- def makejetCRMenuSequence():
+ def makejetCRMenuSequenceGenCfg():
return MenuSequenceCA(flags, selAcc, HypoToolGen=trigJetCRHypoToolFromDict)
- return functools.partial(makejetCRMenuSequence)
+ return functools.partial(makejetCRMenuSequenceGenCfg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetChainConfiguration.py
index b566e2ba16e974cbab3bd6c098060f17a63746d2..5a5d7cf38d5cb6515d5042e1e64efedf9f47d4a3 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetChainConfiguration.py
@@ -9,13 +9,13 @@ from ..Config.ChainConfigurationBase import ChainConfigurationBase
from ..Config.MenuComponents import ChainStep
from .JetMenuSequencesConfig import (
- jetCaloHypoMenuSequence,
- jetRoITrackJetTagHypoMenuSequence,
- jetFSTrackingHypoMenuSequence,
- jetCaloRecoMenuSequence,
- jetCaloPreselMenuSequence,
+ jetCaloHypoMenuSequenceGenCfg,
+ jetRoITrackJetTagHypoMenuSequenceGenCfg,
+ jetFSTrackingHypoMenuSequenceGenCfg,
+ jetCaloRecoMenuSequenceGenCfg,
+ jetCaloPreselMenuSequenceGenCfg,
)
-from .ExoticJetSequencesConfig import jetEJsMenuSequence, jetCRVARMenuSequence,jetCRMenuSequence
+from .ExoticJetSequencesConfig import jetEJsMenuSequenceGenCfg, jetCRVARMenuSequenceGenCfg,jetCRMenuSequenceGenCfg
from . import JetRecoCommon
from . import JetPresel
@@ -193,7 +193,7 @@ class JetChainConfiguration(ChainConfigurationBase):
stepName = f"MainStep_jet_{self.recoDict['jetDefStr']}"
if self.isPerf:
stepName += '_perf'
- jetSeq, jetDef = jetCaloHypoMenuSequence(
+ jetSeq, jetDef = jetCaloHypoMenuSequenceGenCfg(
flags, isPerf=self.isPerf, **self.recoDict
)
jetCollectionName = jetDef.fullname()
@@ -206,8 +206,8 @@ class JetChainConfiguration(ChainConfigurationBase):
stepName += '_perf'
- from .JetMenuSequencesConfig import jetHICaloHypoMenuSequence
- jetSeq, jetDef = jetHICaloHypoMenuSequence(
+ from .JetMenuSequencesConfig import jetHICaloHypoMenuSequenceGenCfg
+ jetSeq, jetDef = jetHICaloHypoMenuSequenceGenCfg(
flags, isPerf=self.isPerf, **self.recoDict
)
@@ -218,7 +218,7 @@ class JetChainConfiguration(ChainConfigurationBase):
def getJetRoITrackJetTagHypoChainStep(self, flags, jetsInKey):
stepName = "RoIFTFStep_jet_sel_"+self.recoDict['jetDefStr']
- jetSeq = jetRoITrackJetTagHypoMenuSequence(
+ jetSeq = jetRoITrackJetTagHypoMenuSequenceGenCfg(
flags, jetsIn=jetsInKey, isPresel=False, **self.recoDict
)
return ChainStep(stepName, [jetSeq], multiplicity=[1], chainDicts=[self.dict])
@@ -227,7 +227,7 @@ class JetChainConfiguration(ChainConfigurationBase):
stepName = "MainStep_jet_"+self.recoDict['jetDefStr']
if self.isPerf:
stepName += '_perf'
- jetSeq, jetDef = jetFSTrackingHypoMenuSequence(
+ jetSeq, jetDef = jetFSTrackingHypoMenuSequenceGenCfg(
flags, clustersKey=clustersKey,
isPerf=self.isPerf,
**self.recoDict
@@ -237,7 +237,7 @@ class JetChainConfiguration(ChainConfigurationBase):
def getJetCaloRecoChainStep(self, flags):
stepName = "CaloRecoPTStep_jet_"+self.recoDict["clusterCalib"]
- jetSeq, clustersKey = jetCaloRecoMenuSequence(
+ jetSeq, clustersKey = jetCaloRecoMenuSequenceGenCfg(
flags, clusterCalib=self.recoDict["clusterCalib"]
)
@@ -255,7 +255,7 @@ class JetChainConfiguration(ChainConfigurationBase):
preselRecoDict = JetPresel.getPreselRecoDict(matched_reco.group())
stepName = "PreselStep_jet_"+preselRecoDict['jetDefStr']
- jetSeq, jetDef, clustersKey = jetCaloPreselMenuSequence( flags, **preselRecoDict )
+ jetSeq, jetDef, clustersKey = jetCaloPreselMenuSequenceGenCfg( flags, **preselRecoDict )
return str(clustersKey), jetDef, ChainStep(stepName, [jetSeq], multiplicity=[1], chainDicts=[self.dict])
@@ -275,7 +275,7 @@ class JetChainConfiguration(ChainConfigurationBase):
assert preselRecoDict['trkopt'] == 'roiftf', 'getJetRoITrackJetTagPreselChainStep: you requested a RoI tracking preselection but the reco dictionary has \'trkopt\' set to {0}'.format(preselRecoDict['trkopt'])
stepName = "RoIFTFStep_jet_"+self.recoDict['jetDefStr']
- jetSeq = jetRoITrackJetTagHypoMenuSequence(flags, jetsIn=jetsInKey, isPresel=True, **preselRecoDict)
+ jetSeq = jetRoITrackJetTagHypoMenuSequenceGenCfg(flags, jetsIn=jetsInKey, isPresel=True, **preselRecoDict)
return ChainStep(stepName, [jetSeq], multiplicity=[1], chainDicts=[self.dict])
@@ -305,7 +305,7 @@ class JetChainConfiguration(ChainConfigurationBase):
log.debug("Running exotic jets with ptf: " + str(ptf) + "\tdR: " + str(dr) + "\ttrackless: " + str(trackless) + "\thypo: " + exotdictstring)
stepName = "EJsStep_"
- jetSeq = jetEJsMenuSequence(flags, jetsIn=jetCollectionName)
+ jetSeq = jetEJsMenuSequenceGenCfg(flags, jetsIn=jetCollectionName)
chainStep = ChainStep(stepName, [jetSeq], multiplicity=[1], chainDicts=[self.dict])
return chainStep
@@ -325,7 +325,7 @@ class JetChainConfiguration(ChainConfigurationBase):
log.debug("Running exotic jets with MinjetlogR: " + str(MinjetlogR) + "\t BIB rm " + str(doBIBremoval) + "\thypo: " + exotdictstring)
stepName = "CRVARStep_"
- jetSeq = jetCRVARMenuSequence(flags, jetsIn=jetCollectionName)
+ jetSeq = jetCRVARMenuSequenceGenCfg(flags, jetsIn=jetCollectionName)
chainStep = ChainStep(stepName, [jetSeq], multiplicity=[1], chainDicts=[self.dict])
return chainStep
@@ -345,7 +345,7 @@ class JetChainConfiguration(ChainConfigurationBase):
log.debug("Running exotic jets with MinjetlogR: " + str(MinjetlogR) + "\t BIB rm " + str(doBIBremoval) + "\thypo: " + exotdictstring)
stepName = "CRStep_"
- jetSeq = jetCRMenuSequence(flags, jetsIn=jetCollectionName)
+ jetSeq = jetCRMenuSequenceGenCfg(flags, jetsIn=jetCollectionName)
chainStep = ChainStep(stepName, [jetSeq], multiplicity=[1], chainDicts=[self.dict])
return chainStep
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetMenuSequencesConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetMenuSequencesConfig.py
index 960ba1778d221afdf283aa2cee188d351724be28..332e67455fc4db367b9fba2f24701eebf8644c50 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetMenuSequencesConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetMenuSequencesConfig.py
@@ -171,7 +171,7 @@ def jetCaloPreselSelCfg(flags, **jetRecoDict):
selAcc.mergeHypo(jetSelectionCfg(flags, jetDefStr=jetRecoDict['jetDefStr'], jetsIn=jetDef.fullname(), hypoType=JetHypoAlgType.CALOPRESEL))
return selAcc, jetDef, clustersKey
-def jetCaloPreselMenuSequence(flags, **jetRecoDict):
+def jetCaloPreselMenuSequenceGenCfg(flags, **jetRecoDict):
selAcc, jetDef, clustersKey = jetCaloPreselSelCfg(flags, **jetRecoDict)
def makejetCaloPreselMenuSequence():
return MenuSequenceCA(flags, selAcc, HypoToolGen=hypoToolGenerator(hypoType=JetHypoAlgType.CALOPRESEL))
@@ -196,7 +196,7 @@ def jetCaloSelCfg(flags, clusterCalib):
selAcc.mergeHypo(jetSelectionCfg(flags, jetDefStr="caloreco", jetsIn=None, hypoType=JetHypoAlgType.PASSTHROUGH))
return selAcc, clustersKey
-def jetCaloRecoMenuSequence(flags, clusterCalib):
+def jetCaloRecoMenuSequenceGenCfg(flags, clusterCalib):
selAcc, clusterKey = jetCaloSelCfg(flags, clusterCalib)
def makejetCaloRecoMenuSequence():
return MenuSequenceCA(flags, selAcc, HypoToolGen=hypoToolGenerator(hypoType=JetHypoAlgType.PASSTHROUGH))
@@ -233,7 +233,7 @@ def jetCaloHypoSelCfg(flags, isPerf, **jetRecoDict):
return selAcc, jetDef, hypoType
-def jetCaloHypoMenuSequence(flags, isPerf, **jetRecoDict):
+def jetCaloHypoMenuSequenceGenCfg(flags, isPerf, **jetRecoDict):
selAcc, jetDef, hypoType = jetCaloHypoSelCfg(flags, isPerf, **jetRecoDict)
def makejetCaloHypoMenuSequence():
return MenuSequenceCA(flags, selAcc, HypoToolGen=hypoToolGenerator(hypoType))
@@ -259,7 +259,7 @@ def jetHICaloSelCfg(flags, isPerf, **jetRecoDict):
selAcc.mergeHypo(jetSelectionCfg(flags, jetDefStr=jetRecoDict['jetDefStr'], jetsIn=jetDef.fullname(), hypoType=hypoType))
return selAcc, jetDef, hypoType
-def jetHICaloHypoMenuSequence(flags, isPerf, **jetRecoDict):
+def jetHICaloHypoMenuSequenceGenCfg(flags, isPerf, **jetRecoDict):
selAcc, jetDef, hypoType = jetHICaloSelCfg(flags, isPerf, **jetRecoDict)
def makejetHICaloHypoMenuSequence():
return MenuSequenceCA(flags, selAcc, HypoToolGen=hypoToolGenerator(hypoType))
@@ -308,7 +308,7 @@ def jetFSTrackingSelCfg(flags, clustersKey, isPerf, **jetRecoDict):
return selAcc, jetDef, hypoType
-def jetFSTrackingHypoMenuSequence(flags, clustersKey, isPerf, **jetRecoDict):
+def jetFSTrackingHypoMenuSequenceGenCfg(flags, clustersKey, isPerf, **jetRecoDict):
selAcc, jetDef, hypoType = jetFSTrackingSelCfg(flags, clustersKey, isPerf, **jetRecoDict)
def makejetFSTrackingHypoMenuSequence():
return MenuSequenceCA(flags, selAcc, HypoToolGen=hypoToolGenerator(hypoType))
@@ -362,7 +362,7 @@ def jetRoITrackJetTagSelCfg(flags, jetsIn, isPresel=True, **jetRecoDict):
selAcc.mergeHypo(jetSelectionCfg(flags, jetDefStr=jetRecoDict['jetDefStr'], jetsIn=filtered_jetsIn, hypoType=hypoType))
return selAcc, hypoType
-def jetRoITrackJetTagHypoMenuSequence(flags, jetsIn, isPresel=True, **jetRecoDict):
+def jetRoITrackJetTagHypoMenuSequenceGenCfg(flags, jetsIn, isPresel=True, **jetRecoDict):
selAcc, hypoType = jetRoITrackJetTagSelCfg(flags, jetsIn, isPresel, **jetRecoDict)
def makejetRoITrackJetTagHypoMenuSequence():
return MenuSequenceCA(flags, selAcc, HypoToolGen=hypoToolGenerator(hypoType))
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTLASequenceConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTLASequenceConfig.py
index 253245d7d50bb32a237211b82bff67d9501a7f44..6d126fae4965e961fc3b3e5b355873e0a266b380 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTLASequenceConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTLASequenceConfig.py
@@ -29,7 +29,7 @@ def JetTLASequenceCfg(flags, jetsIn):
return recoAcc
@AccumulatorCache
-def JetTLAMenuSequenceCfg( flags, jetsIn, attachBtag=True ):
+def JetTLAMenuSequenceGenCfg( flags, jetsIn, attachBtag=True ):
jetsOut = recordable(jetsIn+"_TLA")
# retrieves the sequence
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/ConfigHelpers.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/ConfigHelpers.py
index 5b79e221d0240e9a23c4679da4fa1e7356677cd8..90618cb578531fa3a045462bdabcb2575b578370 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/ConfigHelpers.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/ConfigHelpers.py
@@ -236,7 +236,7 @@ class AlgConfig(ABC):
Sequences=[]
if sel_acc is None
else [
- functools.partial(make_MET_menu_sequence, flags, sel_acc, hypo_tool)
+ functools.partial(make_MET_menu_sequenceGenCfg, flags, sel_acc, hypo_tool)
],
comboHypoCfg=ComboHypoCfg
)
@@ -295,7 +295,7 @@ class AlgConfig(ABC):
raise ValueError("Unknown EFrecoAlg '{}' requested".format(EFrecoAlg))
-def make_MET_menu_sequence(flags, sel_acc, hypo_tool):
+def make_MET_menu_sequenceGenCfg(flags, sel_acc, hypo_tool):
return MenuSequenceCA(flags, selectionCA=sel_acc, HypoToolGen=hypo_tool)
# Load all the defined configurations
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py
index 28489b91982444c477522b0cc6c6f118519833f3..2f911eca438159068cfa5c27abba956d3b5ba68e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py
@@ -39,7 +39,7 @@ def AFPTrkRecoBaseSequenceCfg(flags):
@AccumulatorCache
-def AFPTrkSequenceCfg(flags):
+def AFPTrkSequenceGenCfg(flags):
def trigStreamerAFPHypoTool(chainDict):
return CompFactory.TrigStreamerHypoTool(chainDict['chainName'])
@@ -120,7 +120,7 @@ def AFPGlobalRecoSequenceCfg(flags):
@AccumulatorCache
-def AFPGlobalSequenceCfg(flags):
+def AFPGlobalSequenceGenCfg(flags):
def trigStreamerAFPToFHypoTool(chainDict):
return CompFactory.TrigStreamerHypoTool(chainDict['chainName'])
@@ -143,7 +143,7 @@ def AFPToFDeltaZToolGen(chainDict):
return hypotool
@AccumulatorCache
-def AFPToFDeltaZSequenceCfg(flags):
+def AFPToFDeltaZSequenceGenCfg(flags):
recoAcc = AFPGlobalRecoSequenceCfg(flags)
@@ -181,8 +181,8 @@ if __name__ == '__main__':
flags.lock()
- afp_trk = AFPTrkSequenceCfg(flags)
+ afp_trk = AFPTrkSequenceGenCfg(flags)
afp_trk.ca.printConfig(withDetails=True)
- afp_glob = AFPGlobalSequenceCfg(flags)
+ afp_glob = AFPGlobalSequenceGenCfg(flags)
afp_glob.ca.printConfig(withDetails=True)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasChainConfiguration.py
index cb812e0a87c6de2819d6e86046074d015bbd8e32..65e3afefdc87d7d6a2ca1850e9900e80a86bfcd0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasChainConfiguration.py
@@ -6,11 +6,11 @@ log = logging.getLogger( __name__ )
from TriggerMenuMT.HLT.Config.ChainConfigurationBase import ChainConfigurationBase
-from TriggerMenuMT.HLT.MinBias.MinBiasMenuSequences import (MinBiasSPSequenceCfg,
- MinBiasTrkSequenceCfg,
- MinBiasMbtsSequenceCfg,
- MinBiasZVertexFinderSequenceCfg)
-from TriggerMenuMT.HLT.MinBias.AFPMenuSequence import AFPTrkSequenceCfg, AFPGlobalSequenceCfg, AFPToFDeltaZSequenceCfg
+from TriggerMenuMT.HLT.MinBias.MinBiasMenuSequences import (MinBiasSPSequenceGenCfg,
+ MinBiasTrkSequenceGenCfg,
+ MinBiasMbtsSequenceGenCfg,
+ MinBiasZVertexFinderSequenceGenCfg)
+from TriggerMenuMT.HLT.MinBias.AFPMenuSequence import AFPTrkSequenceGenCfg, AFPGlobalSequenceGenCfg, AFPToFDeltaZSequenceGenCfg
class MinBiasChainConfig(ChainConfigurationBase):
@@ -47,25 +47,25 @@ class MinBiasChainConfig(ChainConfigurationBase):
return self.buildChain(steps)
def getMinBiasMbtsStep(self, flags):
- return self.getStep(flags,1,'Mbts', [MinBiasMbtsSequenceCfg])
+ return self.getStep(flags,1,'Mbts', [MinBiasMbtsSequenceGenCfg])
def getMinBiasEmptyMbtsStep(self, flags):
return self.getEmptyStep(1,'EmptyMbts')
def getMinBiasSpStep(self, flags):
- return self.getStep(flags,2,'SPCount', [MinBiasSPSequenceCfg])
+ return self.getStep(flags,2,'SPCount', [MinBiasSPSequenceGenCfg])
def getMinBiasZFindStep(self, flags):
- return self.getStep(flags,3,'ZFind', [MinBiasZVertexFinderSequenceCfg])
+ return self.getStep(flags,3,'ZFind', [MinBiasZVertexFinderSequenceGenCfg])
def getMinBiasTrkStep(self, flags):
- return self.getStep(flags,4,'TrkCount', [MinBiasTrkSequenceCfg])
+ return self.getStep(flags,4,'TrkCount', [MinBiasTrkSequenceGenCfg])
def getAFPTrkStep(self, flags):
- return self.getStep(flags,1,'AFPTrk', [AFPTrkSequenceCfg])
+ return self.getStep(flags,1,'AFPTrk', [AFPTrkSequenceGenCfg])
def getAFPGlobalStep(self, flags):
- return self.getStep(flags,2,'AFPGlobal', [AFPGlobalSequenceCfg])
+ return self.getStep(flags,2,'AFPGlobal', [AFPGlobalSequenceGenCfg])
def getAFPToFDeltaZStep(self, flags):
- return self.getStep(flags,2,'AFPToFDeltaZ', [AFPToFDeltaZSequenceCfg])
+ return self.getStep(flags,2,'AFPToFDeltaZ', [AFPToFDeltaZSequenceGenCfg])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py
index 885f499de3ea165cbd1c1e4e0b0c967505c4223a..431458d08510213f35b27ab4eb215e6fc37bbac5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py
@@ -125,11 +125,11 @@ def MinBiasSPSel(flags):
selAcc.addHypoAlgo(spCountHypo)
return selAcc
-def MinBiasSPSequenceCfg(flags):
+def MinBiasSPSequenceGenCfg(flags):
selAcc = MinBiasSPSel(flags)
return MenuSequenceCA(flags, selAcc, HypoToolGen = SPCountHypoToolGen)
-def MinBiasZVertexFinderSequenceCfg(flags):
+def MinBiasZVertexFinderSequenceGenCfg(flags):
recoAcc = InViewRecoCA(name="ZVertFinderReco", InViewRoIs="InputRoI", RequireParentView=True)
vdv = CompFactory.AthViews.ViewDataVerifier( "VDVZFinderInputs",
DataObjects = {( 'SpacePointContainer' , 'StoreGateSvc+PixelTrigSpacePoints'),
@@ -144,7 +144,7 @@ def MinBiasZVertexFinderSequenceCfg(flags):
return MenuSequenceCA(flags, selAcc, HypoToolGen = TrigZVertexHypoToolGen)
-def MinBiasTrkSequenceCfg(flags):
+def MinBiasTrkSequenceGenCfg(flags):
recoAcc = InViewRecoCA(name="MBTrackReco", InViewRoIs="InputRoI", RequireParentView=True)
from TrigInDetConfig.utils import getFlagsForActiveConfig
@@ -164,7 +164,7 @@ def MinBiasTrkSequenceCfg(flags):
selAcc.mergeHypo(trackCountHypoAlgo)
return MenuSequenceCA(flagsWithTrk, selAcc, HypoToolGen = TrackCountHypoToolGen)
-def MinBiasMbtsSequenceCfg(flags):
+def MinBiasMbtsSequenceGenCfg(flags):
recoAcc = InEventRecoCA(name="Mbts")
from TrigMinBias.MbtsConfig import MbtsFexCfg, MbtsSGInputCfg
fex = MbtsFexCfg(flags, MbtsBitsKey = recordable("HLT_MbtsBitsContainer"))
@@ -184,10 +184,10 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import initConfigFlags
flags = initConfigFlags()
flags.lock()
- zf = MinBiasZVertexFinderSequenceCfg(flags)
+ zf = MinBiasZVertexFinderSequenceGenCfg(flags)
zf.ca.printConfig(withDetails=True)
- mb = MinBiasMbtsSequenceCfg(flags)
+ mb = MinBiasMbtsSequenceGenCfg(flags)
mb.ca.printConfig()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonChainConfiguration.py
index 64cb88e8d98d8df231df39a7a477205d05a85b4c..98aed443dfbb0df92391ff444c13f4a470f4486e 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonChainConfiguration.py
@@ -11,9 +11,15 @@ log = logging.getLogger(__name__)
from ..Config.ChainConfigurationBase import ChainConfigurationBase
-from .MuonMenuSequences import muFastSequence, muFastCalibSequence, mul2mtSAOvlpRmSequence, muCombSequence, muCombOvlpRmSequence, mul2mtCBOvlpRmSequence, mul2IOOvlpRmSequence, muCombLRTSequence, muEFSASequence, muEFSAFSSequence, efLateMuSequence, muEFCBSequence, muEFCBIDperfSequence, muEFCBLRTSequence, muEFCBLRTIDperfSequence, muEFCBFSSequence, muEFIDtpSequence, muEFIsoSequence, muEFMSIsoSequence
+from .MuonMenuSequences import (
+ muFastSequenceGenCfg, muFastCalibSequenceGenCfg, mul2mtSAOvlpRmSequenceGenCfg,
+ muCombSequenceGenCfg, muCombOvlpRmSequenceGenCfg, mul2mtCBOvlpRmSequenceGenCfg,
+ mul2IOOvlpRmSequenceGenCfg, muCombLRTSequenceGenCfg, muEFSASequenceGenCfg,
+ muEFSAFSSequenceGenCfg, efLateMuSequenceGenCfg, muEFCBSequenceGenCfg,
+ muEFCBIDperfSequenceGenCfg, muEFCBLRTSequenceGenCfg, muEFCBLRTIDperfSequenceGenCfg,
+ muEFCBFSSequenceGenCfg, muEFIDtpSequenceGenCfg, muEFIsoSequenceGenCfg,
+ muEFMSIsoSequenceGenCfg, efLateMuRoISequenceGenCfg, muRoiClusterSequenceGenCfg )
-from .MuonMenuSequences import efLateMuRoISequence, muRoiClusterSequence
from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFInvMassHypoToolFromDict
from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFIdtpInvMassHypoToolFromDict
@@ -89,11 +95,11 @@ class MuonChainConfiguration(ChainConfigurationBase):
def getmuFast(self, flags, is_probe_leg=False):
if 'muoncalib' in self.chainPart['extra']:
- return self.getStep(flags,1,"mufastcalib", [muFastCalibSequence], is_probe_leg=is_probe_leg )
+ return self.getStep(flags,1,"mufastcalib", [muFastCalibSequenceGenCfg], is_probe_leg=is_probe_leg )
elif 'l2mt' in self.chainPart['l2AlgInfo']:
- return self.getStep(flags,1,"mufastl2mt", [mul2mtSAOvlpRmSequence], is_probe_leg=is_probe_leg )
+ return self.getStep(flags,1,"mufastl2mt", [mul2mtSAOvlpRmSequenceGenCfg], is_probe_leg=is_probe_leg )
else:
- return self.getStep(flags,1,"mufast", [muFastSequence], is_probe_leg=is_probe_leg )
+ return self.getStep(flags,1,"mufast", [muFastSequenceGenCfg], is_probe_leg=is_probe_leg )
# --------------------
@@ -110,63 +116,63 @@ class MuonChainConfiguration(ChainConfigurationBase):
doOvlpRm = False
if 'l2mt' in self.chainPart['l2AlgInfo']:
- return self.getStep(flags,2,"muCombl2mt", [mul2mtCBOvlpRmSequence], is_probe_leg=is_probe_leg )
+ return self.getStep(flags,2,"muCombl2mt", [mul2mtCBOvlpRmSequenceGenCfg], is_probe_leg=is_probe_leg )
elif 'l2io' in self.chainPart['l2AlgInfo']:
- return self.getStep(flags,2, 'muCombIO', [mul2IOOvlpRmSequence], is_probe_leg=is_probe_leg )
+ return self.getStep(flags,2, 'muCombIO', [mul2IOOvlpRmSequenceGenCfg], is_probe_leg=is_probe_leg )
elif doOvlpRm:
- return self.getStep(flags,2, 'muCombOVR', [muCombOvlpRmSequence], is_probe_leg=is_probe_leg )
+ return self.getStep(flags,2, 'muCombOVR', [muCombOvlpRmSequenceGenCfg], is_probe_leg=is_probe_leg )
elif "LRT" in self.chainPart['addInfo']:
- return self.getStep(flags,2, 'muCombLRT', [muCombLRTSequence], is_probe_leg=is_probe_leg )
+ return self.getStep(flags,2, 'muCombLRT', [muCombLRTSequenceGenCfg], is_probe_leg=is_probe_leg )
else:
- return self.getStep(flags,2, 'muComb', [muCombSequence], is_probe_leg=is_probe_leg )
+ return self.getStep(flags,2, 'muComb', [muCombSequenceGenCfg], is_probe_leg=is_probe_leg )
# --------------------
def getmuCombIO(self, flags, is_probe_leg=False):
- return self.getStep(flags,2, 'muCombIO', [mul2IOOvlpRmSequence], is_probe_leg=is_probe_leg )
+ return self.getStep(flags,2, 'muCombIO', [mul2IOOvlpRmSequenceGenCfg], is_probe_leg=is_probe_leg )
# --------------------
def getmuEFSA(self, flags, is_probe_leg=False):
- return self.getStep(flags,3,'muEFSA',[ muEFSASequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,3,'muEFSA',[ muEFSASequenceGenCfg], is_probe_leg=is_probe_leg)
# --------------------
def getmuEFCB(self, flags, is_probe_leg=False):
if 'invm' in self.chainPart['invMassInfo']: # No T&P support, add if needed
- return self.getStep(flags,4,'EFCB', [muEFCBSequence], comboTools=[TrigMuonEFInvMassHypoToolFromDict], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4,'EFCB', [muEFCBSequenceGenCfg], comboTools=[TrigMuonEFInvMassHypoToolFromDict], is_probe_leg=is_probe_leg)
elif "LRT" in self.chainPart['addInfo']:
if "idperf" in self.chainPart['addInfo']:
- return self.getStep(flags,4,'EFCBLRTIDPERF', [muEFCBLRTIDperfSequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4,'EFCBLRTIDPERF', [muEFCBLRTIDperfSequenceGenCfg], is_probe_leg=is_probe_leg)
else:
- return self.getStep(flags,4,'EFCBLRT', [muEFCBLRTSequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4,'EFCBLRT', [muEFCBLRTSequenceGenCfg], is_probe_leg=is_probe_leg)
elif "idperf" in self.chainPart['addInfo']:
- return self.getStep(flags,4,'EFCBIDPERF', [muEFCBIDperfSequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4,'EFCBIDPERF', [muEFCBIDperfSequenceGenCfg], is_probe_leg=is_probe_leg)
elif "idtp" in self.chainPart['addInfo']:
- return self.getStep(flags,4,'EFIDTP', [muEFIDtpSequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4,'EFIDTP', [muEFIDtpSequenceGenCfg], is_probe_leg=is_probe_leg)
else:
- return self.getStep(flags,4,'EFCB', [muEFCBSequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4,'EFCB', [muEFCBSequenceGenCfg], is_probe_leg=is_probe_leg)
# --------------------
def getFSmuEFSA(self, flags, is_probe_leg=False):
- return self.getStep(flags,5,'FSmuEFSA', [muEFSAFSSequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,5,'FSmuEFSA', [muEFSAFSSequenceGenCfg], is_probe_leg=is_probe_leg)
# --------------------
def getFSmuEFCB(self, flags, is_probe_leg=False):
if 'invm' in self.chainPart['invMassInfo']:
- return self.getStep(flags,6,'FSmuEFCB', [muEFCBFSSequence],comboTools=[TrigMuonEFInvMassHypoToolFromDict], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,6,'FSmuEFCB', [muEFCBFSSequenceGenCfg],comboTools=[TrigMuonEFInvMassHypoToolFromDict], is_probe_leg=is_probe_leg)
else:
- return self.getStep(flags,6,'FSmuEFCB', [muEFCBFSSequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,6,'FSmuEFCB', [muEFCBFSSequenceGenCfg], is_probe_leg=is_probe_leg)
#---------------------
def getmuEFIso(self, flags, is_probe_leg=False):
if any(x in self.dict['topo'] for x in ['b7invmAB9vtx20', 'b11invmAB60vtx20', 'b11invmAB24vtx20', 'b24invmAB60vtx20']):
from TrigBphysHypo.TrigMultiTrkComboHypoConfig import DrellYanComboHypoCfg, TrigMultiTrkComboHypoToolFromDict
- return self.getStep(flags,5,'muEFIsoDY', [muEFIsoSequence], comboHypoCfg=DrellYanComboHypoCfg, comboTools=[TrigMultiTrkComboHypoToolFromDict], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,5,'muEFIsoDY', [muEFIsoSequenceGenCfg], comboHypoCfg=DrellYanComboHypoCfg, comboTools=[TrigMultiTrkComboHypoToolFromDict], is_probe_leg=is_probe_leg)
else:
- return self.getStep(flags,5,'muEFIso', [muEFIsoSequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,5,'muEFIso', [muEFIsoSequenceGenCfg], is_probe_leg=is_probe_leg)
#---------------------
def getmuEFMSIso(self, flags, is_probe_leg=False):
- return self.getStep(flags,5,'muEFMSIso',[ muEFMSIsoSequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,5,'muEFMSIso',[ muEFMSIsoSequenceGenCfg], is_probe_leg=is_probe_leg)
#--------------------
def getmuMSEmptyAll(self, flags, stepID): # No T&P info needed for empty step?
@@ -186,15 +192,15 @@ class MuonChainConfiguration(ChainConfigurationBase):
#--------------------
def getLateMuRoI(self, flags, is_probe_leg=False): # No T&P support, add if needed
- return self.getStep(flags,1,'muEFLateRoI',[efLateMuRoISequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,1,'muEFLateRoI',[efLateMuRoISequenceGenCfg], is_probe_leg=is_probe_leg)
#--------------------
def getLateMu(self, flags, is_probe_leg=False): # No T&P support, add if needed
- return self.getStep(flags,2,'muEFLate',[efLateMuSequence], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,2,'muEFLate',[efLateMuSequenceGenCfg], is_probe_leg=is_probe_leg)
#--------------------
def getmuRoiClu(self, flags, is_probe_leg=False):
- return self.getStep(flags,1,'muRoiClu',[muRoiClusterSequence])
+ return self.getStep(flags,1,'muRoiClu',[muRoiClusterSequenceGenCfg])
def TrigMuonEFIdtpInvMassHypoToolCfg(flags, chainDict):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py
index 71016a1cb7061feb1a5f1235df285647c2d4296e..6123e26cbba00aa0e6c8277463e4d5d76b4be45f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py
@@ -102,7 +102,7 @@ def muFastCalibAlgSequenceCfg(flags, is_probe_leg=False):
@AccumulatorCache
-def muFastSequence(flags, is_probe_leg=False):
+def muFastSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muFastAlgSequenceCfg(flags, "", is_probe_leg)
@@ -121,7 +121,7 @@ def muFastSequence(flags, is_probe_leg=False):
@AccumulatorCache
-def muFastCalibSequence(flags, is_probe_leg=False):
+def muFastCalibSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muFastCalibAlgSequenceCfg(flags, is_probe_leg)
@@ -140,7 +140,7 @@ def muFastCalibSequence(flags, is_probe_leg=False):
@AccumulatorCache
-def mul2mtSAOvlpRmSequence(flags, is_probe_leg=False):
+def mul2mtSAOvlpRmSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muFastAlgSequenceCfg(flags, "mt", is_probe_leg)
@@ -256,7 +256,7 @@ def muCombAlgSequenceCfg(flags, selCAName="", is_probe_leg=False):
@AccumulatorCache
-def muCombSequence(flags, is_probe_leg=False):
+def muCombSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muCombAlgSequenceCfg(flags, "", is_probe_leg)
@@ -275,7 +275,7 @@ def muCombSequence(flags, is_probe_leg=False):
@AccumulatorCache
-def mul2IOOvlpRmSequence(flags, is_probe_leg=False):
+def mul2IOOvlpRmSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muCombAlgSequenceCfg(flags, "IO", is_probe_leg)
@@ -328,7 +328,7 @@ def muCombLRTAlgSequenceCfg(flags, is_probe_leg=False):
@AccumulatorCache
-def muCombLRTSequence(flags, is_probe_leg=False):
+def muCombLRTSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muCombLRTAlgSequenceCfg(flags, is_probe_leg)
@@ -348,7 +348,7 @@ def muCombLRTSequence(flags, is_probe_leg=False):
@AccumulatorCache
-def muCombOvlpRmSequence(flags, is_probe_leg=False):
+def muCombOvlpRmSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muCombAlgSequenceCfg(flags, "", is_probe_leg)
@@ -366,7 +366,7 @@ def muCombOvlpRmSequence(flags, is_probe_leg=False):
@AccumulatorCache
-def mul2mtCBOvlpRmSequence(flags, is_probe_leg=False):
+def mul2mtCBOvlpRmSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muCombAlgSequenceCfg(flags, "mt", is_probe_leg)
@@ -417,7 +417,7 @@ def muEFSAAlgSequenceCfg(flags, is_probe_leg=False):
@AccumulatorCache
-def muEFSASequence(flags, is_probe_leg=False):
+def muEFSASequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muEFSAAlgSequenceCfg(flags, is_probe_leg)
@@ -498,7 +498,7 @@ def muEFCBAlgSequenceCfg(flags, selCAName='', is_probe_leg=False):
@AccumulatorCache
-def muEFCBSequence(flags, is_probe_leg=False):
+def muEFCBSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muEFCBAlgSequenceCfg(flags, '', is_probe_leg)
@@ -517,7 +517,7 @@ def muEFCBSequence(flags, is_probe_leg=False):
@AccumulatorCache
-def muEFCBIDperfSequence(flags, is_probe_leg=False):
+def muEFCBIDperfSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muEFCBAlgSequenceCfg(flags, 'idperf', is_probe_leg)
@@ -537,7 +537,7 @@ def muEFCBIDperfSequence(flags, is_probe_leg=False):
@AccumulatorCache
-def muEFIDtpSequence(flags, is_probe_leg=False):
+def muEFIDtpSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muEFCBAlgSequenceCfg(flags, 'idtp', is_probe_leg)
@@ -577,7 +577,7 @@ def muEFCBLRTAlgSequenceCfg(flags, selCAName='', is_probe_leg=False):
@AccumulatorCache
-def muEFCBLRTSequence(flags, is_probe_leg=False):
+def muEFCBLRTSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muEFCBLRTAlgSequenceCfg(flags, '', is_probe_leg)
@@ -597,7 +597,7 @@ def muEFCBLRTSequence(flags, is_probe_leg=False):
@AccumulatorCache
-def muEFCBLRTIDperfSequence(flags, is_probe_leg=False):
+def muEFCBLRTIDperfSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muEFCBLRTAlgSequenceCfg(flags, 'idperf', is_probe_leg)
@@ -647,7 +647,7 @@ def muEFSAFSAlgSequenceCfg(flags):
@AccumulatorCache
-def muEFSAFSSequence(flags, is_probe_leg=False):
+def muEFSAFSSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muEFSAFSAlgSequenceCfg(flags)
@@ -732,7 +732,7 @@ def muEFCBFSAlgSequenceCfg(flags, is_probe_leg=False):
@AccumulatorCache
-def muEFCBFSSequence(flags, is_probe_leg=False):
+def muEFCBFSSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muEFCBFSAlgSequenceCfg(flags, is_probe_leg)
@@ -771,7 +771,7 @@ def efLateMuRoIAlgSequenceCfg(flags):
@AccumulatorCache
-def efLateMuRoISequence(flags):
+def efLateMuRoISequenceGenCfg(flags):
(selAcc, sequenceOut) = efLateMuRoIAlgSequenceCfg(flags)
@@ -822,7 +822,7 @@ def efLateMuAlgSequenceCfg(flags):
@AccumulatorCache
-def efLateMuSequence(flags):
+def efLateMuSequenceGenCfg(flags):
(selAcc, sequenceOut) = efLateMuAlgSequenceCfg(flags)
@@ -879,7 +879,7 @@ def muEFIsoAlgSequenceCfg(flags, doMSiso=False, is_probe_leg=False):
@AccumulatorCache
-def muEFIsoSequence(flags, is_probe_leg=False):
+def muEFIsoSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muEFIsoAlgSequenceCfg(flags, False, is_probe_leg)
@@ -897,7 +897,7 @@ def muEFIsoSequence(flags, is_probe_leg=False):
@AccumulatorCache
-def muEFMSIsoSequence(flags, is_probe_leg=False):
+def muEFMSIsoSequenceGenCfg(flags, is_probe_leg=False):
(selAcc, sequenceOut) = muEFIsoAlgSequenceCfg(flags, True, is_probe_leg)
@@ -918,7 +918,7 @@ def muEFMSIsoSequence(flags, is_probe_leg=False):
## Muon RoI Cluster Trigger for MS LLP Searches ##
####################################################
-def muRoiClusterSequence(flags):
+def muRoiClusterSequenceGenCfg(flags):
from TrigLongLivedParticles.TrigLongLivedParticlesConfig import MuonClusterConfig
from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConfig import MuonClusterHypoAlgConfig, TrigLongLivedParticlesHypoToolFromDict
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonTLASequenceConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonTLASequenceConfig.py
index 490387ad0feb9ab9e8190c36e3a78a2184c1ccd0..1bb23d777991e9b64492430c51f3072a067ae704 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonTLASequenceConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonTLASequenceConfig.py
@@ -37,7 +37,7 @@ def MuonTLASequenceCfg(flags, muons):
selAcc.addHypoAlgo(hypo)
return selAcc
-def MuonTLAMenuSequenceCfg( flags, muChainPart):
+def MuonTLAMenuSequenceGenCfg( flags, muChainPart):
muonsIn = getMuonCollections(muChainPart)
selAcc=MuonTLASequenceCfg(flags, muons=muonsIn)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py
index d1b6325b207cbcd3817218776045688eba7795fb..d076de58948612292f4b51ceaa51af1d27f39d2e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py
@@ -7,7 +7,7 @@ from AthenaConfiguration.AccumulatorCache import AccumulatorCache
@AccumulatorCache
-def fastPhotonSequenceCfg(flags,is_probe_leg=False):
+def fastPhotonSequenceGenCfg(flags,is_probe_leg=False):
"""Creates secpond step photon sequence"""
TrigEgammaKeys = getTrigEgammaKeys()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py
index 145e52ee0655ff43be556c443003a7faa9bec4f7..3a5369317339c5d7bcbe75816b5e37ff038eff13 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py
@@ -8,7 +8,7 @@ from TrigTRTHighTHitCounter.TrigTRTHTHCounterConfig import TrigTRTHTHCounterFex
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-def TRTHitGeneratorSequenceCfg(flags, is_probe_leg = False):
+def TRTHitGeneratorSequenceGenCfg(flags, is_probe_leg = False):
recAcc = ComponentAccumulator()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PhotonChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PhotonChainConfiguration.py
index f354a5b64207c1c577cb99d0c3d094e89b01ce26..ff377dbcf1f020dfb99657d07ef6315e742f2efc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PhotonChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PhotonChainConfiguration.py
@@ -9,12 +9,12 @@ log = logging.getLogger(__name__)
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
from ..Config.ChainConfigurationBase import ChainConfigurationBase
-from ..CommonSequences.CaloSequences import fastCaloMenuSequenceCfg
-from ..Photon.FastPhotonMenuSequences import fastPhotonSequenceCfg
-from ..Photon.PrecisionPhotonCaloIsoMenuSequences import precisionPhotonCaloIsoSequenceCfg
-from ..Photon.PrecisionPhotonMenuSequences import precisionPhotonSequenceCfg
-from ..Photon.PrecisionCaloMenuSequences import precisionCaloSequenceCfg
-from ..Photon.HipTRTMenuSequences import TRTHitGeneratorSequenceCfg
+from ..CommonSequences.CaloSequences import fastCaloSequenceGenCfg
+from ..Photon.FastPhotonMenuSequences import fastPhotonSequenceGenCfg
+from ..Photon.PrecisionPhotonCaloIsoMenuSequences import precisionPhotonCaloIsoSequenceGenCfg
+from ..Photon.PrecisionPhotonMenuSequences import precisionPhotonSequenceGenCfg
+from ..Photon.PrecisionCaloMenuSequences import precisionCaloSequenceGenCfg
+from ..Photon.HipTRTMenuSequences import TRTHitGeneratorSequenceGenCfg
def _diPhotonComboHypoToolFromDict(flags, chainDict, lowermass=80000,uppermass=-999,dphi=1.5,applymass=False,applydphi=False):
@@ -127,11 +127,11 @@ class PhotonChainConfiguration(ChainConfigurationBase):
def getFastCalo(self, flags, is_probe_leg=False):
stepName = "PhotonFastCalo"
- return self.getStep(flags,1,stepName,[fastCaloMenuSequenceCfg], name='Photon', is_probe_leg=is_probe_leg)
+ return self.getStep(flags,1,stepName,[fastCaloSequenceGenCfg], name='Photon', is_probe_leg=is_probe_leg)
def getFastPhoton(self, flags, is_probe_leg=False):
stepName = "FastPhoton"
- return self.getStep(flags,2,stepName,[fastPhotonSequenceCfg], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,2,stepName,[fastPhotonSequenceGenCfg], is_probe_leg=is_probe_leg)
def getPrecisionCaloPhoton(self, flags, is_probe_leg=False):
do_ion = 'ion' in self.chainPart['extra']
@@ -140,11 +140,11 @@ class PhotonChainConfiguration(ChainConfigurationBase):
else:
stepName = "PhotonPrecisionCalo"
- return self.getStep(flags,3,stepName,[precisionCaloSequenceCfg], ion=do_ion, is_probe_leg=is_probe_leg)
+ return self.getStep(flags,3,stepName,[precisionCaloSequenceGenCfg], ion=do_ion, is_probe_leg=is_probe_leg)
def getHipTRT(self, flags, is_probe_leg=False):
stepName = "hipTRT"
- return self.getStep(flags,2,stepName,[TRTHitGeneratorSequenceCfg], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,2,stepName,[TRTHitGeneratorSequenceGenCfg], is_probe_leg=is_probe_leg)
def getPrecisionPhoton(self, flags, is_probe_leg=False):
@@ -154,7 +154,7 @@ class PhotonChainConfiguration(ChainConfigurationBase):
if do_ion:
stepName += '_ion'
- return self.getStep(flags,4,stepName,sequenceCfgArray=[precisionPhotonSequenceCfg], ion=do_ion, is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4,stepName,sequenceCfgArray=[precisionPhotonSequenceGenCfg], ion=do_ion, is_probe_leg=is_probe_leg)
def getPhotonCaloIso(self, flags, is_probe_leg=False):
@@ -173,4 +173,4 @@ class PhotonChainConfiguration(ChainConfigurationBase):
else:
comboTools.append(diphotonDPhiHypoToolFromDict)
- return self.getStep(flags,5,stepName,sequenceCfgArray=[precisionPhotonCaloIsoSequenceCfg], name='Photon', comboTools=comboTools, ion=do_ion, is_probe_leg=is_probe_leg)
+ return self.getStep(flags,5,stepName,sequenceCfgArray=[precisionPhotonCaloIsoSequenceGenCfg], name='Photon', comboTools=comboTools, ion=do_ion, is_probe_leg=is_probe_leg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py
index 9346725ec0da11ea592831b893f9419e3aeec937..299fcfe2a5a467040e1e241dd254327510c98aa6 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py
@@ -12,7 +12,7 @@ def tag(ion):
return 'precision' + ('HI' if ion is True else '') + 'CaloPhoton'
@AccumulatorCache
-def precisionCaloSequenceCfg(flags, ion=False, is_probe_leg=False):
+def precisionCaloSequenceGenCfg(flags, ion=False, is_probe_leg=False):
""" Creates PrecisionCalo sequence """
TrigEgammaKeys = getTrigEgammaKeys(ion=ion)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py
index 001cfb6d407d62bd172b45f593e387b2817a1f74..cc5388c53108aba780b06f23c104cfa8218bf52d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py
@@ -13,7 +13,7 @@ def tag(ion):
return 'precision' + ('HI' if ion is True else '') + 'PhotonCaloIso'
@AccumulatorCache
-def precisionPhotonCaloIsoSequenceCfg(flags, name, ion=False, is_probe_leg=False):
+def precisionPhotonCaloIsoSequenceGenCfg(flags, name, ion=False, is_probe_leg=False):
"""Creates secpond step photon sequence"""
InViewRoIs = "PrecisionPhotonCaloIsoRoIs"
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py
index 59e1802b1acaea8c3d34ebaf2a7922d2e0011e94..8fa96740ebafcedf5bb355b072dd237ac6268d26 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py
@@ -15,7 +15,7 @@ def tag(ion):
@AccumulatorCache
-def precisionPhotonSequenceCfg(flags, ion=False, is_probe_leg=False):
+def precisionPhotonSequenceGenCfg(flags, ion=False, is_probe_leg=False):
""" This function creates the PrecisionPhoton sequence"""
# Prepare first the EventView
InViewRoIs="PrecisionPhotonRoIs"
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonTLAMenuSequenceConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonTLAMenuSequenceConfig.py
index 7ca804e0c36a6f12e4b31473cd34d03c684f983a..cc6fbaa056d75ccf752ac8ad4aa32bb475d666dc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonTLAMenuSequenceConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonTLAMenuSequenceConfig.py
@@ -23,7 +23,7 @@ def PhotonTLASequenceCfg(flags, photonsIn):
return recoAcc, sequenceOut
@AccumulatorCache
-def PhotonTLAMenuSequenceCfg( flags, photonsIn ):
+def PhotonTLAMenuSequenceGenCfg( flags, photonsIn ):
# retrieves the "reco" sequence which only consists of the InputMaker
(recoAcc, sequenceOut) = PhotonTLASequenceCfg(flags, photonsIn=photonsIn)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauChainConfiguration.py
index 1699403361c8c3deafe11081bc3c7c6d1b6928e5..d25a94779dcd7322e9d8d42d32455a28e96408a8 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauChainConfiguration.py
@@ -11,7 +11,12 @@ log = logging.getLogger(__name__)
from TriggerMenuMT.HLT.Config.ChainConfigurationBase import ChainConfigurationBase
-from .generateTau import tauCaloMVAMenuSeq, tauFTFTauCoreSeq, tauFTFTauIsoSeq, tauFTFTauLRTSeq, tauPrecTrackIsoSeq, tauPrecTrackLRTSeq, tauTrackTwoMVASeq, tauTrackTwoLLPSeq, tauTrackLRTSeq
+from .TauMenuSequences import (
+ tauCaloMVAMenuSequenceGenCfg, tauFTFTauCoreSequenceGenCfg,
+ tauFTFTauIsoSequenceGenCfg, tauFTFTauLRTSequenceGenCfg,
+ tauPrecTrackIsoSequenceGenCfg, tauPrecTrackLRTSequenceGenCfg,
+ tauTrackTwoMVASequenceGenCfg, tauTrackTwoLLPSequenceGenCfg,
+ tauTrackLRTSequenceGenCfg )
#############################################
@@ -58,17 +63,17 @@ class TauChainConfiguration(ChainConfigurationBase):
# --------------------
def getCaloMVASeq(self, flags, is_probe_leg=False):
stepName = 'MVA_tau'
- return self.getStep(flags,1,stepName, [tauCaloMVAMenuSeq], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,1,stepName, [tauCaloMVAMenuSequenceGenCfg], is_probe_leg=is_probe_leg)
# --------------------
def getFTFCore(self, flags, is_probe_leg=False):
stepName = 'FTFCore_tau'
- return self.getStep(flags,2,stepName, [tauFTFTauCoreSeq], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,2,stepName, [tauFTFTauCoreSequenceGenCfg], is_probe_leg=is_probe_leg)
# --------------------
def getFTFLRT(self, flags, is_probe_leg=False):
stepName = 'FTFLRT_tau'
- return self.getStep(flags,2,stepName, [tauFTFTauLRTSeq], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,2,stepName, [tauFTFTauLRTSequenceGenCfg], is_probe_leg=is_probe_leg)
# --------------------
@@ -80,7 +85,7 @@ class TauChainConfiguration(ChainConfigurationBase):
def getFTFIso(self, flags, is_probe_leg=False):
stepName = 'FTFIso_tau'
- return self.getStep(flags,3,stepName, [tauFTFTauIsoSeq], is_probe_leg=is_probe_leg)
+ return self.getStep(flags,3,stepName, [tauFTFTauIsoSequenceGenCfg], is_probe_leg=is_probe_leg)
# --------------------
@@ -92,12 +97,12 @@ class TauChainConfiguration(ChainConfigurationBase):
def getPrecTrackIso(self, flags, is_probe_leg=False):
stepName = 'PrecTrkIso_tau'
- return self.getStep(flags,4,stepName,[tauPrecTrackIsoSeq],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4,stepName,[tauPrecTrackIsoSequenceGenCfg],is_probe_leg=is_probe_leg)
# --------------------
def getPrecTrackLRT(self, flags, is_probe_leg=False):
stepName = 'PrecTrkLRT_tau'
- return self.getStep(flags,4,stepName,[tauPrecTrackLRTSeq],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,4,stepName,[tauPrecTrackLRTSequenceGenCfg],is_probe_leg=is_probe_leg)
# --------------------
@@ -109,18 +114,18 @@ class TauChainConfiguration(ChainConfigurationBase):
def getTrackTwoMVA(self, flags, is_probe_leg=False):
stepName = "TrkTwoMVA_tau"
- return self.getStep(flags,5,stepName,[tauTrackTwoMVASeq],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,5,stepName,[tauTrackTwoMVASequenceGenCfg],is_probe_leg=is_probe_leg)
# --------------------
def getTrackTwoLLP(self, flags, is_probe_leg=False):
stepName = "TrkTwoLLP_tau"
- return self.getStep(flags,5,stepName,[tauTrackTwoLLPSeq],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,5,stepName,[tauTrackTwoLLPSequenceGenCfg],is_probe_leg=is_probe_leg)
# --------------------
def getTrackLRT(self, flags, is_probe_leg=False):
stepName = "TrkLRT_tau"
- return self.getStep(flags,5,stepName,[tauTrackLRTSeq],is_probe_leg=is_probe_leg)
+ return self.getStep(flags,5,stepName,[tauTrackLRTSequenceGenCfg],is_probe_leg=is_probe_leg)
# --------------------
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauMenuSequences.py
similarity index 96%
rename from Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py
rename to Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauMenuSequences.py
index 4bd6a3cb72fe5b76411d01d6de4b595728e75901..5d27493d27258dbae0694c68bec0e08d00e55bfc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauMenuSequences.py
@@ -51,7 +51,7 @@ def _caloSeq(flags, is_probe_leg=False):
@AccumulatorCache
-def tauCaloMVAMenuSeq(flags, is_probe_leg=False):
+def tauCaloMVAMenuSequenceGenCfg(flags, is_probe_leg=False):
(selAcc , menuCA) = _caloSeq(flags, is_probe_leg)
return menuCA
@@ -127,7 +127,7 @@ def _ftfCoreSeq(flags,name,is_probe_leg=False):
@AccumulatorCache
-def tauFTFTauCoreSeq(flags, is_probe_leg=False):
+def tauFTFTauCoreSequenceGenCfg(flags, is_probe_leg=False):
newflags = getFlagsForActiveConfig(flags,'tauCore',log)
name='Core'
@@ -136,7 +136,7 @@ def tauFTFTauCoreSeq(flags, is_probe_leg=False):
@AccumulatorCache
-def tauFTFTauLRTSeq(flags, is_probe_leg=False):
+def tauFTFTauLRTSequenceGenCfg(flags, is_probe_leg=False):
newflags = getFlagsForActiveConfig(flags,'tauLRT',log)
name='LRT'
(selAcc , menuCA) = _ftfCoreSeq(newflags,name,is_probe_leg)
@@ -178,7 +178,7 @@ def _ftfTauIsoSeq(flags,name,is_probe_leg=False):
@AccumulatorCache
-def tauFTFTauIsoSeq(flags, is_probe_leg=False):
+def tauFTFTauIsoSequenceGenCfg(flags, is_probe_leg=False):
newflags = getFlagsForActiveConfig(flags,'tauIso',log)
name = 'Iso'
(selAcc , menuCA) = _ftfTauIsoSeq(newflags,name,is_probe_leg)
@@ -228,7 +228,7 @@ def _precTrackSeq(flags,name,is_probe_leg=False):
@AccumulatorCache
-def tauPrecTrackIsoSeq(flags, is_probe_leg=False):
+def tauPrecTrackIsoSequenceGenCfg(flags, is_probe_leg=False):
newflags = getFlagsForActiveConfig(flags,'tauIso',log)
name = 'Iso'
(selAcc , menuCA) = _precTrackSeq(newflags,name,is_probe_leg)
@@ -236,7 +236,7 @@ def tauPrecTrackIsoSeq(flags, is_probe_leg=False):
@AccumulatorCache
-def tauPrecTrackLRTSeq(flags, is_probe_leg=False):
+def tauPrecTrackLRTSequenceGenCfg(flags, is_probe_leg=False):
newflags = getFlagsForActiveConfig(flags,'tauLRT',log)
name = 'LRT'
(selAcc , menuCA) = _precTrackSeq(newflags,name,is_probe_leg)
@@ -281,7 +281,7 @@ def _tauPrecSeq(flags,name,is_probe_leg=False):
@AccumulatorCache
-def tauTrackTwoMVASeq(flags, is_probe_leg=False):
+def tauTrackTwoMVASequenceGenCfg(flags, is_probe_leg=False):
newflags = getFlagsForActiveConfig(flags,'tauIso',log)
name = 'MVA'
(selAcc , menuCA) = _tauPrecSeq(newflags,name,is_probe_leg)
@@ -289,7 +289,7 @@ def tauTrackTwoMVASeq(flags, is_probe_leg=False):
@AccumulatorCache
-def tauTrackTwoLLPSeq(flags, is_probe_leg=False):
+def tauTrackTwoLLPSequenceGenCfg(flags, is_probe_leg=False):
newflags = getFlagsForActiveConfig(flags,'tauIso',log)
name = 'LLP'
(selAcc , menuCA) = _tauPrecSeq(newflags,name,is_probe_leg)
@@ -297,7 +297,7 @@ def tauTrackTwoLLPSeq(flags, is_probe_leg=False):
@AccumulatorCache
-def tauTrackLRTSeq(flags, is_probe_leg=False):
+def tauTrackLRTSequenceGenCfg(flags, is_probe_leg=False):
newflags = getFlagsForActiveConfig(flags,'tauLRT',log)
name = 'LRT'
(selAcc , menuCA) = _tauPrecSeq(newflags,name,is_probe_leg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/CommonConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/CommonConfiguration.py
index 838db50754be9ca393309c0842f24f204742e8fc..24cd4a1a95799f79428a475d84fd1bcbc2edac98 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/CommonConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/CommonConfiguration.py
@@ -14,7 +14,7 @@ log = logging.getLogger(__name__)
# This produces a menu sequence for a step that runs FS FTF tracking
# No selection is applied -- all rejection comes from subsequent steps
-def getFullScanRecoOnlySequence(flags):
+def getFullScanRecoOnlySequenceGenCfg(flags):
from TrigStreamerHypo.TrigStreamerHypoConfig import StreamerHypoToolGenerator
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DJTriggerConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DJTriggerConfiguration.py
index 25cd44d0f37a0888d027d130ab3c4f77b442ffa2..8ad78080e10904f962e25494a57962e025109876 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DJTriggerConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DJTriggerConfiguration.py
@@ -14,7 +14,7 @@ from TrigInDetConfig.TrigInDetConfig import trigInDetLRTCfg
logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger(__name__)
-def DJPromptStep(flags):
+def DJPromptStepSequenceGenCfg(flags):
from TrigLongLivedParticlesHypo.TrigDJHypoConfig import TrigDJHypoPromptToolFromDict
@@ -81,7 +81,7 @@ def DJDispFragment(flags):
selAcc.mergeReco(reco, robPrefetchCA=robPrefetchAlg)
return selAcc
-def DJDispStep(flags):
+def DJDispStepSequenceGenCfg(flags):
from TrigLongLivedParticlesHypo.TrigDJHypoConfig import TrigDJHypoDispToolFromDict
hypo_alg = CompFactory.DisplacedJetDispHypoAlg("DJTrigDispHypoAlg",
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DVTriggerConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DVTriggerConfiguration.py
index a97574a457cb7cc8182a9ade9385ea4752dd8070..840e946b23bb4d1899a419203e58785968350f8f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DVTriggerConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DVTriggerConfiguration.py
@@ -76,7 +76,7 @@ def DVRecoFragment(flags):
-def DVRecoSequence(flags):
+def DVRecoSequenceGenCfg(flags):
from TrigStreamerHypo.TrigStreamerHypoConfig import StreamerHypoToolGenerator
selAcc = DVRecoFragment(flags)
@@ -93,7 +93,7 @@ def DVRecoSequence(flags):
-def DVTriggerEDSequence(flags):
+def DVTriggerEDSequenceGenCfg(flags):
from TrigLongLivedParticlesHypo.TrigVrtSecInclusiveHypoConfig import TrigVSIHypoToolFromDict
from TrigLongLivedParticlesHypo.TrigVrtSecInclusiveHypoConfig import createTrigVSIHypoAlgCfg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DisTrkTriggerConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DisTrkTriggerConfiguration.py
index d913c4287e1a06fd51c6fcb9902485037c09340f..2955c90861ba965583906142ecff8088c0612fba 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DisTrkTriggerConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DisTrkTriggerConfiguration.py
@@ -7,7 +7,7 @@ logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger(__name__)
-def DisTrkTriggerHypoSequence(flags):
+def DisTrkTriggerHypoSequenceGenCfg(flags):
from TrigLongLivedParticlesHypo.TrigDisappearingTrackHypoConfig import TrigDisappearingTrackHypoToolFromDict
from TrigLongLivedParticlesHypo.TrigDisappearingTrackHypoConfig import createTrigDisappearingTrackHypoAlgCfg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
index 9d0ee7001603a5e94afcf3b405be376180866eb6..9d1c8e5c1a4b1421dd673922032752984f3d8732 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
@@ -8,7 +8,7 @@ logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger(__name__)
-def FullScanLRTMenuSequence(flags):
+def FullScanLRTMenuSequenceGenCfg(flags):
# Construct the full reco sequence
from TriggerMenuMT.HLT.UnconventionalTracking.CommonConfiguration import getCommonInDetFullScanLRTCfg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/HitDVConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/HitDVConfiguration.py
index 262e86207076620881cb7e46e9b0d3cb3967269e..06f93c93a4e1d60aa671ccc23c6366a9c3ce7140 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/HitDVConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/HitDVConfiguration.py
@@ -13,7 +13,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-def UTTJetRecoSequence(flags):
+def UTTJetRecoSequenceGenCfg(flags):
topoClusterSequence = jetmetTopoClusteringCfg(flags,RoIs = '')
clustersKey = "HLT_TopoCaloClustersFS"
@@ -55,7 +55,7 @@ def UTTJetRecoSequence(flags):
)
-def HitDVHypoSequence(flags):
+def HitDVHypoSequenceGenCfg(flags):
from TrigLongLivedParticlesHypo.TrigHitDVHypoConfig import TrigHitDVHypoToolFromDict
from TrigLongLivedParticlesHypo.TrigHitDVHypoConfig import TrigHitDVHypoAlgCfg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py
index e89a61cbc74bae18b86e11d7d333cfb2abf92c43..50b468c8e06e32be4623380aa83caeb2e7d40f6d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py
@@ -7,7 +7,7 @@ from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger(__name__)
-def IsoHPtTrackTriggerHypoSequence(flags):
+def IsoHPtTrackTriggerHypoSequenceGenCfg(flags):
from TrigLongLivedParticlesHypo.TrigIsoHPtTrackTriggerHypoTool import TrigIsoHPtTrackTriggerHypoToolFromDict
# Setup the hypothesis algorithm
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py
index 5737bee84aad5ffbf8717dea0477790fe4f7e438..b0174f67087eabf553ebaf507c9a02fbb446565a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py
@@ -7,15 +7,15 @@ log = logging.getLogger(__name__)
from TriggerMenuMT.HLT.Config.ChainConfigurationBase import ChainConfigurationBase
from TrigLongLivedParticlesHypo.TrigDJHypoConfig import TrigDJComboHypoToolFromDict
-from TriggerMenuMT.HLT.UnconventionalTracking.CommonConfiguration import getFullScanRecoOnlySequence
-from TriggerMenuMT.HLT.UnconventionalTracking.DJTriggerConfiguration import DJPromptStep, DJDispStep
-from TriggerMenuMT.HLT.UnconventionalTracking.DVTriggerConfiguration import DVRecoSequence, DVTriggerEDSequence
-from TriggerMenuMT.HLT.UnconventionalTracking.DisTrkTriggerConfiguration import DisTrkTriggerHypoSequence
-from TriggerMenuMT.HLT.UnconventionalTracking.FullScanLRTTrackingConfiguration import FullScanLRTMenuSequence
-from TriggerMenuMT.HLT.UnconventionalTracking.HitDVConfiguration import HitDVHypoSequence, UTTJetRecoSequence
-from TriggerMenuMT.HLT.UnconventionalTracking.IsoHighPtTrackTriggerConfiguration import IsoHPtTrackTriggerHypoSequence
-from TriggerMenuMT.HLT.UnconventionalTracking.VrtSecInclusiveConfiguration import VrtSecInclusiveMenuSequence
-from TriggerMenuMT.HLT.UnconventionalTracking.dEdxTriggerConfiguration import dEdxTriggerHypoSequence
+from TriggerMenuMT.HLT.UnconventionalTracking.CommonConfiguration import getFullScanRecoOnlySequenceGenCfg
+from TriggerMenuMT.HLT.UnconventionalTracking.DJTriggerConfiguration import DJPromptStepSequenceGenCfg, DJDispStepSequenceGenCfg
+from TriggerMenuMT.HLT.UnconventionalTracking.DVTriggerConfiguration import DVRecoSequenceGenCfg, DVTriggerEDSequenceGenCfg
+from TriggerMenuMT.HLT.UnconventionalTracking.DisTrkTriggerConfiguration import DisTrkTriggerHypoSequenceGenCfg
+from TriggerMenuMT.HLT.UnconventionalTracking.FullScanLRTTrackingConfiguration import FullScanLRTMenuSequenceGenCfg
+from TriggerMenuMT.HLT.UnconventionalTracking.HitDVConfiguration import HitDVHypoSequenceGenCfg, UTTJetRecoSequenceGenCfg
+from TriggerMenuMT.HLT.UnconventionalTracking.IsoHighPtTrackTriggerConfiguration import IsoHPtTrackTriggerHypoSequenceGenCfg
+from TriggerMenuMT.HLT.UnconventionalTracking.VrtSecInclusiveConfiguration import VrtSecInclusiveMenuSequenceGenCfg
+from TriggerMenuMT.HLT.UnconventionalTracking.dEdxTriggerConfiguration import dEdxTriggerHypoSequenceGenCfg
#----------------------------------------------------------------
# Class to configure chain
@@ -68,7 +68,7 @@ class UnconventionalTrackingChainConfiguration(ChainConfigurationBase):
# Step definitions in alignment order
# Step 1
def getJetReco(self, flags):
- return self.getStep(flags,1,'JetRecoOnlyCfg',[UTTJetRecoSequence])
+ return self.getStep(flags,1,'JetRecoOnlyCfg',[UTTJetRecoSequenceGenCfg])
# Empty for alignment
def getIsoHPtTrackEmpty(self, flags):
return self.getEmptyStep(1,'EmptyUncTrk')
@@ -83,31 +83,31 @@ class UnconventionalTrackingChainConfiguration(ChainConfigurationBase):
# Step 2
def getFSLRTTrigger(self, flags):
- return self.getStep(flags,2,'FSLRT',[FullScanLRTMenuSequence])
+ return self.getStep(flags,2,'FSLRT',[FullScanLRTMenuSequenceGenCfg])
# Empty for alignment with jets
def getRoITrkEmpty(self, flags):
return self.getEmptyStep(2, 'RoITrkEmptyStep')
# Step 3 -- all FTF tracking here
def getFTFTrackReco(self, flags):
- return self.getStep(flags,3,'FTFRecoOnly',[getFullScanRecoOnlySequence])
+ return self.getStep(flags,3,'FTFRecoOnly',[getFullScanRecoOnlySequenceGenCfg])
# Step 4+ -- everything post FTF tracking
def getIsoHPtTrackTrigger(self, flags):
- return self.getStep(flags,4,'IsoHPtTrack',[IsoHPtTrackTriggerHypoSequence])
+ return self.getStep(flags,4,'IsoHPtTrack',[IsoHPtTrackTriggerHypoSequenceGenCfg])
def getdEdxTrigger(self, flags):
- return self.getStep(flags,4,'dEdx',[dEdxTriggerHypoSequence])
+ return self.getStep(flags,4,'dEdx',[dEdxTriggerHypoSequenceGenCfg])
def getHitDVTrigger(self, flags):
- return self.getStep(flags,4,'HitDV',[HitDVHypoSequence])
+ return self.getStep(flags,4,'HitDV',[HitDVHypoSequenceGenCfg])
def getDisTrkTrigger(self, flags):
- return self.getStep(flags,4,'DisTrk',[DisTrkTriggerHypoSequence])
+ return self.getStep(flags,4,'DisTrk',[DisTrkTriggerHypoSequenceGenCfg])
def getVSITrigger(self, flags):
- return self.getStep(flags,4,'LRTVSI',[VrtSecInclusiveMenuSequence])
+ return self.getStep(flags,4,'LRTVSI',[VrtSecInclusiveMenuSequenceGenCfg])
def getDJPromptStep(self, flags):
- return self.getStep(flags,3,'DJPromptStep',[DJPromptStep], comboTools = [TrigDJComboHypoToolFromDict])
+ return self.getStep(flags,3,'DJPromptStep',[DJPromptStepSequenceGenCfg], comboTools = [TrigDJComboHypoToolFromDict])
def getDJDispStep(self, flags):
- return self.getStep(flags,4,'DJDispStep',[DJDispStep])
+ return self.getStep(flags,4,'DJDispStep',[DJDispStepSequenceGenCfg])
def getDVRecoStep(self, flags):
- return self.getStep(flags,5,'DVRecoStep',[DVRecoSequence])
+ return self.getStep(flags,5,'DVRecoStep',[DVRecoSequenceGenCfg])
def getDVEDStep(self, flags):
- return self.getStep(flags,6,'DVEDStep',[DVTriggerEDSequence])
+ return self.getStep(flags,6,'DVEDStep',[DVTriggerEDSequenceGenCfg])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/VrtSecInclusiveConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/VrtSecInclusiveConfiguration.py
index 6a84653f1a5eb070a32fa4b51ff4d9ab6d038383..891ee6b0e1ac098e4a7b3d995506fa137bfb233a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/VrtSecInclusiveConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/VrtSecInclusiveConfiguration.py
@@ -6,7 +6,7 @@ logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger(__name__)
-def VrtSecInclusiveMenuSequence(flags):
+def VrtSecInclusiveMenuSequenceGenCfg(flags):
vsivtxname = "HLT_TrigVSIVertex"
# Construct the full reco sequence
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/dEdxTriggerConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/dEdxTriggerConfiguration.py
index cc169341713e8789718f96991bdd6c2ec21c82ba..108b81a1da92c6f71fbc5fbee1893e02ccde8edf 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/dEdxTriggerConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/dEdxTriggerConfiguration.py
@@ -6,7 +6,7 @@ logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger(__name__)
-def dEdxTriggerHypoSequence(flags):
+def dEdxTriggerHypoSequenceGenCfg(flags):
from TrigLongLivedParticlesHypo.TrigdEdxTrackHypoConfig import TrigdEdxTrackHypoToolFromDict
from TrigLongLivedParticlesHypo.TrigdEdxTrackHypoConfig import TrigdEdxTrackHypoAlgCfg