Merge branch 'multiple-sequence-flavours-args' into 'master'

change the format of the TrigInDetSequence args to be able to pass a

See merge request atlas/athena!20342

Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py

@@ -173,7 +173,7 @@ class TrigInDetSequence(TrigInDetSequenceBase):
                signatureName="Electron",
                signature="electron", 
                sequenceType="IDTrig",
-               sequenceFlavour="Fast"):
+               sequenceFlavour=["Fast"]):
 
     TrigInDetSequenceBase.__init__(self)
     self.__signatureName__ = signatureName
@@ -182,7 +182,11 @@ class TrigInDetSequence(TrigInDetSequenceBase):
     self.__sequenceFlavour__  = sequenceFlavour
     self.__step__ = [signature]
 
-    if self.__sequenceFlavour__ =="2step":
+    if type(sequenceFlavour)!=type(list()):
+      log.error("TrigInDetSequence invoked with a non-list sequenceFlavour argument %s" )
+
+
+    if "2step" in self.__sequenceFlavour__:
       if self.__signature__ == "tau":
         self.__step__ = ["tauCore","tauIso","tau"]; 
       elif self.__signature__ == "muon":
@@ -206,7 +210,7 @@ class TrigInDetSequence(TrigInDetSequenceBase):
     cnvname = "InDetTrigTrackingxAODCnv_%s_FTF"
     cnvptname = ""
 
-    if sequenceFlavour=="2step":
+    if "2step" in self.__sequenceFlavour__:
       ftfname = "TrigFastTrackFinder_%sCore";  ftf2name = "TrigFastTrackFinder_%sIso"; 
       cnvname = "InDetTrigTrackingxAODCnv_%sCore_FTF";  cnv2name = "InDetTrigTrackingxAODCnv_%sIso_FTF";  
       roiupdater = "IDTrigRoiUpdater_%sCore_IDTrig";  roi2updater="IDTrigRoiUpdater_%sIso_IDTrig"
@@ -237,7 +241,7 @@ class TrigInDetSequence(TrigInDetSequenceBase):
         if vertexXAODCnvNeeded(): 
           algos += [("InDetTrigVertexxAODCnv","")]
 
-      if sequenceFlavour=="2step" and self.__signature__=="bjet":
+      if "2step" in self.__sequenceFlavour__ and self.__signature__=="bjet":
         algos += [("TrigVxPrimary","")]
         if vertexXAODCnvNeeded(): 
            algos += [("InDetTrigVertexxAODCnv","")]
@@ -245,7 +249,7 @@ class TrigInDetSequence(TrigInDetSequenceBase):
       fullseq.append(algos)
  
 
-      if sequenceFlavour=="2step":
+      if "2step" in self.__sequenceFlavour__:
         algos = [("IDTrigRoiUpdater", roi2updater)]
         algos += dataprep
         algos += [("TrigFastTrackFinder",ftf2name),
@@ -254,20 +258,23 @@ class TrigInDetSequence(TrigInDetSequenceBase):
         fullseq.append(algos)
 
 
-      if sequenceFlavour != "FTF":
+      if not ("FTF" in self.__sequenceFlavour__):
         algos = [("TrigAmbiguitySolver",""),
                  ("TRTDriftCircleMaker","TRTDriftCircleMaker_IDTrig"),
                  ("InDetTrigPRD_MultiTruthMaker",""), 
                  ("TRTTrackExtAlg",""),
                  ("TrigExtProcessor",""),
-                 #("InDetTrigTrackSlimmer",""),
                  ("InDetTrigTrackingxAODCnv",cnvptname),
                  ("InDetTrigDetailedTrackTruthMaker",""),
-                 #("TrigVxPrimary",""),
-                 #("InDetTrigParticleCreation",""),
-                 #("InDetTrigTrackParticleTruthMaker",""),
-                 #("InDetTrigVertexxAODCnv","")
                  ]
+        if 'noTRT' in self.__sequenceFlavour__:
+          algos = [("TrigAmbiguitySolver",""),
+                   ("InDetTrigPRD_MultiTruthMaker",""), 
+                   ("InDetTrigTrackingxAODCnv",cnvptname),
+                   ("InDetTrigDetailedTrackTruthMaker",""),
+                   ]
+
+
         if self.__signature__ != "bjet":
           algos += [("TrigVxPrimary","")]
           if vertexXAODCnvNeeded(): 

Trigger/TriggerCommon/TriggerMenu/python/bjet/generateBjetChainDefs.py

@@ -237,9 +237,9 @@ def buildBjetChainsAllTE(theChainDef, bjetdict, numberOfSubChainDicts=1):
     #  PV Tracking
     #
     if useTRT :
-        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", "2step").getSequence()
+        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", sequenceFlavour=["2step"]).getSequence()
     else :
-        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", "2step","noTRT").getSequence()
+        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", sequenceFlavour=["2step","noTRT"]).getSequence()
     tracking = "IDTrig"
     if not useTRT : tracking = tracking + "_noTRT"
 
@@ -453,10 +453,9 @@ def myBjetConfig_split(theChainDef, chainDict, inputTEsEF,numberOfSubChainDicts=
     elif 'FTK' in chainParts['bTracking']:
         [ftkvtx, trkftf, trkprec] = TrigInDetFTKSequence("Bjet", "bjet", sequenceFlavour=["FTKVtx","PT"]).getSequence() # new
     elif useTRT :
-        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", "2step").getSequence() # new
+        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", sequenceFlavour=["2step"]).getSequence()         
     else :
-        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", "2step","noTRT").getSequence() # new
-
+        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", sequenceFlavour=["2step","noTRT"]).getSequence() 
 
     # for b-tagging
     theBjetTracks = trkftf+trkprec
@@ -680,9 +679,9 @@ def myBjetConfig1(theChainDef, chainDict, inputTEsEF,numberOfSubChainDicts=1):
 
     # tracking
     if useTRT :
-        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", "2step").getSequence() 
+        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", sequenceFlavour=["2step"]).getSequence() 
     else :
-        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", "2step","noTRT").getSequence() 
+        [trkvtx, trkftf, trkprec] = TrigInDetSequence("Bjet", "bjet", "IDTrig", sequenceFlavour=["2step","noTRT"]).getSequence() 
     ef_bjet_tracks = trkftf+trkprec
 
 

Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py

@@ -128,7 +128,7 @@ class L2EFChain_Beamspot(L2EFChainDef):
            mlog.error('Cannot assemble chain %s - only configured for trkFS,allTE and activeTE' % (self.chainPartName))
 
         from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
-        [trk_alg] = TrigInDetSequence("BeamSpot", "beamSpot", "IDTrig", "FTF").getSequence()
+        [trk_alg] = TrigInDetSequence("BeamSpot", "beamSpot", "IDTrig", sequenceFlavour=["FTF"]).getSequence()
         teaddition = 'trkfast'
         
      elif ('FTK' in self.l2IDAlg):
@@ -152,8 +152,7 @@ class L2EFChain_Beamspot(L2EFChainDef):
            
         if 'idperf' in self.chainPart['addInfo']:
            from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
-           [trk_alg] = TrigInDetSequence("BeamSpot", "beamSpot", "IDTrig", "FTF").getSequence()
-           
+           [trk_alg] = TrigInDetSequence("BeamSpot", "beamSpot", "IDTrig", sequenceFlavour=["FTF"]).getSequence()
            from TrigInDetConf.TrigInDetFTKSequence import TrigInDetFTKSequence
            [ftk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", "mon").getSequence()
         if 'mon' in self.chainPart['addInfo']:
@@ -184,7 +183,7 @@ class L2EFChain_Beamspot(L2EFChainDef):
 
         if 'idperf' in self.chainPart['addInfo']:
            from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
-           [trk_alg] = TrigInDetSequence("BeamSpot", "beamSpot", "IDTrig", "FTF").getSequence()
+           [trk_alg] = TrigInDetSequence("BeamSpot", "beamSpot", "IDTrig", sequenceFlavour=["FTF"]).getSequence()
            from TrigInDetConf.TrigInDetFTKSequence import TrigInDetFTKSequence
            [ftk_alg] = TrigInDetFTKSequence("BeamSpot", "beamSpot", "refit").getSequence()
         else: 

Trigger/TriggerCommon/TriggerMenu/python/jet/generateJetChainDefs.py

@@ -117,7 +117,7 @@ def generateMuonClusterLLPchain(theChainDef, chainDict, inputTEsL2, inputTEsEF,
 
     # tracking
     from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
-    [trkcore,trkiso,trkprec] = TrigInDetSequence("Muon", "muon", "IDTrig", "2step").getSequence()
+    [trkcore,trkiso,trkprec] = TrigInDetSequence("Muon", "muon", "IDTrig", sequenceFlavour=["2step"]).getSequence()
 
     # muon cluster 
     from TrigL2LongLivedParticles.TrigL2LongLivedParticlesConfig import MuonClusterConfig
@@ -176,7 +176,7 @@ def generateCaloRatioLLPchain(theChainDef, chainDict, inputTEsL2, inputTEsEF, to
 
     # tracking
     from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
-    [trkcore, trkiso, trkprec] = TrigInDetSequence("Tau", "tau", "IDTrig", "2step").getSequence()
+    [trkcore, trkiso, trkprec] = TrigInDetSequence("Tau", "tau", "IDTrig", sequenceFlavour=["2step"]).getSequence()
 
     # calo-ratio
     from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConfig import getCaloRatioHypoInstance
@@ -238,7 +238,7 @@ def generateReversedCaloRatioLLPchain(theChainDef, chainDict, inputTEsL2, inputT
 
     # tracking
     from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
-    [trkcore, trkiso, trkprec] = TrigInDetSequence("Tau", "tau", "IDTrig", "2step").getSequence()
+    [trkcore, trkiso, trkprec] = TrigInDetSequence("Tau", "tau", "IDTrig", sequenceFlavour=["2step"]).getSequence()
 
     # reversed calo-ratio
     from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConfig import getCaloRatioHypoInstance

Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py

@@ -303,7 +303,7 @@ class L2EFChain_mu(L2EFChainDef):
       log.error("Chain built with %s but so far only l2muonSA is supported." % (self.chainPart['L2SAAlg']))
       return False
     
-    [trkfast, trkiso, trkprec] = TrigInDetSequence("Muon", "muon", "IDTrig", sequenceFlavour="2step").getSequence()
+    [trkfast, trkiso, trkprec] = TrigInDetSequence("Muon", "muon", "IDTrig", sequenceFlavour=["2step"]).getSequence()
     
     
 
@@ -1063,7 +1063,7 @@ class L2EFChain_mu(L2EFChainDef):
       return False
     from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFExtrapolatorHypoConfig
     theTrigMuonEFExtrapolatorHypoConfig = TrigMuonEFExtrapolatorHypoConfig(EFRecoAlgName, EFExtrapolatorThresh)
-    [trkfast, trkiso, trkprec] = TrigInDetSequence("Muon", "muon", "IDTrig", sequenceFlavour="2step").getSequence()
+    [trkfast, trkiso, trkprec] = TrigInDetSequence("Muon", "muon", "IDTrig", sequenceFlavour=["2step"]).getSequence()
     if "wOvlpRm" in self.chainPart['overlapRemoval']:
       from TrigMuonHypo.TrigEFMuonOverlapRemoverConfig import TrigEFMuonOverlapRemoverConfig
       theEFOvlpRmConfig = TrigEFMuonOverlapRemoverConfig('MuExtr','loose')
@@ -2267,7 +2267,7 @@ class L2EFChain_mu(L2EFChainDef):
     theL2StandAloneHypo = MufastHypoConfig(L2AlgName, muFastThresh)
     
     from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
-    [trkfast, trkiso, trkprec] = TrigInDetSequence("Muon", "muon", "IDTrig", sequenceFlavour="2step").getSequence()
+    [trkfast, trkiso, trkprec] = TrigInDetSequence("Muon", "muon", "IDTrig", sequenceFlavour=["2step"]).getSequence()
     
     theTrigMuSuperEF = CfgGetter.getAlgorithm("TrigMuSuperEF")
     EFRecoAlgName = "Muon"

Trigger/TriggerCommon/TriggerMenu/python/tau/TauDef.py

@@ -168,7 +168,7 @@ class L2EFChain_tau(L2EFChainDef):
             [trkfast, trkprec[:]] = TrigInDetSequence("Tau", "tau", "IDTrig").getSequence()
         # Use cosmic-specific tracking algorithm
         if selection == 'cosmic':
-            [trkfast] = TrigInDetSequence("Cosmics", "cosmics", "IDTrig", "FTF").getSequence()
+            [trkfast] = TrigInDetSequence("Cosmics", "cosmics", "IDTrig", sequenceFlavour=["FTF"]).getSequence()
 
         # Run fast-tracking
         self.EFsequenceList += [[[ self.currentItem ],
@@ -230,7 +230,7 @@ class L2EFChain_tau(L2EFChainDef):
     def addTwoStepTrackingSequence(self,threshold,selection,preselection,idperf,trkprec): 
         # Get the necessary fexes
         # use [:] so the list trkprec is modified by this function
-        [trkcore, trkiso, trkprec[:]] = TrigInDetSequence("Tau", "tau", "IDTrig", "2step").getSequence()
+        [trkcore, trkiso, trkprec[:]] = TrigInDetSequence("Tau", "tau", "IDTrig", sequenceFlavour=["2step"]).getSequence()
 
         # Get the HLTTrackTauHypo_rejectNoTracks
         tauRejectEmpty = HLTTrackTauHypo_rejectNoTracks("TauRejectEmpty")