Merge branch 'clean-menu-steps-naming' into 'master'

Renamed steps so that the name matches actual step in which they execute

See merge request atlas/athena!24434

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsDef.py

@@ -90,13 +90,13 @@ class BphysicsChainConfiguration(MuonChainConfiguration):
     
     # --------------------
     def getdimuL2(self):
-        stepName = 'Step1_l2Dimu'
+        stepName = 'Step2_l2Dimu'
         log.debug("Configuring step " + stepName)
         bphySeq = RecoFragmentsPool.retrieve( dimuL2SequenceCfg, None)
         return ChainStep(stepName, [bphySeq])
 
     def getdimuEF(self):
-        stepName = 'Step1_efDimu'
+        stepName = 'Step5_efDimu'
         log.debug("Configuring step " + stepName)
         bphySeq = RecoFragmentsPool.retrieve( dimuEFSequenceCfg, None)
         return ChainStep(stepName, [bphySeq])

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py

@@ -14,14 +14,14 @@ from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import fastElectro
 from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup import precisionCaloMenuSequence
 
 #----------------------------------------------------------------
-# fragments generating configuration will be functions in New JO, 
+# fragments generating configuration will be functions in New JO,
 # so let's make them functions already now
 #----------------------------------------------------------------
 
 def electronFastCaloCfg( flags ):
     return fastCaloMenuSequence("Electron")
-    
-def fastElectronSequenceCfg( flags ):    
+
+def fastElectronSequenceCfg( flags ):
     return fastElectronMenuSequence()
 
 def precisionCaloSequenceCfg( flags ):
@@ -34,56 +34,51 @@ class ElectronChainConfiguration(ChainConfigurationBase):
 
     def __init__(self, chainDict):
         ChainConfigurationBase.__init__(self,chainDict)
-        
+
     # ----------------------
     # Assemble the chain depending on information from chainName
     # ----------------------
-    def assembleChain(self):                            
+    def assembleChain(self):
         myStepNames = []
         chainSteps = []
         log.debug("Assembling chain for " + self.chainName)
         # --------------------
-        # define here the names of the steps and obtain the chainStep configuration 
+        # define here the names of the steps and obtain the chainStep configuration
         # --------------------
-        if 'etcut1step' in self.chainPart['addInfo']:            
-            myStepNames += ["Step1_etcut"]
+        if 'etcut1step' in self.chainPart['addInfo']:
+            myStepNames += ["Step1_electron"]
             for step in myStepNames:
-                chainSteps += [self.getEtCutStep(step)]
-        elif 'etcut' in self.chainPart['addInfo']:            
-            myStepNames += ["Step1_etcut"]
-            myStepNames += ["Step2_etcut"]            
-            myStepNames += ["Step3_etcut"]
+                chainSteps += [self.getElectronStep(step)]
+        elif 'etcut' in self.chainPart['addInfo']:
+            myStepNames += ["Step1_electron"]
+            myStepNames += ["Step2_electron"]
+            myStepNames += ["Step3_electron"]
             for step in myStepNames:
-                chainSteps += [self.getEtCutStep(step)]
+                chainSteps += [self.getElectronStep(step)]
         else:
             raise RuntimeError("Chain configuration unknown for chain: " + self.chainName )
-            
+
         myChain = self.buildChain(chainSteps)
         return myChain
-        
+
     # --------------------
-    # Configuration of etcut chain
+    # Configuration of electron chain
     # --------------------
-    def getEtCutStep(self, stepName):
-        if stepName == "Step1_etcut":
+    def getElectronStep(self, stepName):
+        if stepName == "Step1_electron":
           log.debug("Configuring step " + stepName)
           fastCalo = RecoFragmentsPool.retrieve( electronFastCaloCfg, None ) # the None will be used for flags in future
           chainStep =ChainStep(stepName, [fastCalo], self.mult)
-        elif stepName == "Step2_etcut":
+        elif stepName == "Step2_electron":
           log.debug("Configuring step " + stepName)
           electronReco = RecoFragmentsPool.retrieve( fastElectronSequenceCfg, None )
           chainStep=ChainStep(stepName, [electronReco], self.mult)
-        elif stepName == "Step3_etcut":
+        elif stepName == "Step3_electron":
           log.debug("Configuring step " + stepName)
           precisionReco = RecoFragmentsPool.retrieve( precisionCaloSequenceCfg, None )
           chainStep=ChainStep(stepName, [precisionReco], self.mult)
-        else:            
+        else:
           raise RuntimeError("chainStepName unknown: " + stepName )
-                        
+
         log.debug("Returning chainStep from getEtCutStep function: " + stepName)
         return chainStep
-            
-            
-
-        
-                

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py

@@ -65,19 +65,19 @@ class PhotonChainConfiguration(ChainConfigurationBase):
     # Configuration of steps
     # --------------------
     def getFastCalo(self):
-        stepName = "PhotonFastCalo"
+        stepName = "Step1_PhotonFastCalo"
         log.debug("Configuring step " + stepName)
         fastCalo = RecoFragmentsPool.retrieve( fastPhotonCaloSequenceCfg, None ) # the None will be used for flags in future
         return ChainStep(stepName, [fastCalo])
         
     def getFastPhoton(self):
-        stepName = "L2Photon"
+        stepName = "Step2_L2Photon"
         log.debug("Configuring step " + stepName)
         photonReco = RecoFragmentsPool.retrieve( fastPhotonSequenceCfg, None )
         return ChainStep(stepName, [photonReco])
 
     def getPrecisionCaloPhoton(self):
-        stepName = "PhotonPrecisionCalo"
+        stepName = "Step3_PhotonPrecisionCalo"
         log.debug("Configuring step " + stepName)
         precisionCaloPhoton = RecoFragmentsPool.retrieve( precisionPhotonCaloSequenceCfg, None )
         return ChainStep(stepName, [precisionCaloPhoton])

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py

@@ -107,35 +107,35 @@ class MuonChainConfiguration(ChainConfigurationBase):
         
     # --------------------
     def getmuComb(self):
-        stepName = 'Step1_muComb'
+        stepName = 'Step2_muComb'
         log.debug("Configuring step " + stepName)
         muSeq = RecoFragmentsPool.retrieve( muCombSequenceCfg, None)
         return ChainStep(stepName, [muSeq], self.mult)
 
     # --------------------
     def getmuEFSA(self):
-        stepName = 'Step1_muEFSA'
+        stepName = 'Step3_muEFSA'
         log.debug("Configuring step " + stepName)
         muSeq = RecoFragmentsPool.retrieve( muEFSASequenceCfg, None)
         return ChainStep(stepName, [muSeq], self.mult)
 
     # --------------------
     def getmuEFMS(self):
-        stepName = 'Step1_muEFMS'
+        stepName = 'Step3_muEFMS'
         log.debug("Configuring step " + stepName)
         muSeq = RecoFragmentsPool.retrieve( muEFMSSequenceCfg, None)
         return ChainStep(stepName, [muSeq], self.mult)
 
     # --------------------
     def getmuIso(self):
-        stepName = 'Step1_muIso'
+        stepName = 'Step3_muIso'
         log.debug("Configuring step " + stepName)
         muSeq = RecoFragmentsPool.retrieve( muIsoSequenceCfg, None)
         return ChainStep(stepName, [muSeq], self.mult)
 
     # --------------------
     def getmuEFCB(self):
-        stepName = 'Step1_muEFCB'
+        stepName = 'Step4_muEFCB'
         log.debug("Configuring step " + stepName)
         muSeq = RecoFragmentsPool.retrieve( muEFCBSequenceCfg, None)
         return ChainStep(stepName, [muSeq], self.mult)
@@ -149,14 +149,14 @@ class MuonChainConfiguration(ChainConfigurationBase):
 
     # --------------------
     def getFSmuEFCB(self):
-        stepName = 'Step1_FSmuEFCB'
+        stepName = 'Step2_FSmuEFCB'
         log.debug("Configuring step " + stepName)
         muSeq = RecoFragmentsPool.retrieve( FSmuEFCBSequenceCfg, None)
         return ChainStep(stepName, [muSeq], self.mult)
 
     #---------------------
     def getmuEFIso(self):
-        stepName = 'Step1_muEFIso'
+        stepName = 'Step5_muEFIso'
         log.debug("Configuring step " + stepName)
         muSeq = RecoFragmentsPool.retrieve( muEFIsoSequenceCfg, None)
         return ChainStep(stepName, [muSeq], self.mult)