From 44bb912314316e6688afa4dde08932902b41336c Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <frank.winklmeier@cern.ch> Date: Tue, 31 Jan 2023 11:41:49 +0100 Subject: [PATCH] TriggerMenuMT: pass flags to MenuSequence[CA] Explicitly pass the ConfigFlags to `MenuSequence` and `MenuSequenceCA`. Only the latter would be strictly required but the former is useful to make progress in eliminating the use of the global `ConfigFlags`. Relates to ATR-24994. --- .../python/HLTSignatureConfig.py | 28 ++++---- .../python/CFtest/EmuStepProcessingConfig.py | 57 ++++++++-------- .../python/CFtest/test_menu_cf_newJO.py | 2 +- .../python/HLT/Bjet/BjetMenuSequences.py | 3 +- .../HLT/Bjet/docs/bjet_configuration.md | 3 +- .../HLT/Bphysics/BphysicsMenuSequences.py | 6 +- .../BeamspotChainConfiguration.py | 16 +++-- .../CalibCosmicMon/CalibChainConfiguration.py | 14 ++-- .../CosmicChainConfiguration.py | 4 +- .../EnhancedBiasChainConfiguration.py | 5 +- .../MonitorChainConfiguration.py | 6 +- .../StreamingChainConfiguration.py | 9 +-- .../HLT/CommonSequences/CaloSequences.py | 3 +- .../HLT/CommonSequences/CaloSequences_FWD.py | 5 +- .../CommonSequences/EventBuildingSequences.py | 2 +- .../python/HLT/Config/MenuComponents.py | 20 +++--- .../HLT/Electron/FastElectronMenuSequences.py | 3 +- .../HLT/Electron/FastTrackingMenuSequences.py | 3 +- .../Electron/PrecisionCaloMenuSequences.py | 3 +- .../PrecisionElectronMenuSequences.py | 3 +- .../PrecisionElectronMenuSequences_GSF.py | 3 +- .../PrecisionTrackingMenuSequences.py | 3 +- ...recisionTracks_GSFRefittedMenuSequences.py | 3 +- .../python/HLT/Electron/generateElectron.py | 16 ++--- .../HeavyIon/HeavyIonChainConfiguration.py | 2 +- .../HLT/HeavyIon/HeavyIonMenuSequences.py | 7 +- .../python/HLT/Jet/ExoticJetSequences.py | 8 ++- .../python/HLT/Jet/JetMenuSequences.py | 57 ++++++++-------- .../python/HLT/Jet/JetTLASequences.py | 5 +- .../python/HLT/Jet/generateJet.py | 4 +- .../python/HLT/MET/ConfigHelpers.py | 2 +- .../python/HLT/MinBias/AFPMenuSequence.py | 9 ++- .../python/HLT/MinBias/ALFAMenuSequences.py | 9 +-- .../HLT/MinBias/MinBiasChainConfiguration.py | 6 +- .../HLT/MinBias/MinBiasMenuSequences.py | 15 +++-- .../python/HLT/Muon/MuonMenuSequences.py | 66 ++++++++++++------- .../python/HLT/Muon/TLAMuonSequence.py | 5 +- .../python/HLT/Muon/generateMuon.py | 12 ++-- .../HLT/Photon/FastPhotonMenuSequences.py | 7 +- .../python/HLT/Photon/HipTRTMenuSequences.py | 3 +- .../python/HLT/Photon/PhotonRecoSequences.py | 6 +- .../HLT/Photon/PrecisionCaloMenuSequences.py | 3 +- .../PrecisionPhotonCaloIsoMenuSequences.py | 3 +- .../Photon/PrecisionPhotonMenuSequences.py | 3 +- .../Photon/PrecisionPhotonTLAMenuSequences.py | 5 +- .../python/HLT/Photon/generatePhoton.py | 6 +- .../python/HLT/Tau/TauMenuSequences.py | 30 ++++++--- .../python/HLT/Tau/generateTau.py | 8 +-- .../python/HLT/Test/TestChainConfiguration.py | 36 +++++----- .../CommonConfiguration.py | 3 +- .../DJTriggerConfiguration.py | 8 ++- .../DVTriggerConfiguration.py | 8 ++- .../DisTrkTriggerConfiguration.py | 7 +- .../FullScanLRTTrackingConfiguration.py | 3 +- .../HitDVConfiguration.py | 8 ++- .../IsoHighPtTrackTriggerConfiguration.py | 3 +- ...nconventionalTrackingChainConfiguration.py | 10 +-- .../VrtSecInclusiveConfiguration.py | 3 +- .../dEdxTriggerConfiguration.py | 7 +- .../TriggerMenuMT/share/test_menu_cf.py | 2 +- 60 files changed, 339 insertions(+), 260 deletions(-) diff --git a/Trigger/TrigSteer/DecisionHandling/python/HLTSignatureConfig.py b/Trigger/TrigSteer/DecisionHandling/python/HLTSignatureConfig.py index 62406807133e..e9700cd11cb7 100644 --- a/Trigger/TrigSteer/DecisionHandling/python/HLTSignatureConfig.py +++ b/Trigger/TrigSteer/DecisionHandling/python/HLTSignatureConfig.py @@ -1,5 +1,5 @@ -# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration from AthenaConfiguration.ComponentFactory import CompFactory from DecisionHandling.HLTSignatureHypoTools import MuTestHypoTool, ElTestHypoTool @@ -99,7 +99,7 @@ def makeElSequence(ConfigFlags, name,step): # Menu sequences from TriggerMenuMT.HLT.Config.MenuComponents import MenuSequenceCA, SelectionCA, InEventRecoCA -def elMenuSequence(step, reconame, hyponame): +def elMenuSequence(flags, step, reconame, hyponame): (Sequence, IM, seqOut) = RecoFragmentsPool.retrieve(makeElSequence,ConfigFlags,name=reconame, step=step) elHypo = ElGamHypo(hyponame+"Step"+step+"ElHypo") elHypo.Input = seqOut @@ -107,12 +107,12 @@ def elMenuSequence(step, reconame, hyponame): selAcc=SelectionCA(hyponame+"elStep"+step) selAcc.mergeReco(Sequence) selAcc.addHypoAlgo(elHypo) - return MenuSequenceCA(selAcc, HypoToolGen=ElTestHypoTool) + return MenuSequenceCA(flags, selAcc, HypoToolGen=ElTestHypoTool) else: - return MenuSequence( Maker=IM, Sequence=Sequence, Hypo=elHypo, HypoToolGen=ElTestHypoTool) + return MenuSequence(flags, Maker=IM, Sequence=Sequence, Hypo=elHypo, HypoToolGen=ElTestHypoTool) -def gamMenuSequence(step, reconame, hyponame): +def gamMenuSequence(flags, step, reconame, hyponame): (Sequence, IM, seqOut) = RecoFragmentsPool.retrieve(makeElSequence,ConfigFlags,name=reconame, step=step) elHypo = ElGamHypo(hyponame+"Step"+step+"GamHypo") elHypo.Input = seqOut @@ -120,13 +120,13 @@ def gamMenuSequence(step, reconame, hyponame): selAcc=SelectionCA(hyponame+"gamStep"+step+"Gam") selAcc.mergeReco(Sequence) selAcc.addHypoAlgo(elHypo) - return MenuSequenceCA(selAcc, HypoToolGen=ElTestHypoTool) + return MenuSequenceCA(flags,selAcc, HypoToolGen=ElTestHypoTool) else: - return MenuSequence( Maker=IM, Sequence=Sequence, Hypo=elHypo, HypoToolGen=ElTestHypoTool) + return MenuSequence(flags, Maker=IM, Sequence=Sequence, Hypo=elHypo, HypoToolGen=ElTestHypoTool) -def muMenuSequence(step, reconame, hyponame): +def muMenuSequence(flags, step, reconame, hyponame): (Sequence, IM, seqOut) = RecoFragmentsPool.retrieve(makeMuSequence,ConfigFlags,name=reconame, step=step) muHypo = MuHypo(hyponame+"Step"+step+"MuHypo") muHypo.Input = seqOut @@ -134,12 +134,12 @@ def muMenuSequence(step, reconame, hyponame): selAcc=SelectionCA(hyponame+"muStep"+step) selAcc.mergeReco(Sequence) selAcc.addHypoAlgo(muHypo) - return MenuSequenceCA(selAcc, HypoToolGen=MuTestHypoTool) + return MenuSequenceCA(flags, selAcc, HypoToolGen=MuTestHypoTool) else: - return MenuSequence( Maker=IM, Sequence=Sequence, Hypo=muHypo, HypoToolGen=MuTestHypoTool) + return MenuSequence(flags, Maker=IM, Sequence=Sequence, Hypo=muHypo, HypoToolGen=MuTestHypoTool) -def genMenuSequence(step, reconame, hyponame): +def genMenuSequence(flags, step, reconame, hyponame): (Sequence, IM, seqOut) = RecoFragmentsPool.retrieve(makeElSequence,ConfigFlags,name=reconame, step=step) elHypo = ElGamHypo(hyponame+"Hypo") elHypo.Input = seqOut @@ -147,8 +147,6 @@ def genMenuSequence(step, reconame, hyponame): selAcc=SelectionCA(hyponame+"elStep"+step) selAcc.mergeReco(Sequence) selAcc.addHypoAlgo(elHypo) - return MenuSequenceCA(selAcc, HypoToolGen=ElTestHypoTool) + return MenuSequenceCA(flags, selAcc, HypoToolGen=ElTestHypoTool) else: - return MenuSequence( Maker=IM, Sequence=Sequence, Hypo=elHypo, HypoToolGen=ElTestHypoTool) - - + return MenuSequence(flags, Maker=IM, Sequence=Sequence, Hypo=elHypo, HypoToolGen=ElTestHypoTool) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/EmuStepProcessingConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/EmuStepProcessingConfig.py index 34d32ae546b8..5884e062b108 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/EmuStepProcessingConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/EmuStepProcessingConfig.py @@ -2,7 +2,6 @@ from AthenaCommon.AlgScheduler import AlgScheduler from AthenaCommon.Logging import logging -from AthenaConfiguration.AllConfigFlags import ConfigFlags from HLTSeeding.HLTSeedingConf import CTPUnpackingEmulationTool, RoIsUnpackingEmulationTool from TriggerMenuMT.HLT.Config.MenuComponents import EmptyMenuSequence log = logging.getLogger('EmuStepProcessingConfig') @@ -27,16 +26,16 @@ def generateHLTSeedingAndChainsManually(topSequence): ########################################################################### -def generateHLTSeedingAndChainsByMenu(topSequence): +def generateHLTSeedingAndChainsByMenu(flags, topSequence): log.info("generateHLTSeedingAndChainsByMenu") generateEmuEvents() emulateHLTSeeding(topSequence) - generateEmuMenu() + generateEmuMenu(flags) ########################################################################### -def generateEmuMenu(): +def generateEmuMenu(flags): """ set Emu menu and reproduce generateMT """ @@ -50,7 +49,7 @@ def generateEmuMenu(): # Generate the menu menu = GenerateMenuMT() - menu.generateAllChainConfigs(ConfigFlags) + menu.generateAllChainConfigs(flags) #menu.generateMT() @@ -176,17 +175,17 @@ def generateChainsManually(maskbit=0x7): if doMuon: from DecisionHandling.HLTSignatureConfig import muMenuSequence #step1 - mu11 = muMenuSequence(step="1",reconame="v1", hyponame="v1") - mu12 = muMenuSequence(step="1",reconame="v2", hyponame="v2") + mu11 = muMenuSequence(flags,step="1",reconame="v1", hyponame="v1") + mu12 = muMenuSequence(flags,step="1",reconame="v2", hyponame="v2") #step2 - mu21 = muMenuSequence(step="2",reconame="v1", hyponame="v1") - mu22 = muMenuSequence(step="2",reconame="v2", hyponame="v2") + mu21 = muMenuSequence(flags,step="2",reconame="v1", hyponame="v1") + mu22 = muMenuSequence(flags,step="2",reconame="v2", hyponame="v2") #step3 - mu31 = muMenuSequence(step="3",reconame="v1", hyponame="v1") - mu32 = muMenuSequence(step="3",reconame="v2", hyponame="v2") + mu31 = muMenuSequence(flags,step="3",reconame="v1", hyponame="v1") + mu32 = muMenuSequence(flags,step="3",reconame="v2", hyponame="v2") #step4 - mu41 = muMenuSequence(step="4",reconame="v1", hyponame="v1") + mu41 = muMenuSequence(flags,step="4",reconame="v1", hyponame="v1") step_mu11 = makeChainStep("Step1_mu11", [mu11] ) step_mu21 = makeChainStep("Step2_mu21", [mu21] ) @@ -212,15 +211,15 @@ def generateChainsManually(maskbit=0x7): ## #electron chains if doElectron: from DecisionHandling.HLTSignatureConfig import elMenuSequence, gamMenuSequence - el11 = elMenuSequence(step="1",reconame="v1", hyponame="v1") - el21 = elMenuSequence(step="2",reconame="v1", hyponame="v1") - el22 = elMenuSequence(step="2",reconame="v2", hyponame="v2") - el23 = elMenuSequence(step="2",reconame="v2", hyponame="v3") - el31 = elMenuSequence(step="3",reconame="v1", hyponame="v1") - el41 = elMenuSequence(step="4",reconame="v1", hyponame="v1") + el11 = elMenuSequence(flags,step="1",reconame="v1", hyponame="v1") + el21 = elMenuSequence(flags,step="2",reconame="v1", hyponame="v1") + el22 = elMenuSequence(flags,step="2",reconame="v2", hyponame="v2") + el23 = elMenuSequence(flags,step="2",reconame="v2", hyponame="v3") + el31 = elMenuSequence(flags,step="3",reconame="v1", hyponame="v1") + el41 = elMenuSequence(flags,step="4",reconame="v1", hyponame="v1") # gamma - gamm11 = gamMenuSequence("1", reconame="v1", hyponame="v1") + gamm11 = gamMenuSequence(flags,"1", reconame="v1", hyponame="v1") ElChains = [ makeChain(name='HLT_TestChain5_ev1_L1EM3', L1Thresholds=["EM3"], ChainSteps=[ makeChainStep("Step1_em11", [el11]), makeChainStep("Step2_em21", [el21]), makeChainStep("Step3_em31", [el31])] ), @@ -240,23 +239,23 @@ def generateChainsManually(maskbit=0x7): if not doElectron: from DecisionHandling.HLTSignatureConfig import elMenuSequence - el11 = elMenuSequence(step="1",reconame="v1", hyponame="v1") - el21 = elMenuSequence(step="2",reconame="v1", hyponame="v1") - el41 = elMenuSequence(step="4",reconame="v1", hyponame="v1") + el11 = elMenuSequence(flags,step="1",reconame="v1", hyponame="v1") + el21 = elMenuSequence(flags,step="2",reconame="v1", hyponame="v1") + el41 = elMenuSequence(flags,step="4",reconame="v1", hyponame="v1") if not doMuon: from DecisionHandling.HLTSignatureConfig import muMenuSequence #step1 - mu11 = muMenuSequence(step="1",reconame="v1", hyponame="v1") - mu12 = muMenuSequence(step="1",reconame="v2", hyponame="v2") + mu11 = muMenuSequence(flags,step="1",reconame="v1", hyponame="v1") + mu12 = muMenuSequence(flags,step="1",reconame="v2", hyponame="v2") #step2 - mu21 = muMenuSequence(step="2",reconame="v1", hyponame="v1") - mu22 = muMenuSequence(step="2",reconame="v2", hyponame="v2") + mu21 = muMenuSequence(flags,step="2",reconame="v1", hyponame="v1") + mu22 = muMenuSequence(flags,step="2",reconame="v2", hyponame="v2") #step3 - mu31 = muMenuSequence(step="3",reconame="v1", hyponame="v1") - mu32 = muMenuSequence(step="3",reconame="v2", hyponame="v2") + mu31 = muMenuSequence(flags,step="3",reconame="v1", hyponame="v1") + mu32 = muMenuSequence(flags,step="3",reconame="v2", hyponame="v2") #step4 - mu41 = muMenuSequence(step="4",reconame="v1", hyponame="v1") + mu41 = muMenuSequence(flags,step="4",reconame="v1", hyponame="v1") from DecisionHandling.HLTSignatureHypoTools import dimuDrComboHypoTool diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/test_menu_cf_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/test_menu_cf_newJO.py index 863d213fd5f0..edd8e93f3d8a 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/test_menu_cf_newJO.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/CFtest/test_menu_cf_newJO.py @@ -92,7 +92,7 @@ def generateEmuMenu(flags): log.info("generateEmuMenu") # make menu manually here: from TriggerMenuMT.CFtest.EmuStepProcessingConfig import generateChainsManually - generateChainsManually(0x7) + generateChainsManually(flags, 0x7) from TriggerMenuMT.HLT.Config.ControlFlow.HLTCFConfig_newJO import generateDecisionTree import TriggerMenuMT.HLT.Config.ControlFlow.HLTCFConfig_newJO diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py index b760d6757b5c..f11bbd163ba9 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py @@ -122,7 +122,8 @@ def getBJetSequence(flags, jc_name=None): ) from TrigBjetHypo.TrigBjetBtagHypoTool import TrigBjetBtagHypoToolFromDict - return MenuSequence( Sequence = BjetAthSequence, + return MenuSequence( flags, + Sequence = BjetAthSequence, Maker = InputMakerAlg, Hypo = hypo, HypoToolGen = TrigBjetBtagHypoToolFromDict) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/docs/bjet_configuration.md b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/docs/bjet_configuration.md index 18e1c4327382..7e68fa8c2e97 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/docs/bjet_configuration.md +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/docs/bjet_configuration.md @@ -371,7 +371,8 @@ In '*BjetChainConfiguration.py*' the bjet sequence is added as one step of the c The complete '*MenuSequence*' then looks as follows ```python - return MenuSequence( Sequence = BjetAthSequence, + return MenuSequence( flags, + Sequence = BjetAthSequence, Maker = InputMakerAlg, Hypo = hypo, HypoToolGen = TrigBjetBtagHypoToolFromDict) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py index c39c0c3b700f..b344131b7b37 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py @@ -64,7 +64,7 @@ def bmumuxSequence(flags): sequence, viewMaker = RecoFragmentsPool.retrieve(bmumuxAlgSequence, flags) hypo = TrigBphysStreamerHypo('BmumuxStreamerHypoAlg') - return MenuSequence( + return MenuSequence(flags, Sequence = sequence, Maker = viewMaker, Hypo = hypo, @@ -83,7 +83,7 @@ def dimuL2Sequence(flags): triggerList = getNoL2CombChainNames(), triggerLevel = 'L2') - return MenuSequence( + return MenuSequence(flags, Sequence = sequence, Maker = viewMaker, Hypo = hypo, @@ -105,7 +105,7 @@ def dimuEFSequence(flags): hypo = TrigBphysStreamerHypo('DimuEFStreamerHypoAlg', triggerLevel = 'EF') - return MenuSequence( + return MenuSequence(flags, Sequence = sequence, Maker = viewMaker, Hypo = hypo, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/BeamspotChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/BeamspotChainConfiguration.py index e39dada87059..a94d46ee620b 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/BeamspotChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/BeamspotChainConfiguration.py @@ -20,12 +20,12 @@ from TrigStreamerHypo.TrigStreamerHypoConf import TrigStreamerHypoAlg #---------------------------------------------------------------- def trkFS_trkfast_Cfg( flags ): - return allTE_trkfast( signature="FS" ) + return allTE_trkfast( flags, signature="FS" ) def allTE_trkfast_Cfg( flags ): - return allTE_trkfast( signature="BeamSpot" ) + return allTE_trkfast( flags, signature="BeamSpot" ) -def allTE_trkfast( signature="FS" ): +def allTE_trkfast( flags, signature="FS" ): inputMakerAlg = EventViewCreatorAlgorithm("IM_beamspot_"+signature) inputMakerAlg.ViewFallThrough = True inputMakerAlg.RoIsLink = "initialRoI" @@ -68,13 +68,14 @@ def allTE_trkfast( signature="FS" ): beamspotHypoToolGen= StreamerHypoToolGenerator - return MenuSequence( Sequence = beamspotViewsSequence, + return MenuSequence( flags, + Sequence = beamspotViewsSequence, Maker = inputMakerAlg, Hypo = beamspotHypoAlg, HypoToolGen = beamspotHypoToolGen ) -def getBeamspotVtx(): +def getBeamspotVtx(flags): signature = "BeamspotJet" from TrigInDetConfig.ConfigSettings import getInDetTrigConfig @@ -100,14 +101,15 @@ def getBeamspotVtx(): beamspotHypoAlg = TrigStreamerHypoAlg("BeamspotHypoAlg_"+signature) beamspotHypoToolGen= StreamerHypoToolGenerator - return MenuSequence( Sequence = beamspotViewsSequence, + return MenuSequence( flags, + Sequence = beamspotViewsSequence, Maker = inputMakerAlg, Hypo = beamspotHypoAlg, HypoToolGen = beamspotHypoToolGen ) def getBeamspotVtxCfg( flags ): - return getBeamspotVtx() + return getBeamspotVtx(flags) #---------------------------------------------------------------- diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CalibChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CalibChainConfiguration.py index 723a07dc52a9..d175fa5d9197 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CalibChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CalibChainConfiguration.py @@ -40,7 +40,7 @@ def getLArNoiseBurst(flags): noiseBurstMenuSeq = seqAND("LArNoiseMenuSeq", [noiseBurstInputMakerAlg, noiseBurstRecoSeq]) - return MenuSequence( + return MenuSequence(flags, Sequence = noiseBurstMenuSeq, Maker = noiseBurstInputMakerAlg, Hypo = hypoAlg, @@ -69,7 +69,7 @@ def getCaloAllEMLayersPS(flags): TrigL2CaloLayersAlg = CompFactory.TrigL2CaloLayersAlg("TrigL2CaloLayersAlg_AllEM") TrigL2CaloLayersAlg.TrigClusterContainerKey = sequenceOut - return MenuSequence( + return MenuSequence(flags, Sequence = sequence, Maker = viewsmaker, Hypo = TrigL2CaloLayersAlg, @@ -100,7 +100,7 @@ def getCaloAllLayersPS(flags): TrigL2CaloLayersAlg = CompFactory.TrigL2CaloLayersAlg("TrigL2CaloLayersAlg_All") TrigL2CaloLayersAlg.TrigClusterContainerKey = sequenceOut - return MenuSequence( + return MenuSequence(flags, Sequence = sequence, Maker = viewsmaker, Hypo = TrigL2CaloLayersAlg, @@ -196,7 +196,8 @@ def IDCalibTriggerCfg(flags): DummyInputMakerAlg = conf2toConfigurable(CompFactory.InputMakerForRoI( "IM_IDCalib_HypoOnlyStep" )) DummyInputMakerAlg.RoITool = conf2toConfigurable(CompFactory.ViewCreatorInitialROITool()) - return MenuSequence( Sequence = seqAND("IDCalibEmptySeq",[DummyInputMakerAlg]), + return MenuSequence( flags, + Sequence = seqAND("IDCalibEmptySeq",[DummyInputMakerAlg]), Maker = DummyInputMakerAlg, Hypo = theHypoAlg, HypoToolGen = IDCalibHypoToolFromDict, @@ -213,7 +214,8 @@ def IDCalibFTFCfg(flags): from TrigStreamerHypo.TrigStreamerHypoConfig import StreamerHypoToolGenerator HypoAlg = TrigStreamerHypoAlg("IDCalibTrkDummyStream") - return MenuSequence( Sequence = seqAND("IDCalibTrkrecoSeq", TrkSeq), + return MenuSequence( flags, + Sequence = seqAND("IDCalibTrkrecoSeq", TrkSeq), Maker = InputMakerAlg, Hypo = HypoAlg, HypoToolGen = StreamerHypoToolGenerator ) @@ -239,7 +241,7 @@ def acceptedEventsSequence(flags): hypoAlg = conf2toConfigurable(TimeBurnerCfg(name="AcceptedEventsHypo")) hypoAlg.SleepTimeMillisec = 0 - return MenuSequence( + return MenuSequence(flags, Sequence = inputMakerSeq, Maker = inputMaker, Hypo = hypoAlg, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CosmicChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CosmicChainConfiguration.py index a5e6d95ab61a..1dd29e82c2a8 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CosmicChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/CosmicChainConfiguration.py @@ -3,7 +3,6 @@ from AthenaCommon.Logging import logging logging.getLogger().info("Importing %s",__name__) log = logging.getLogger(__name__) -log.setLevel(2) from TriggerMenuMT.HLT.Config.MenuComponents import MenuSequence from AthenaCommon.CFElements import parOR @@ -39,7 +38,8 @@ def CosmicsTrkSequence(flags): trkInputMakerAlg.ViewNodeName = trkRecoSeq.name() log.debug("Prepared ID tracking sequence") log.debug(trkSequence) - return MenuSequence(Sequence = trkSequence, + return MenuSequence(flags, + Sequence = trkSequence, Maker = trkInputMakerAlg, Hypo = trackCountHypo, HypoToolGen = TrackCountHypoToolGen) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py index c2a8e061fb01..54c02c604d98 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py @@ -94,10 +94,11 @@ def enhancedBiasMenuSequence(flags): return tool - return MenuSequence( Sequence = enhancedBiasSequence, + return MenuSequence(flags, + Sequence = enhancedBiasSequence, Maker = inputMakerAlg, Hypo = hypoAlg, - HypoToolGen = EnhancedBiasHypoToolGen ) + HypoToolGen = EnhancedBiasHypoToolGen) class EnhancedBiasChainConfiguration(ChainConfigurationBase): diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/MonitorChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/MonitorChainConfiguration.py index 1520ce5a8ef3..81648ce46c45 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/MonitorChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/MonitorChainConfiguration.py @@ -30,7 +30,7 @@ def TimeBurnerSequenceCfg(flags): hypoAlg = TimeBurnerCfg() hypoAlg.SleepTimeMillisec = 200 - return MenuSequence( + return MenuSequence(flags, Sequence = inputMakerSeq, Maker = inputMaker, Hypo = hypoAlg, @@ -61,7 +61,7 @@ def L1TopoOnlineMonitorSequenceCfg(flags, isLegacy): hypoAlg = TopoMonConfig.getL1TopoOnlineMonitorHypo(flags) - return MenuSequence( + return MenuSequence(flags, Sequence = topoMonSeq, Maker = inputMaker, Hypo = hypoAlg, @@ -82,7 +82,7 @@ def MistimeMonSequenceCfg(flags): # Hypo to select on trig composite pass flag hypoAlg = TrigGenericHypoAlg("MistimeMonJ400HypoAlg", TrigCompositeContainer=outputName) - return MenuSequence( + return MenuSequence(flags, Sequence = mistimeMonSeq, Maker = inputMaker, Hypo = hypoAlg, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/StreamingChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/StreamingChainConfiguration.py index 4e2acc44e06f..4edd65c3a6e4 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/StreamingChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/StreamingChainConfiguration.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration from AthenaCommon.Logging import logging logging.getLogger().info("Importing %s",__name__) @@ -18,9 +18,9 @@ from AthenaCommon.CFElements import seqAND #---------------------------------------------------------------- def StreamingSequenceCfg( flags ): - return StreamingMenuSequence() + return StreamingMenuSequence(flags) -def StreamingMenuSequence(): +def StreamingMenuSequence(flags): inputMakerAlg = InputMakerForRoI("IM_streamerInputMaker") inputMakerAlg.RoITool = ViewCreatorInitialROITool() @@ -32,7 +32,8 @@ def StreamingMenuSequence(): streamerHypoAlg.RuntimeValidation = False #Needed to avoid the ERROR ! Decision has no 'feature' ElementLink streamerHypoToolGen= StreamerHypoToolGenerator - return MenuSequence( Sequence = streamingSequence, + return MenuSequence( flags, + Sequence = streamingSequence, Maker = inputMakerAlg, Hypo = streamerHypoAlg, HypoToolGen = streamerHypoToolGen ) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences.py index 35f91440a6cb..a2ec7a00e96f 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences.py @@ -51,7 +51,8 @@ def fastCaloMenuSequence(flags, name, doRinger=True, is_probe_leg=False): CaloMenuDefs.L2CaloClusters = sequenceOut from TrigEgammaHypo.TrigEgammaFastCaloHypoTool import TrigEgammaFastCaloHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = fastCaloViewsMaker, Hypo = theFastCaloHypo, HypoToolGen = TrigEgammaFastCaloHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences_FWD.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences_FWD.py index 38eb05d5ad9b..10fd96e6b673 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences_FWD.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/CaloSequences_FWD.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration # from TriggerMenuMT.HLT.Config.MenuComponents import RecoFragmentsPool, MenuSequence @@ -49,7 +49,8 @@ def fastCaloMenuSequence_FWD(flags, name, doRinger=True, is_probe_leg=False): theFastCaloHypo = createTrigEgammaForwardFastCaloHypoAlgMT(name+"EgammaFastCaloFWDHypo", sequenceOut) CaloMenuDefs_FWD.L2CaloClusters = sequenceOut - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = fastCaloViewsMaker, Hypo = theFastCaloHypo, HypoToolGen = TrigEgammaForwardFastCaloHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py index 76282f5eb5a4..e7ce773d89ee 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py @@ -33,7 +33,7 @@ def addEventBuildingSequence(flags, chain, eventBuildType, chainDict): return pebInfoWriterTool(flags, chainDict['chainName'], eventBuildType) inputMaker = pebInputMaker(flags, chain, eventBuildType) - seq = MenuSequence( + seq = MenuSequence(flags, Sequence = pebSequence(eventBuildType, inputMaker), Maker = inputMaker, Hypo = PEBInfoWriterAlg('PEBInfoWriterAlg_' + eventBuildType), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/MenuComponents.py index 79d166ad212a..a317b278c59a 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/MenuComponents.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/MenuComponents.py @@ -11,7 +11,6 @@ from TriggerMenuMT.HLT.Config.ControlFlow.HLTCFTools import (NoHypoToolCreated, isHypoAlg) from AthenaCommon.CFElements import parOR, seqAND, compName, getProp, hasProp, findAlgorithmByPredicate from AthenaCommon.Configurable import Configurable -from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.AthConfigFlags import AthConfigFlags from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory @@ -361,7 +360,7 @@ class MenuSequence(object): """ Class to group reco sequences with the Hypo""" """ By construction it has one Hypo Only; behaviour changed to support muFastOvlpRmSequence() which has two, but this will change""" - def __init__(self, Sequence, Maker, Hypo, HypoToolGen, IsProbe=False): + def __init__(self, flags, Sequence, Maker, Hypo, HypoToolGen, IsProbe=False): assert compName(Maker).startswith("IM"), "The input maker {} name needs to start with letter: IM".format(compName(Maker)) # For probe legs we need to substitute the inputmaker and hypo alg @@ -374,10 +373,10 @@ class MenuSequence(object): #_Sequence = Sequence log.warning(str(NoCAmigration('[MenuSequence] found a probe leg, dont know how to clone, no sequence {0}_probe created for CA components'.format(compName(Hypo))) )) else: - _Hypo = RecoFragmentsPool.retrieve(MenuSequence.getProbeHypo,ConfigFlags,basehypo=Hypo) + _Hypo = RecoFragmentsPool.retrieve(MenuSequence.getProbeHypo,flags,basehypo=Hypo) # Reset this so that HypoAlgNode.addOutput will actually do something _Hypo.HypoOutputDecisions = "StoreGateSvc+UNSPECIFIED_OUTPUT" - _Maker = RecoFragmentsPool.retrieve(MenuSequence.getProbeInputMaker,ConfigFlags,baseIM=Maker) + _Maker = RecoFragmentsPool.retrieve(MenuSequence.getProbeInputMaker,flags,baseIM=Maker) else: # For regular legs, just use the provided components _Hypo = Hypo @@ -388,7 +387,7 @@ class MenuSequence(object): input_maker_output= self.maker.readOutputList()[0] # only one since it's merged # Connect InputMaker output to ROBPrefetchingAlg(s) if there are any (except for probe seq which is handled later) - if ROBPrefetching.StepRoI in ConfigFlags.Trigger.ROBPrefetchingOptions: + if ROBPrefetching.StepRoI in flags.Trigger.ROBPrefetchingOptions: seqChildren = Sequence.getChildren() if hasattr(Sequence,'getChildren') else Sequence.Members for child in seqChildren: if hasProp(child,'ROBPrefetchingInputDecisions') and input_maker_output not in child.ROBPrefetchingInputDecisions and not input_maker_output.endswith('_probe'): @@ -401,7 +400,7 @@ class MenuSequence(object): self._name = CFNaming.menuSequenceName(compName(_Hypo)) self._hypoToolConf = HypoToolConf( HypoToolGen ) - Hypo.RuntimeValidation = ConfigFlags.Trigger.doRuntimeNaviVal + Hypo.RuntimeValidation = flags.Trigger.doRuntimeNaviVal self._hypo = HypoAlgNode( Alg = _Hypo ) hypo_output = CFNaming.hypoAlgOutName(compName(_Hypo)) self._hypo.addOutput(hypo_output) @@ -420,7 +419,7 @@ class MenuSequence(object): if isinstance(probeIM,CompFactory.EventViewCreatorAlgorithm): for child in baseSeq.getChildren()[1:]: probeChild = child.clone(child.getName()+"_probe") - if hasProp(child,'ROBPrefetchingInputDecisions') and (ROBPrefetching.StepRoI in ConfigFlags.Trigger.ROBPrefetchingOptions): + if hasProp(child,'ROBPrefetchingInputDecisions') and (ROBPrefetching.StepRoI in flags.Trigger.ROBPrefetchingOptions): # child is a ROB prefetching alg, map the probe IM decisions probeChild.ROBPrefetchingInputDecisions = [str(probeIM.InputMakerOutputDecisions)] elif probeIM.ViewNodeName == child.getName(): @@ -553,7 +552,7 @@ class MenuSequence(object): class MenuSequenceCA(MenuSequence): ''' MenuSequence with Component Accumulator ''' - def __init__(self, selectionCA, HypoToolGen, isProbe=False ): + def __init__(self, flags, selectionCA, HypoToolGen, isProbe=False ): self.ca = selectionCA allAlgs = self.ca.getEventAlgos() inputMaker = [ a for a in allAlgs if isInputMakerBase(a)] @@ -562,7 +561,7 @@ class MenuSequenceCA(MenuSequence): hypoAlg = [ a for a in allAlgs if isHypoAlg(a)] assert len(hypoAlg) == 1, "Wrong number of hypo algs in the component accumulator {}".format(len(hypoAlg)) hypoAlg = hypoAlg[0] - MenuSequence.__init__(self, self.ca.topSequence(), inputMaker, hypoAlg, HypoToolGen, IsProbe=isProbe) + MenuSequence.__init__(self, flags, self.ca.topSequence(), inputMaker, hypoAlg, HypoToolGen, IsProbe=isProbe) @property def sequence(self): @@ -1113,7 +1112,8 @@ def menuSequenceCAToGlobalWrapper(gen, flags, *args, **kwargs): msca.ca._sequence = None msca.ca._allSequences = [] appendCAtoAthena(msca.ca) - return MenuSequence(Sequence = sequence, + return MenuSequence(flags, + Sequence = sequence, Maker = maker, Hypo = hypo, HypoToolGen = msca._hypoToolConf.hypoToolGen) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py index d73d5bf90080..e98979c277f5 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py @@ -61,7 +61,8 @@ def fastElectronMenuSequence(flags, is_probe_leg=False, variant=''): from TrigEgammaHypo.TrigEgammaFastElectronHypoTool import TrigEgammaFastElectronHypoToolFromDict - return MenuSequence( Maker = fastElectronViewsMaker, + return MenuSequence( flags, + Maker = fastElectronViewsMaker, Sequence = fastElectronAthSequence, Hypo = theElectronHypo, HypoToolGen = TrigEgammaFastElectronHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py index 439d3e55d12e..e47a54b8060d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py @@ -54,7 +54,8 @@ def fastTrackingMenuSequence(flags, name, is_probe_leg=False, variant=''): theFastTrackingHypo.FeatureIsROI = False def acceptAllHypoToolGen(chainDict): return TrigStreamerHypoTool(chainDict["chainName"], Pass = True) - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = fastTrackingViewsMaker, Hypo = theFastTrackingHypo, HypoToolGen = acceptAllHypoToolGen, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py index 23bba874a41c..d268cc46024c 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py @@ -73,7 +73,8 @@ def precisionCaloMenuSequence(flags, name, is_probe_leg=False, ion=False, varian thePrecisionCaloHypo = TrigEgammaPrecisionCaloHypoAlg(name + tag(ion) + 'Hypo'+ variant) thePrecisionCaloHypo.CaloClusters = sequenceOut - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = precisionCaloViewsMaker, Hypo = thePrecisionCaloHypo, HypoToolGen = TrigEgammaPrecisionCaloHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py index 03f9ad9b1eee..8ff772587e15 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py @@ -52,7 +52,8 @@ def precisionElectronMenuSequence(flags, is_probe_leg=False, ion=False, variant from TrigEgammaHypo.TrigEgammaPrecisionElectronHypoTool import TrigEgammaPrecisionElectronHypoToolFromDict - return MenuSequence( Maker = precisionElectronViewsMaker, + return MenuSequence( flags, + Maker = precisionElectronViewsMaker, Sequence = electronPrecisionAthSequence, Hypo = thePrecisionElectronHypo, HypoToolGen = TrigEgammaPrecisionElectronHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py index 44ffa5ad7f78..c4aac533ecfe 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py @@ -54,7 +54,8 @@ def precisionElectronMenuSequence_GSF(flags, is_probe_leg=False, ion=False, var from TrigEgammaHypo.TrigEgammaPrecisionElectronHypoTool import TrigEgammaPrecisionElectronHypoToolFromDict - return MenuSequence( Maker = precisionElectronViewsMaker, + return MenuSequence( flags, + Maker = precisionElectronViewsMaker, Sequence = electronPrecisionAthSequence, Hypo = thePrecisionElectronHypo, HypoToolGen = TrigEgammaPrecisionElectronHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py index 9991695ae117..51f33c150b26 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py @@ -52,7 +52,8 @@ def precisionTrackingMenuSequence(flags, name, is_probe_leg=False, ion=False, va thePrecisionTrackingHypo.FeatureIsROI = False def acceptAllHypoToolGen(chainDict): return TrigStreamerHypoTool(chainDict["chainName"], Pass = True) - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = precisionTrackingViewsMaker, Hypo = thePrecisionTrackingHypo, HypoToolGen = acceptAllHypoToolGen, # Note: TrigEgammaPrecisionTrackingHypoAlg does not use HypoTools diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedMenuSequences.py index a94340dfa560..dff7d2d12e0a 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedMenuSequences.py @@ -51,7 +51,8 @@ def precisionTracks_GSFRefittedMenuSequence(flags, name, is_probe_leg=False, ion def acceptAllHypoToolGen(chainDict): return TrigStreamerHypoTool(chainDict["chainName"], Pass = True) - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = precisionTracks_GSFRefittedViewsMaker, Hypo = thePrecisionTrack_GSFRefittedHypo, HypoToolGen = acceptAllHypoToolGen, # Note: TrigEgammaPrecisionTrackingHypoAlg does not use HypoTools diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/generateElectron.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/generateElectron.py index 5eaeed4d7f29..29fc9fbdaa83 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/generateElectron.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/generateElectron.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration from TriggerMenuMT.HLT.Electron.ElectronRecoSequences import l2CaloRecoCfg from TriggerMenuMT.HLT.Config.MenuComponents import MenuSequenceCA, \ @@ -23,7 +23,7 @@ def _fastCaloSeq(flags): selAcc.mergeHypo(l2CaloHypo) - fastCaloSequence = MenuSequenceCA(selAcc, + fastCaloSequence = MenuSequenceCA(flags, selAcc, HypoToolGen=TrigEgammaFastCaloHypoToolFromDict) return (selAcc , fastCaloSequence) @@ -53,8 +53,8 @@ def _ftfSeq(flags): fastElectronHypoAlg.RunInView = True selAcc.addHypoAlgo(fastElectronHypoAlg) from TrigEgammaHypo.TrigEgammaFastElectronHypoTool import TrigEgammaFastElectronHypoToolFromDict - fastInDetSequence = MenuSequenceCA(selAcc, - HypoToolGen=TrigEgammaFastElectronHypoToolFromDict) + fastInDetSequence = MenuSequenceCA(flags, selAcc, + HypoToolGen=TrigEgammaFastElectronHypoToolFromDict) return (selAcc , fastInDetSequence) def _ftf(flags, chainDict): @@ -85,7 +85,7 @@ def _precisonCaloSeq(flags): CaloClusters=recordable('HLT_CaloEMClusters_Electron')) selAcc.addHypoAlgo(hypoAlg) from TrigEgammaHypo.TrigEgammaPrecisionCaloHypoTool import TrigEgammaPrecisionCaloHypoToolFromDict - menuSequence = MenuSequenceCA(selAcc, + menuSequence = MenuSequenceCA(flags, selAcc, HypoToolGen=TrigEgammaPrecisionCaloHypoToolFromDict) return (selAcc , menuSequence) @@ -111,7 +111,7 @@ def _precisionTrackingSeq(flags,chainDict): selAcc.addHypoAlgo(hypoAlg) def acceptAllHypoToolGen(chainDict): return CompFactory.TrigStreamerHypoTool(chainDict["chainName"], Pass = True) - menuSequence = MenuSequenceCA(selAcc, + menuSequence = MenuSequenceCA(flags, selAcc, HypoToolGen=acceptAllHypoToolGen) return (selAcc , menuSequence) @@ -248,8 +248,8 @@ def _precisionElectronSeq(flags): selAcc.mergeReco(recoAcc) from TrigEgammaHypo.TrigEgammaPrecisionElectronHypoTool import TrigEgammaPrecisionElectronHypoToolFromDict, TrigEgammaPrecisionElectronHypoAlgCfg selAcc.mergeHypo( TrigEgammaPrecisionElectronHypoAlgCfg(flags, 'TrigEgammaHypoAlg_noGSF', TrigEgammaKeys.precisionElectronContainer ) ) - menuSequence = MenuSequenceCA(selAcc, - HypoToolGen=TrigEgammaPrecisionElectronHypoToolFromDict) + menuSequence = MenuSequenceCA(flags, selAcc, + HypoToolGen=TrigEgammaPrecisionElectronHypoToolFromDict) return (selAcc, menuSequence) def _precisionElectron(flags, chainDict): diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonChainConfiguration.py index 49f24519ecad..786897188602 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonChainConfiguration.py @@ -17,7 +17,7 @@ else: # so let's make them functions already now #---------------------------------------------------------------- def HIFwdGapMenuSequenceCfg(flags): - return HIFwdGapMenuSequence() + return HIFwdGapMenuSequence(flags) class HeavyIonChainConfig(ChainConfigurationBase): diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py index b580befad1ed..567ecf571615 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py @@ -1,9 +1,9 @@ -# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration from TriggerMenuMT.HLT.Config.MenuComponents import MenuSequence from AthenaCommon.CFElements import seqAND -def HIFwdGapMenuSequence(): +def HIFwdGapMenuSequence(flags): from TriggerMenuMT.HLT.Egamma.TrigEgammaFactories import egammaFSCaloRecoSequence egammaFSRecoSequence = egammaFSCaloRecoSequence() @@ -22,7 +22,8 @@ def HIFwdGapMenuSequence(): from TrigHIHypo.TrigHIFwdGapHypoConfig import TrigHIFwdGapHypoToolFromDict - return MenuSequence(Sequence = theSequence, + return MenuSequence(flags, + Sequence = theSequence, Maker = HIFwdGapInputMakerAlg, Hypo = theHIFwdGapHypo, HypoToolGen = TrigHIFwdGapHypoToolFromDict) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequences.py index fcd03f8bbbe5..194e35d0cdf2 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequences.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration from AthenaCommon.Logging import logging log = logging.getLogger("TriggerMenuMT.HLT.Jet.JetChainSequences") @@ -36,7 +36,8 @@ def jetEJsMenuSequence(flags, jetsin, name): sequence = RecoFragmentsPool.retrieve( returnEJSequence , flags, algo=DummyInputMakerAlg) - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = DummyInputMakerAlg, Hypo = theEmergingJetsTriggerHypo, HypoToolGen = trigJetEJsHypoToolFromDict, @@ -68,7 +69,8 @@ def jetCRMenuSequence(flags, jetsin, name): theCalRatioTriggerHypo.Tracks = sequenceOut theCalRatioTriggerHypo.Cells = cellsin - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = IMAlg, Hypo = theCalRatioTriggerHypo, HypoToolGen = trigJetCRHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetMenuSequences.py index 2dbc1e5cc340..23d27f7ac312 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetMenuSequences.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration # from enum import Enum @@ -100,7 +100,7 @@ class JetHypoAlgType(Enum): ROIPRESEL = 2 PASSTHROUGH = 3 -def makeMenuSequence(jetSeq,IMAlg,jetsIn,jetDefString,hypoType=JetHypoAlgType.STANDARD): +def makeMenuSequence(flags,jetSeq,IMAlg,jetsIn,jetDefString,hypoType=JetHypoAlgType.STANDARD): def trigStreamerHypoTool(chain_dict): return conf2toConfigurable(CompFactory.TrigStreamerHypoTool(chain_dict["chainName"])) @@ -123,10 +123,11 @@ def makeMenuSequence(jetSeq,IMAlg,jetsIn,jetDefString,hypoType=JetHypoAlgType.ST log.debug("Generating jet menu sequence for hypo %s",hyponame) - return MenuSequence( Sequence = jetSeq, - Maker = IMAlg, - Hypo = hypo, - HypoToolGen = trigHypoToolGen ) + return MenuSequence( flags, + Sequence = jetSeq, + Maker = IMAlg, + Hypo = hypo, + HypoToolGen = trigHypoToolGen ) ############################################################################################### @@ -136,43 +137,43 @@ def makeMenuSequence(jetSeq,IMAlg,jetsIn,jetDefString,hypoType=JetHypoAlgType.ST # We set RoIs='' (recognised as seedless) instead of caloFSRoI (output of caloInputMater()) to # cut data dependency to InputMaker and allow full scan CaloCell+Clustering to be # shared with EGamma (ATR-24722) -def jetCaloPreselMenuSequence(configFlags, **jetRecoDict): +def jetCaloPreselMenuSequence(flags, **jetRecoDict): InputMakerAlg = getCaloInputMaker() jetRecoSequences, jetsIn, jetDef, clustersKey = RecoFragmentsPool.retrieve( jetCaloRecoSequences, - configFlags, RoIs='', **jetRecoDict) + flags, RoIs='', **jetRecoDict) jetDefString = jetRecoDictToString(jetRecoDict) jetAthRecoSeq = parOR(f"jetSeqCaloPresel_{jetDefString}_RecoSequence", jetRecoSequences) log.debug("Generating jet preselection menu sequence for reco %s",jetDefString) jetAthMenuSeq = seqAND(f"jetSeqCaloPresel_{jetDefString}_MenuSequence",[InputMakerAlg,jetAthRecoSeq]) - return makeMenuSequence(jetAthMenuSeq,InputMakerAlg,jetsIn,jetDefString, + return makeMenuSequence(flags,jetAthMenuSeq,InputMakerAlg,jetsIn,jetDefString, hypoType=JetHypoAlgType.CALOPRESEL), jetDef, clustersKey # A null preselection, which will only run the cluster making (step 1) # We set RoIs='' for same reason as described for jetCaloPreselMenuSequence -def jetCaloRecoMenuSequence(configFlags, clusterCalib): +def jetCaloRecoMenuSequence(flags, clusterCalib): InputMakerAlg = getCaloInputMaker() jetsIn = "" # get calo reco sequence: topoClusterSequence is a parOR of cell and topocluster reco algorithms. topoClusterSequence, clustersKey = RecoFragmentsPool.retrieve( - jetClusterSequence, configFlags, RoIs='', clusterCalib=clusterCalib) + jetClusterSequence, flags, RoIs='', clusterCalib=clusterCalib) jetAthMenuSeq = seqAND(f"jetSeqCaloRecoPassThrough_{clusterCalib}_MenuSequence",[InputMakerAlg,topoClusterSequence]) log.debug("Generating jet calocluster reco sequence") - return makeMenuSequence(jetAthMenuSeq,InputMakerAlg,jetsIn,"caloreco", + return makeMenuSequence(flags,jetAthMenuSeq,InputMakerAlg,jetsIn,"caloreco", hypoType=JetHypoAlgType.PASSTHROUGH), clustersKey # A full hypo selecting only on calo jets (step 1) # Passing isPerf = True disables the hypo # We set RoIs='' for same reason as described for jetCaloPreselMenuSequence -def jetCaloHypoMenuSequence(configFlags, isPerf, **jetRecoDict): +def jetCaloHypoMenuSequence(flags, isPerf, **jetRecoDict): InputMakerAlg = getCaloInputMaker() jetRecoSequences, jetsIn, jetDef, clustersKey = RecoFragmentsPool.retrieve( jetCaloRecoSequences, - configFlags, RoIs='', **jetRecoDict) + flags, RoIs='', **jetRecoDict) jetDefString = jetRecoDictToString(jetRecoDict) jetAthRecoSeq = parOR(f"jetSeqCaloHypo_{jetDefString}_RecoSequence", jetRecoSequences) log.debug("Generating jet calo hypo menu sequence for reco %s",jetDefString) @@ -180,16 +181,16 @@ def jetCaloHypoMenuSequence(configFlags, isPerf, **jetRecoDict): hypoType = JetHypoAlgType.STANDARD if isPerf: hypoType = JetHypoAlgType.PASSTHROUGH - return makeMenuSequence(jetAthMenuSeq,InputMakerAlg,jetsIn,jetDefString,hypoType) ,jetDef + return makeMenuSequence(flags,jetAthMenuSeq,InputMakerAlg,jetsIn,jetDefString,hypoType) ,jetDef # A full hypo selecting only on heavy ion calo jets (step 1) # Passing isPerf = True disables the hypo # We set RoIs='' for same reason as described for jetCaloPreselMenuSequence -def jetHICaloHypoMenuSequence(configFlags, isPerf, **jetRecoDict): +def jetHICaloHypoMenuSequence(flags, isPerf, **jetRecoDict): InputMakerAlg = getCaloInputMaker() jetRecoSequences, jetsIn, jetDef, clustersKey = RecoFragmentsPool.retrieve( jetHICaloRecoSequences, - configFlags, RoIs='', **jetRecoDict) + flags, RoIs='', **jetRecoDict) strtemp = "HI_{recoAlg}_{jetCalib}" jetDefString = strtemp.format(**jetRecoDict) @@ -199,7 +200,7 @@ def jetHICaloHypoMenuSequence(configFlags, isPerf, **jetRecoDict): hypoType = JetHypoAlgType.STANDARD if isPerf: hypoType = JetHypoAlgType.PASSTHROUGH - return makeMenuSequence(jetAthMenuSeq,InputMakerAlg,jetsIn,jetDefString,hypoType), jetDef + return makeMenuSequence(flags,jetAthMenuSeq,InputMakerAlg,jetsIn,jetDefString,hypoType), jetDef # A full hypo selecting on jets with FS track reco (step 2) # To combine either with a presel or a passthrough sequence @@ -208,11 +209,11 @@ def jetHICaloHypoMenuSequence(configFlags, isPerf, **jetRecoDict): # Event variable info (NPV, avg mu, pile-up density rho) is # recorded in this hypo case for monitoring and # online-derived pflow jet calibration -def jetFSTrackingHypoMenuSequence(configFlags, clustersKey, isPerf, **jetRecoDict): +def jetFSTrackingHypoMenuSequence(flags, clustersKey, isPerf, **jetRecoDict): InputMakerAlg = getTrackingInputMaker(jetRecoDict['trkopt']) jetRecoSequences, jetsIn, jetDef = RecoFragmentsPool.retrieve( jetTrackingRecoSequences, - configFlags, RoIs=trkFSRoI, clustersKey=clustersKey, **jetRecoDict) + flags, RoIs=trkFSRoI, clustersKey=clustersKey, **jetRecoDict) jetDefString = jetRecoDictToString(jetRecoDict) jetAthRecoSeq = parOR(f"jetFSTrackingHypo_{jetDefString}_RecoSequence", jetRecoSequences) @@ -220,14 +221,14 @@ def jetFSTrackingHypoMenuSequence(configFlags, clustersKey, isPerf, **jetRecoDic pvKey = getInDetTrigConfig('jet').vertex_jet evtInfoRecordSeq = RecoFragmentsPool.retrieve( eventinfoRecordSequence, - configFlags, suffix='jet', pvKey=pvKey) + flags, suffix='jet', pvKey=pvKey) log.debug("Generating jet tracking hypo menu sequence for reco %s",jetDefString) jetAthMenuSeq = seqAND(f"jetFSTrackingHypo_{jetDefString}_MenuSequence",[InputMakerAlg,jetAthRecoSeq, evtInfoRecordSeq]) hypoType = JetHypoAlgType.STANDARD if isPerf: hypoType = JetHypoAlgType.PASSTHROUGH - return makeMenuSequence(jetAthMenuSeq,InputMakerAlg,jetsIn,jetDefString,hypoType), jetDef + return makeMenuSequence(flags,jetAthMenuSeq,InputMakerAlg,jetsIn,jetDefString,hypoType), jetDef # A full hypo selecting on jets with RoI track reco (step 2) # Needs to be preceded by a presel sequence, and be provided @@ -235,33 +236,33 @@ def jetFSTrackingHypoMenuSequence(configFlags, clustersKey, isPerf, **jetRecoDic # Presel jets to be reused, which makes ghost association impossible # Substitute DR association decorator -def jetRoITrackJetTagHypoMenuSequence(configFlags, jetsIn, isPresel=True, **jetRecoDict): +def jetRoITrackJetTagHypoMenuSequence(flags, jetsIn, isPresel=True, **jetRecoDict): InputMakerAlg = getTrackingInputMaker(jetRecoDict['trkopt']) jetDefString = jetRecoDictToString(jetRecoDict) log.debug("Generating jet tracking hypo menu sequence for reco %s",jetDefString) - ftaggedJetsCopyAlg, ftaggedJetsIn = getFastFtaggedJetCopyAlg(configFlags,jetsIn=jetsIn,jetRecoDict=jetRecoDict) + ftaggedJetsCopyAlg, ftaggedJetsIn = getFastFtaggedJetCopyAlg(flags,jetsIn=jetsIn,jetRecoDict=jetRecoDict) ftaggedJetsIn=recordable(ftaggedJetsIn) # Get the track reconstruction sequence: jetTrkFtagSeq is parOR of all needed track + f-tag reco algorithms jetTrkFtagSeq = RecoFragmentsPool.retrieve( - JetRoITrackJetTagSequence, configFlags, jetsIn=ftaggedJetsIn,trkopt=jetRecoDict["trkopt"], RoIs=InputMakerAlg.InViewRoIs) + JetRoITrackJetTagSequence, flags, jetsIn=ftaggedJetsIn,trkopt=jetRecoDict["trkopt"], RoIs=InputMakerAlg.InViewRoIs) InputMakerAlg.ViewNodeName = jetTrkFtagSeq.name() # Run the JetViewAlg sequence to filter out low pT jets # Have to run it outside of JetRoITrackJetTagSequence (which runs in EventView), so that hypo recognises the filtered jets. - jetViewAlg, filtered_jetsIn = getJetViewAlg(configFlags,jetsIn=ftaggedJetsIn,**jetRecoDict) + jetViewAlg, filtered_jetsIn = getJetViewAlg(flags,jetsIn=ftaggedJetsIn,**jetRecoDict) # NOTE: Forcing non-parallel reco seq here else we get stalls from the EventView algs executing before the JetCopyAlg. jetAthRecoSeq = seqAND(f"jetRoITrackJetTagHypo_{jetDefString}_RecoSequence",[ftaggedJetsCopyAlg,jetTrkFtagSeq,jetViewAlg]) from TrigGenericAlgs.TrigGenericAlgsConfig import ROBPrefetchingAlgCfg_Si - robPrefetchAlg = algorithmCAToGlobalWrapper(ROBPrefetchingAlgCfg_Si, configFlags, nameSuffix=InputMakerAlg.name())[0] + robPrefetchAlg = algorithmCAToGlobalWrapper(ROBPrefetchingAlgCfg_Si, flags, nameSuffix=InputMakerAlg.name())[0] jetAthMenuSeq = seqAND(f"jetRoITrackJetTagHypo_{jetDefString}_MenuSequence", [InputMakerAlg,robPrefetchAlg,jetAthRecoSeq]) # Needs track-to-jet association here, maybe with dR decorator hypoType = JetHypoAlgType.ROIPRESEL if isPresel else JetHypoAlgType.STANDARD - return makeMenuSequence(jetAthMenuSeq,InputMakerAlg,filtered_jetsIn,jetDefString,hypoType) + return makeMenuSequence(flags,jetAthMenuSeq,InputMakerAlg,filtered_jetsIn,jetDefString,hypoType) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTLASequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTLASequences.py index dc6d612a5a6d..3c3f71c95c12 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTLASequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTLASequences.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration from TriggerMenuMT.HLT.Config.MenuComponents import RecoFragmentsPool, MenuSequence from AthenaCommon.CFElements import seqAND @@ -48,7 +48,8 @@ def TLAJetMenuSequence( flags, jetsIn, attachBtag=True ): hypo.TLAOutputName = jetsOut - return MenuSequence( Sequence = tlaJetAthSequence, + return MenuSequence( flags, + Sequence = tlaJetAthSequence, Maker = tlaJetInputMakerAlg, Hypo = hypo, HypoToolGen = trigJetTLAHypoToolFromDict diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/generateJet.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/generateJet.py index 639df84341fe..b827b54c5772 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/generateJet.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/generateJet.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration from TriggerMenuMT.HLT.Config.MenuComponents import MenuSequenceCA, ChainStep, Chain, InEventRecoCA, SelectionCA from AthenaConfiguration.ComponentFactory import CompFactory @@ -55,7 +55,7 @@ def generateChains( flags, chainDict ): hypo = CompFactory.TrigJetHypoAlg(f"TrigJetHypoAlg_{jetDefStr}", Jets=jetDef.fullname()) acc.addHypoAlgo(hypo) - jetSequence = MenuSequenceCA(acc, + jetSequence = MenuSequenceCA(flags, acc, HypoToolGen = trigJetHypoToolFromDict) jetStep = ChainStep(name=stepName, Sequences=[jetSequence], chainDicts=[chainDict]) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/ConfigHelpers.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/ConfigHelpers.py index 470548e551a0..e2a7827afde7 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/ConfigHelpers.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/ConfigHelpers.py @@ -201,7 +201,7 @@ class AlgConfig(ABC): hypo = conf2toConfigurable(self.make_passthrough_hypo_alg(idx)) hypo_tool = streamer_hypo_tool sequences.append( - MenuSequence( + MenuSequence(flags, Sequence=seq, Maker=inputMakers[idx], Hypo=hypo, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py index a4629da3ccf8..238e0cbad3f4 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py @@ -52,7 +52,8 @@ def AFPTrkSequenceCfg(flags): def trigStreamerAFPHypoTool(chain_dict): return conf2toConfigurable(CompFactory.TrigStreamerHypoTool(chain_dict["chainName"])) - return MenuSequence(Sequence = AFPPassThroughSequence, + return MenuSequence(flags, + Sequence = AFPPassThroughSequence, Maker = inputMaker, Hypo = hypoAlg, HypoToolGen = trigStreamerAFPHypoTool) @@ -108,7 +109,8 @@ def AFPTrkRecoHypoSequence(flags): InputJetCollection = 'HLT_AntiKt4EMTopoJets_nojcalib') - return MenuSequence(Sequence = AFPSequenceHypo, + return MenuSequence(flags, + Sequence = AFPSequenceHypo, Maker = AFPInputMakerHypo, Hypo = hypoAlg, HypoToolGen = TestTrigAFPDijetHypoToolGen) @@ -150,7 +152,8 @@ def AFPGlobalSequenceCfg(flags): AFPVertexContainer = 'HLT_AFPVertexContainer', VertexContainer = 'HLT_IDVertex_FS') - return MenuSequence(Sequence = seq, + return MenuSequence(flags, + Sequence = seq, Maker = inputMaker, Hypo = hypoAlg, HypoToolGen = AFPTOFHypoToolGen) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/ALFAMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/ALFAMenuSequences.py index fafa8f378865..bd1d635f199b 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/ALFAMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/ALFAMenuSequences.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration # from TriggerMenuMT.HLT.Config.MenuComponents import MenuSequence @@ -8,7 +8,7 @@ from AthenaCommon.CFElements import seqAND from TrigStreamerHypo.TrigStreamerHypoConf import TrigStreamerHypoAlg, TrigStreamerHypoTool -def ALFAPerfSequence(): +def ALFAPerfSequence(flags): from TrigOnlineMonitor.TrigOnlineMonitorConfig import TrigALFAROBMonitor from DecisionHandling.DecisionHandlingConf import InputMakerForRoI, ViewCreatorInitialROITool inputMakerAlg = InputMakerForRoI("IM_ALFAPerf", RoITool = ViewCreatorInitialROITool() ) @@ -22,7 +22,8 @@ def ALFAPerfSequence(): viewSeq = seqAND("ALFAPerfRecoView", [inputMakerAlg, reco]) - return MenuSequence(Sequence = viewSeq, + return MenuSequence(flags, + Sequence = viewSeq, Maker = inputMakerAlg, Hypo = hypoAlg, - HypoToolGen = alwaysRejectHypoToolGen) \ No newline at end of file + HypoToolGen = alwaysRejectHypoToolGen) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasChainConfiguration.py index 8084586a8e3b..02b26f671eb0 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasChainConfiguration.py @@ -25,10 +25,10 @@ def MinBiasSPSequenceCfg(flags): return MinBiasSPSequence(flags) def MinBiasTrkSequenceCfg(flags): - return MinBiasTrkSequence() + return MinBiasTrkSequence(flags) def MinBiasMbtsSequenceCfg(flags): - return MinBiasMbtsSequence() + return MinBiasMbtsSequence(flags) def MinBiasMbtsEmptySequenceCfg(flags): return EmptyMenuSequence("EmptyMbts") @@ -75,7 +75,7 @@ def TrigAFPDijetComboHypoToolCfg(chainDict): return tool def ALFAPerfSequenceCfg(flags): - return ALFAPerfSequence() + return ALFAPerfSequence(flags) def MinBiasZVertexFinderCfg(flags): #TODO we can do that inside of the getStep ... next interation diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py index 741d57ae70a6..84a80219a24c 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py @@ -144,7 +144,8 @@ def MinBiasSPSequence(flags): spCountHypo =SPCountHypoAlg() spCountHypo.SpacePointsKey=recordable("HLT_SpacePointCounts") - return MenuSequence(Sequence = spSequence, + return MenuSequence(flags, + Sequence = spSequence, Maker = spInputMakerAlg, Hypo = spCountHypo, HypoToolGen = SPCountHypoToolGen ) @@ -163,10 +164,10 @@ def MinBiasZVertexFinderSequenceCfg(flags): selAcc = SelectionCA("ZVertexFinderSel") selAcc.mergeReco(recoAcc) selAcc.addHypoAlgo( CompFactory.TrigZVertexHypoAlg("TrigZVertexHypoAlg", ZVertexKey=recordable("HLT_vtx_z"))) - return MenuSequenceCA(selAcc, HypoToolGen = TrigZVertexHypoToolGen) + return MenuSequenceCA(flags, selAcc, HypoToolGen = TrigZVertexHypoToolGen) -def MinBiasTrkSequence(): +def MinBiasTrkSequence(flags): from TrigMinBias.TrigMinBiasConf import TrackCountHypoAlg trkInputMakerAlg = EventViewCreatorAlgorithm("IM_TrkEventViewCreator") @@ -198,12 +199,13 @@ def MinBiasTrkSequence(): trkSequence = seqAND("TrkSequence", [trkInputMakerAlg, trkRecoSeq]) trkInputMakerAlg.ViewNodeName = trkRecoSeq.name() - return MenuSequence(Sequence = trkSequence, + return MenuSequence(flags, + Sequence = trkSequence, Maker = trkInputMakerAlg, Hypo = trackCountHypo, HypoToolGen = TrackCountHypoToolGen) -def MinBiasMbtsSequence(): +def MinBiasMbtsSequence(flags): from TrigMinBias.TrigMinBiasConf import MbtsHypoAlg from TrigMinBias.MbtsConfig import MbtsFexCfg fex = MbtsFexCfg(MbtsBitsKey=recordable("HLT_MbtsBitsContainer")) @@ -221,7 +223,8 @@ def MinBiasMbtsSequence(): hypo = MbtsHypoAlg("MbtsHypoAlg", MbtsBitsKey=fex.MbtsBitsKey) - return MenuSequence(Sequence = MbtsSequence, + return MenuSequence(flags, + Sequence = MbtsSequence, Maker = MbtsInputMakerAlg, Hypo = hypo, HypoToolGen = MbtsHypoToolGen) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py index 04e503de5b2f..afdbce651836 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py @@ -133,7 +133,8 @@ def muFastSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMufastHypoToolFromDict - return MenuSequence( Sequence = l2muFastSequence, + return MenuSequence( flags, + Sequence = l2muFastSequence, Maker = l2MuViewsMaker, Hypo = trigMufastHypo, HypoToolGen = TrigMufastHypoToolFromDict, @@ -150,7 +151,8 @@ def muFastCalibSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMufastHypoToolFromDict - return MenuSequence( Sequence = l2muFastSequence, + return MenuSequence( flags, + Sequence = l2muFastSequence, Maker = l2MuViewsMaker, Hypo = trigMufastHypo, HypoToolGen = TrigMufastHypoToolFromDict, @@ -168,7 +170,8 @@ def muFastOvlpRmSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMufastHypoToolwORFromDict - return MenuSequence( Sequence = l2muFastSequence, + return MenuSequence( flags, + Sequence = l2muFastSequence, Maker = l2MuViewsMaker, Hypo = trigMufastHypo, HypoToolGen = TrigMufastHypoToolwORFromDict, @@ -186,7 +189,8 @@ def mul2mtSAOvlpRmSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import Trigl2mtSAHypoToolwORFromDict - return MenuSequence( Sequence = l2muFastSequence, + return MenuSequence( flags, + Sequence = l2muFastSequence, Maker = l2MuViewsMaker, Hypo = trigMufastHypo, HypoToolGen = Trigl2mtSAHypoToolwORFromDict, @@ -299,7 +303,8 @@ def muCombSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigmuCombHypoToolFromDict - return MenuSequence( Sequence = l2muCombSequence, + return MenuSequence( flags, + Sequence = l2muCombSequence, Maker = l2muCombViewsMaker, Hypo = trigmuCombHypo, HypoToolGen = TrigmuCombHypoToolFromDict, @@ -361,7 +366,8 @@ def muCombLRTSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigmuCombHypoToolFromDict - return MenuSequence( Sequence = l2muCombLRTSequence, + return MenuSequence( flags, + Sequence = l2muCombLRTSequence, Maker = l2muCombLRTViewsMaker, Hypo = trigmuCombHypo, HypoToolGen = TrigmuCombHypoToolFromDict, @@ -379,7 +385,8 @@ def muCombOvlpRmSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigmuCombHypoToolwORFromDict - return MenuSequence( Sequence = l2muCombSequence, + return MenuSequence( flags, + Sequence = l2muCombSequence, Maker = l2muCombViewsMaker, Hypo = trigmuCombHypo, HypoToolGen = TrigmuCombHypoToolwORFromDict, @@ -399,7 +406,8 @@ def mul2IOOvlpRmSequence(flags, is_probe_leg=False): # from TrigMuonHypo.TrigMuonHypoConfig import TrigL2MuonOverlapRemoverMucombToolFromDict from TrigMuonHypo.TrigMuonHypoConfig import Trigl2IOHypoToolwORFromDict - return MenuSequence( Sequence = l2muCombSequence, + return MenuSequence( flags, + Sequence = l2muCombSequence, Maker = l2muCombViewsMaker, Hypo = trigmuCombHypo, HypoToolGen = Trigl2IOHypoToolwORFromDict, @@ -417,7 +425,8 @@ def mul2mtCBOvlpRmSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import Trigl2mtCBHypoToolwORFromDict - return MenuSequence( Sequence = l2muCombSequence, + return MenuSequence( flags, + Sequence = l2muCombSequence, Maker = l2muCombViewsMaker, Hypo = trigmuCombHypo, HypoToolGen = Trigl2mtCBHypoToolwORFromDict, @@ -475,7 +484,8 @@ def muEFSASequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFMSonlyHypoToolFromDict - return MenuSequence( Sequence = muonEFSAonlySequence, + return MenuSequence( flags, + Sequence = muonEFSAonlySequence, Maker = efsaViewsMaker, Hypo = trigMuonEFSAHypo, HypoToolGen = TrigMuonEFMSonlyHypoToolFromDict, @@ -551,7 +561,8 @@ def muEFCBSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFCombinerHypoToolFromDict - return MenuSequence( Sequence = muonEFCBSequence, + return MenuSequence( flags, + Sequence = muonEFCBSequence, Maker = efcbViewsMaker, Hypo = trigMuonEFCBHypo, HypoToolGen = TrigMuonEFCombinerHypoToolFromDict, @@ -569,7 +580,8 @@ def muEFCBIDperfSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFCombinerHypoToolFromDict - return MenuSequence( Sequence = muonEFCBSequence, + return MenuSequence( flags, + Sequence = muonEFCBSequence, Maker = efcbViewsMaker, Hypo = trigMuonEFCBHypo, HypoToolGen = TrigMuonEFCombinerHypoToolFromDict, @@ -584,7 +596,8 @@ def muEFIDtpSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFIdtpHypoToolFromDict - return MenuSequence( Sequence = muonEFCBSequence, + return MenuSequence( flags, + Sequence = muonEFCBSequence, Maker = efcbViewsMaker, Hypo = trigMuonEFIdtpHypo, HypoToolGen = TrigMuonEFIdtpHypoToolFromDict, @@ -628,7 +641,8 @@ def muEFCBLRTSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFCombinerHypoToolFromDict - return MenuSequence( Sequence = muonEFCBLRTSequence, + return MenuSequence( flags, + Sequence = muonEFCBLRTSequence, Maker = efcbViewsMaker, Hypo = trigMuonEFCBLRTHypo, HypoToolGen = TrigMuonEFCombinerHypoToolFromDict, @@ -647,7 +661,8 @@ def muEFCBLRTIDperfSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFCombinerHypoToolFromDict - return MenuSequence( Sequence = muonEFCBLRTSequence, + return MenuSequence( flags, + Sequence = muonEFCBLRTSequence, Maker = efcbViewsMaker, Hypo = trigMuonEFCBLRTHypo, HypoToolGen = TrigMuonEFCombinerHypoToolFromDict, @@ -696,7 +711,8 @@ def muEFSAFSSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFMSonlyHypoToolFromName - return MenuSequence( Sequence = muonEFSAFSSequence, + return MenuSequence( flags, + Sequence = muonEFSAFSSequence, Maker = efsafsInputMaker, Hypo = trigMuonEFSAFSHypo, HypoToolGen = TrigMuonEFMSonlyHypoToolFromName, @@ -767,7 +783,8 @@ def muEFCBFSSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFCombinerHypoToolFromName - return MenuSequence( Sequence = muonEFCBFSSequence, + return MenuSequence( flags, + Sequence = muonEFCBFSSequence, Maker = efcbfsInputMaker, Hypo = trigMuonEFCBFSHypo, HypoToolGen = TrigMuonEFCombinerHypoToolFromName, @@ -807,7 +824,8 @@ def efLateMuRoISequence(flags): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonLateMuRoIHypoToolFromDict - return MenuSequence( Sequence = muonEFLateSequence, + return MenuSequence( flags, + Sequence = muonEFLateSequence, Maker = eflateViewsMaker, Hypo = trigMuonEFLateHypo, HypoToolGen = TrigMuonLateMuRoIHypoToolFromDict ) @@ -862,7 +880,8 @@ def efLateMuSequence(flags): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFCombinerHypoToolFromDict - return MenuSequence( Sequence = muonEFLateSequence, + return MenuSequence( flags, + Sequence = muonEFLateSequence, Maker = eflateViewsMaker, Hypo = trigMuonEFLateHypo, HypoToolGen = TrigMuonEFCombinerHypoToolFromDict ) @@ -927,7 +946,8 @@ def muEFIsoSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFTrackIsolationHypoToolFromDict - return MenuSequence( Sequence = efmuIsoSequence, + return MenuSequence( flags, + Sequence = efmuIsoSequence, Maker = efmuIsoViewsMaker, Hypo = trigmuefIsoHypo, HypoToolGen = TrigMuonEFTrackIsolationHypoToolFromDict, @@ -944,7 +964,8 @@ def muEFMSIsoSequence(flags, is_probe_leg=False): from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFTrackIsolationHypoToolFromDict - return MenuSequence( Sequence = efmuIsoSequence, + return MenuSequence( flags, + Sequence = efmuIsoSequence, Maker = efmuIsoViewsMaker, Hypo = trigmuefIsoHypo, HypoToolGen = TrigMuonEFTrackIsolationHypoToolFromDict, @@ -976,7 +997,8 @@ def muRoiClusterSequence(flags): hypo = MuonClusterHypoAlgConfig('MuRoiClusterHypoAlg') - return MenuSequence( Sequence = muvtx_sequence, + return MenuSequence( flags, + Sequence = muvtx_sequence, Maker = inputMaker, Hypo = hypo, HypoToolGen = TrigLongLivedParticlesHypoToolFromDict ) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/TLAMuonSequence.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/TLAMuonSequence.py index 274ff8eb01b9..01b4fdaabf0e 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/TLAMuonSequence.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/TLAMuonSequence.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration # from AthenaCommon.CFElements import seqAND from TriggerMenuMT.HLT.Config.MenuComponents import RecoFragmentsPool, MenuSequence @@ -40,7 +40,8 @@ def TLAMuonMenuSequence( flags, muChainPart): hypo.TLAOutputName = sequenceOut hypo.MonTool = TrigMuonTLAHypoMonitoring("TrigMuonTLAHypoAlg/") - return MenuSequence( Sequence = tlaMuonAthSequence, + return MenuSequence( flags, + Sequence = tlaMuonAthSequence, Maker = tlaMuonInputMakerAlg, Hypo = hypo, HypoToolGen = TrigMuonEFMSonlyHypoToolFromDict diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/generateMuon.py index 0417cb482148..b0bdf68a724a 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/generateMuon.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/generateMuon.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration from TriggerMenuMT.HLT.Config.MenuComponents import MenuSequenceCA, ChainStep, Chain, EmptyMenuSequence, SelectionCA, InViewRecoCA from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator @@ -182,7 +182,7 @@ def _muFastStepSeq(flags, is_probe_leg=False): selAcc.addHypoAlgo(l2muFastHypo) - l2muFastSequence = MenuSequenceCA(selAcc, + l2muFastSequence = MenuSequenceCA(flags, selAcc, HypoToolGen = TrigMufastHypoToolFromDict, isProbe=is_probe_leg ) return (selAcc , l2muFastSequence) @@ -225,7 +225,7 @@ def _muCombStepSeq(flags): muCombInfo = 'HLT_MuonL2CBInfo' ) selAccL2CB.addHypoAlgo(l2muCombHypo) - l2muCombSequence = MenuSequenceCA(selAccL2CB, + l2muCombSequence = MenuSequenceCA(flags, selAccL2CB, HypoToolGen = TrigmuCombHypoToolFromDict) return (selAccL2CB , l2muCombSequence) @@ -286,7 +286,7 @@ def _muEFSAStepSeq(flags, name='RoI'): selAccMS.addHypoAlgo(efmuMSHypo) - efmuMSSequence = MenuSequenceCA(selAccMS, + efmuMSSequence = MenuSequenceCA(flags, selAccMS, HypoToolGen = TrigMuonEFMSonlyHypoToolFromDict) return (selAccMS , efmuMSSequence) @@ -384,7 +384,7 @@ def _muEFCBStepSeq(flags, name='RoI'): selAccEFCB.addHypoAlgo(efmuCBHypo) - efmuCBSequence = MenuSequenceCA(selAccEFCB, + efmuCBSequence = MenuSequenceCA(flags, selAccEFCB, HypoToolGen = TrigMuonEFCombinerHypoToolFromDict) return (selAccEFCB , efmuCBSequence) @@ -434,7 +434,7 @@ def _muEFIsoStepSeq(flags): inputMuons = "MuonsIso" ) selAccEFIso.addHypoAlgo(efmuIsoHypo) - efmuIsoSequence = MenuSequenceCA(selAccEFIso, + efmuIsoSequence = MenuSequenceCA(flags, selAccEFIso, HypoToolGen = TrigMuonEFTrackIsolationHypoToolFromDict) return (selAccEFIso , efmuIsoSequence) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py index cf9074f3569a..212371571705 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration @@ -70,7 +70,7 @@ def fastPhotonSequence(flags): -def fastPhotonMenuSequence(flags=None): +def fastPhotonMenuSequence(flags): """Creates secpond step photon sequence""" TrigEgammaKeys = getTrigEgammaKeys() @@ -86,7 +86,8 @@ def fastPhotonMenuSequence(flags=None): from TrigEgammaHypo.TrigEgammaFastPhotonHypoTool import TrigEgammaFastPhotonHypoToolFromDict - return MenuSequence( Maker=l2PhotonViewsMaker, + return MenuSequence( flags, + Maker=l2PhotonViewsMaker, Sequence=photonAthSequence, Hypo=thePhotonHypo, HypoToolGen=TrigEgammaFastPhotonHypoToolFromDict diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py index 39fad1230abc..f6e50ede4afe 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py @@ -70,7 +70,8 @@ def hipTRTMenuSequence(flags): trtHTHhypo = TrigTRTHTHhypoAlg("TrigTRTHTHhypo") trtHTHhypo.RNNOutputName = sequenceOut - return MenuSequence( Sequence = trtDataSequence, + return MenuSequence( flags, + Sequence = trtDataSequence, Maker = trtViewsMaker, Hypo = trtHTHhypo, HypoToolGen = TrigTRTHTHhypoToolFromDict) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PhotonRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PhotonRecoSequences.py index ac569699d77b..aea2b80efc20 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PhotonRecoSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PhotonRecoSequences.py @@ -80,7 +80,8 @@ def generatePhotonsCfg( flags ): l2CaloReco = RecoFragmentsPool.retrieve( l2CaloRecoCfg, flags ) acc.merge( l2CaloReco ) - fastCaloSequence = MenuSequence( Sequence = l2CaloReco.sequence(), + fastCaloSequence = MenuSequence( flags, + Sequence = l2CaloReco.sequence(), Maker = l2CaloReco.inputMaker(), Hypo = l2CaloHypo, HypoToolGen = TrigEgammaFastCaloHypoToolFromDict ) @@ -99,7 +100,8 @@ def generatePhotonsCfg( flags ): from TrigEgammaHypo.TrigEgammaFastPhotonHypoTool import TrigEgammaFastPhotonHypoToolFromDict - l2PhotonSequence = MenuSequence( Sequence = l2PhotonReco.sequence(), + l2PhotonSequence = MenuSequence( flags, + Sequence = l2PhotonReco.sequence(), Maker = l2PhotonReco.inputMaker(), Hypo = l2PhotonHypo, HypoToolGen = TrigEgammaFastPhotonHypoToolFromDict ) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py index c5c3c9e34bd5..e13e167b6327 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py @@ -66,7 +66,8 @@ def precisionCaloMenuSequence(flags, name, is_probe_leg=False, ion=False): thePrecisionCaloHypo = TrigEgammaPrecisionCaloHypoAlg(name + tag(ion) + 'Hypo') thePrecisionCaloHypo.CaloClusters = sequenceOut - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = precisionCaloViewsMaker, Hypo = thePrecisionCaloHypo, HypoToolGen = TrigEgammaPrecisionCaloHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py index df0dbb3cab9e..73f8416cfd97 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py @@ -61,7 +61,8 @@ def precisionPhotonCaloIsoMenuSequence(flags, name,ion=False): from TrigEgammaHypo.TrigEgammaPrecisionPhotonCaloIsoHypoTool import TrigEgammaPrecisionPhotonCaloIsoHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = precisionPhotonCaloIsoViewsMaker, Hypo = thePrecisionPhotonCaloIsoHypo, HypoToolGen = TrigEgammaPrecisionPhotonCaloIsoHypoToolFromDict) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py index 44c5750b3cd3..2468e3417e9c 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py @@ -53,7 +53,8 @@ def precisionPhotonMenuSequence(flags, name,ion=False): from TrigEgammaHypo.TrigEgammaPrecisionPhotonHypoTool import TrigEgammaPrecisionPhotonHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = precisionPhotonViewsMaker, Hypo = thePrecisionPhotonHypo, HypoToolGen = TrigEgammaPrecisionPhotonHypoToolFromDict) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonTLAMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonTLAMenuSequences.py index bc944b469f5c..f4c3ce4dc0e1 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonTLAMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonTLAMenuSequences.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration # from AthenaCommon.CFElements import seqAND from AthenaConfiguration.ComponentFactory import CompFactory @@ -32,7 +32,8 @@ def TLAPhotonMenuSequence( flags, photonsIn ): hypo.TLAOutputName = sequenceOut - return MenuSequence( Sequence = tlaPhotonAthSequence, + return MenuSequence( flags, + Sequence = tlaPhotonAthSequence, Maker = tlaPhotonInputMakerAlg, Hypo = hypo, HypoToolGen = TrigEgammaTLAPhotonHypoToolFromDict diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/generatePhoton.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/generatePhoton.py index 113a893f25c7..7a3cf65e7c94 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/generatePhoton.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/generatePhoton.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration from TriggerMenuMT.HLT.Electron.ElectronRecoSequences import l2CaloRecoCfg from TriggerMenuMT.HLT.Photon.PhotonRecoSequences import l2PhotonRecoCfg, l2PhotonHypoCfg @@ -24,7 +24,7 @@ def _fastCaloSeq(flags): CaloClusters=recordable('HLT_FastCaloEMClusters')) selAcc.mergeHypo(l2CaloHypo) - fastCaloSequence = MenuSequenceCA(selAcc, + fastCaloSequence = MenuSequenceCA(flags, selAcc, HypoToolGen=TrigEgammaFastCaloHypoToolFromDict) return (selAcc , fastCaloSequence) @@ -46,7 +46,7 @@ def _fastPhotonSeq(flags): RunInView = True ) selAcc.addHypoAlgo(l2PhotonHypo) - l2PhotonSequence = MenuSequenceCA(selAcc, + l2PhotonSequence = MenuSequenceCA(flags, selAcc, HypoToolGen = TrigEgammaFastPhotonHypoToolFromDict) return (selAcc , l2PhotonSequence) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauMenuSequences.py index 3892e2f17715..2d46ef862342 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauMenuSequences.py @@ -21,7 +21,8 @@ def tauCaloMVAMenuSeq(flags, name, is_probe_leg=False): from TrigTauHypo.TrigTauHypoTool import TrigL2TauHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = tauCaloMVAViewsMaker, Hypo = theTauCaloMVAHypo, HypoToolGen = TrigL2TauHypoToolFromDict, @@ -40,7 +41,8 @@ def tauFTFTauCoreSeq(flags, is_probe_leg=False): from TrigTauHypo.TrigTauHypoTool import TrigTauTrackHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = ftfCoreViewsMaker, Hypo = fastTrkHypo, HypoToolGen = TrigTauTrackHypoToolFromDict, @@ -60,7 +62,8 @@ def tauFTFTauLRTSeq(flags, is_probe_leg=False): from TrigTauHypo.TrigTauHypoTool import TrigTauTrackHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = ftfLRTViewsMaker, Hypo = fastTrkHypo, HypoToolGen = TrigTauTrackHypoToolFromDict, @@ -79,7 +82,8 @@ def tauFTFTauIsoSeq(flags, is_probe_leg=False): from TrigTauHypo.TrigTauHypoTool import TrigTauTrackHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = ftfIsoViewsMaker, Hypo = fastTrkHypo, HypoToolGen = TrigTauTrackHypoToolFromDict, @@ -99,7 +103,8 @@ def tauFTFTauIsoBDTSeq(flags, is_probe_leg=False): from TrigTauHypo.TrigTauHypoTool import TrigTauTrackHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = ftfIsoBDTViewsMaker, Hypo = fastTrkHypo, HypoToolGen = TrigTauTrackHypoToolFromDict, @@ -118,7 +123,8 @@ def tauTrackTwoMVASeq(flags, is_probe_leg=False): from TrigTauHypo.TrigTauHypoTool import TrigEFTauMVHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = mvaViewsMaker, Hypo = precisionHypo, HypoToolGen = TrigEFTauMVHypoToolFromDict, @@ -137,7 +143,8 @@ def tauTrackTwoLLPSeq(flags, is_probe_leg=False): from TrigTauHypo.TrigTauHypoTool import TrigEFTauMVHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = mvaViewsMaker, Hypo = precisionHypo, HypoToolGen = TrigEFTauMVHypoToolFromDict, @@ -156,7 +163,8 @@ def tauTrackLRTSeq(flags, is_probe_leg=False): from TrigTauHypo.TrigTauHypoTool import TrigEFTauMVHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = mvaViewsMaker, Hypo = precisionHypo, HypoToolGen = TrigEFTauMVHypoToolFromDict, @@ -176,7 +184,8 @@ def tauPrecTrackIsoSeq(flags, is_probe_leg=False): from TrigTauHypo.TrigTauHypoTool import TrigTrkPrecHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = precTrackViewsMaker, Hypo = precTrkHypo, HypoToolGen = TrigTrkPrecHypoToolFromDict, @@ -196,7 +205,8 @@ def tauPrecTrackLRTSeq(flags, is_probe_leg=False): from TrigTauHypo.TrigTauHypoTool import TrigTrkPrecHypoToolFromDict - return MenuSequence( Sequence = sequence, + return MenuSequence( flags, + Sequence = sequence, Maker = precTrackViewsMaker, Hypo = precTrkHypo, HypoToolGen = TrigTrkPrecHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py index d9b9bb6fe7dd..2d7f7a9159c2 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py @@ -38,7 +38,7 @@ def generateChains( flags, chainDict ): taujets = "HLT_TrigTauRecMerged_CaloMVAOnly" ) selAcc.addHypoAlgo(hypoAlg) from TrigTauHypo.TrigTauHypoTool import TrigL2TauHypoToolFromDict - menuCA = MenuSequenceCA(selAcc, HypoToolGen=TrigL2TauHypoToolFromDict) + menuCA = MenuSequenceCA(flags, selAcc, HypoToolGen=TrigL2TauHypoToolFromDict) return (selAcc , menuCA) def __calo(): @@ -83,7 +83,7 @@ def generateChains( flags, chainDict ): trackcollection = flags.Trigger.InDetTracking.TauCore.trkTracks_FTF ) selAcc.addHypoAlgo(hypoAlg) from TrigTauHypo.TrigTauHypoTool import TrigTauTrackHypoToolFromDict - menuCA = MenuSequenceCA(selAcc, HypoToolGen=TrigTauTrackHypoToolFromDict) + menuCA = MenuSequenceCA(flags, selAcc, HypoToolGen=TrigTauTrackHypoToolFromDict) return (selAcc , menuCA) def __ftfCore(): @@ -122,7 +122,7 @@ def generateChains( flags, chainDict ): selAcc.addHypoAlgo(hypoAlg) from TrigTauHypo.TrigTauHypoTool import TrigTauTrackHypoToolFromDict - menuCA = MenuSequenceCA(selAcc, HypoToolGen=TrigTauTrackHypoToolFromDict) + menuCA = MenuSequenceCA(flags, selAcc, HypoToolGen=TrigTauTrackHypoToolFromDict) return (selAcc , menuCA) def __ftfIso(): @@ -160,7 +160,7 @@ def generateChains( flags, chainDict ): selAcc.addHypoAlgo(hypoAlg) from TrigTauHypo.TrigTauHypoTool import TrigTauTrackHypoToolFromDict - menuCA = MenuSequenceCA(selAcc, HypoToolGen=TrigTauTrackHypoToolFromDict) + menuCA = MenuSequenceCA(flags, selAcc, HypoToolGen=TrigTauTrackHypoToolFromDict) return (selAcc , menuCA) def __ftfIsoBDT(): diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Test/TestChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Test/TestChainConfiguration.py index 7c4cae6a867f..f7cef31adfb5 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Test/TestChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Test/TestChainConfiguration.py @@ -20,52 +20,52 @@ def creator(flags, name): # Muons -def muCfg(step,reconame, hyponame): - return muMenuSequence(step,reconame, hyponame) +def muCfg(flags,step,reconame, hyponame): + return muMenuSequence(flags,step,reconame, hyponame) def muCfg111(flags): - return muCfg(step="1",reconame="v1", hyponame="v1") + return muCfg(flags,step="1",reconame="v1", hyponame="v1") def muCfg211(flags): - return muCfg(step="2",reconame="v1", hyponame="v1") + return muCfg(flags,step="2",reconame="v1", hyponame="v1") def muCfg311(flags): - return muCfg(step="3",reconame="v1", hyponame="v1") + return muCfg(flags,step="3",reconame="v1", hyponame="v1") def muCfg322(flags): - return muCfg(step="3",reconame="v2", hyponame="v2") + return muCfg(flags,step="3",reconame="v2", hyponame="v2") def muCfg411(flags): - return muCfg(step="4",reconame="v1", hyponame="v1") + return muCfg(flags,step="4",reconame="v1", hyponame="v1") def muCfg222(flags): - return muCfg(step="2",reconame="v2", hyponame="v2") + return muCfg(flags,step="2",reconame="v2", hyponame="v2") # Egamma -def elCfg(step,reconame, hyponame): - return elMenuSequence(step,reconame, hyponame) +def elCfg(flags,step,reconame, hyponame): + return elMenuSequence(flags,step,reconame, hyponame) -def gamCfg(step,reconame, hyponame): - return gamMenuSequence(step,reconame, hyponame) +def gamCfg(flags,step,reconame, hyponame): + return gamMenuSequence(flags,step,reconame, hyponame) def elCfg111(flags): - return elCfg(step="1",reconame="v1", hyponame="v1") + return elCfg(flags,step="1",reconame="v1", hyponame="v1") def elCfg211(flags): - return elCfg(step="2",reconame="v1", hyponame="v1") + return elCfg(flags,step="2",reconame="v1", hyponame="v1") def elCfg222(flags): - return elCfg(step="2",reconame="v2", hyponame="v2") + return elCfg(flags,step="2",reconame="v2", hyponame="v2") def elCfg223(flags): - return elCfg(step="2",reconame="v2", hyponame="v3") + return elCfg(flags,step="2",reconame="v2", hyponame="v3") def elCfg311(flags): - return elCfg(step="3",reconame="v1", hyponame="v1") + return elCfg(flags,step="3",reconame="v1", hyponame="v1") def gamCfg111(flags): - return gamCfg(step="1",reconame="v1", hyponame="v1") + return gamCfg(flags,step="1",reconame="v1", hyponame="v1") diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/CommonConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/CommonConfiguration.py index 932fd3cba2b4..a4a4f8997e73 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/CommonConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/CommonConfiguration.py @@ -43,7 +43,8 @@ def getFullScanRecoOnlySequence(flags): HypoAlg = TrigStreamerHypoAlg("UncTrkDummyStream") log.debug("Building the menu sequence for FullScanRecoOnlySequence") - return MenuSequence( Sequence = seqAND("UncTrkrecoSeq", TrkSeq), + return MenuSequence( flags, + Sequence = seqAND("UncTrkrecoSeq", TrkSeq), Maker = InputMakerAlg, Hypo = HypoAlg, HypoToolGen = StreamerHypoToolGenerator ) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DJTriggerConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DJTriggerConfiguration.py index 4f7bad33d376..0ee0e5144270 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DJTriggerConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DJTriggerConfiguration.py @@ -13,7 +13,7 @@ from TrigInDetConfig.ConfigSettings import getInDetTrigConfig logging.getLogger().info("Importing %s",__name__) log = logging.getLogger(__name__) -def DJPromptStep(): +def DJPromptStep(flags): from TrigLongLivedParticlesHypo.TrigDJHypoConfig import (TrigDJHypoPromptToolFromDict) from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConf import (DisplacedJetPromptHypoAlg) @@ -34,7 +34,8 @@ def DJPromptStep(): im_alg = conf2toConfigurable(CompFactory.InputMakerForRoI( "IM_DJTRIG_Prompt" )) im_alg.RoITool = conf2toConfigurable(CompFactory.ViewCreatorInitialROITool()) - return MenuSequence( Sequence = seqAND("DJTrigPromptEmptyStep",[im_alg]), + return MenuSequence( flags, + Sequence = seqAND("DJTrigPromptEmptyStep",[im_alg]), Maker = im_alg, Hypo = hypo_alg, HypoToolGen = TrigDJHypoPromptToolFromDict, @@ -75,7 +76,8 @@ def DJDispStep(flags): ( alg_seq ,im_alg) = RecoFragmentsPool.retrieve(DJDispFragment,flags) - return MenuSequence(Sequence = alg_seq, + return MenuSequence(flags, + Sequence = alg_seq, Maker = im_alg, Hypo = hypo_alg, HypoToolGen = TrigDJHypoDispToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DVTriggerConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DVTriggerConfiguration.py index 43389f0a626d..424830ef0ea4 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DVTriggerConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DVTriggerConfiguration.py @@ -71,7 +71,8 @@ def DVRecoSequence(flags): HypoAlg = TrigStreamerHypoAlg("TrigDVRecoDummyStream") log.debug("Building the Step dictinary for TrigDV reco") - return MenuSequence( Sequence = TrkSeq, + return MenuSequence(flags, + Sequence = TrkSeq, Maker = InputMakerAlg, Hypo = HypoAlg, HypoToolGen = StreamerHypoToolGenerator @@ -80,7 +81,7 @@ def DVRecoSequence(flags): -def DVTriggerEDSequence(): +def DVTriggerEDSequence(flags): from TrigLongLivedParticlesHypo.TrigVrtSecInclusiveHypoConfig import TrigVSIHypoToolFromDict from TrigLongLivedParticlesHypo.TrigVrtSecInclusiveHypoConfig import createTrigVSIHypoAlg @@ -97,7 +98,8 @@ def DVTriggerEDSequence(): inputMakerAlg.RoITool = conf2toConfigurable(CompFactory.ViewCreatorInitialROITool()) log.info("Building the Step dictinary for DisVtxTrigger!") - return MenuSequence( Sequence = seqAND("TrigDVEDEmptyStep",[inputMakerAlg]), + return MenuSequence(flags, + Sequence = seqAND("TrigDVEDEmptyStep",[inputMakerAlg]), Maker = inputMakerAlg, Hypo = theHypoAlg, HypoToolGen = TrigVSIHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DisTrkTriggerConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DisTrkTriggerConfiguration.py index 08415addd104..e68459e47335 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DisTrkTriggerConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/DisTrkTriggerConfiguration.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration from AthenaCommon.CFElements import seqAND from TriggerMenuMT.HLT.Config.MenuComponents import MenuSequence from AthenaCommon.Logging import logging @@ -7,7 +7,7 @@ logging.getLogger().info("Importing %s",__name__) log = logging.getLogger(__name__) -def DisTrkTriggerHypoSequence(): +def DisTrkTriggerHypoSequence(flags): from TrigLongLivedParticlesHypo.TrigDisappearingTrackHypoConfig import TrigDisappearingTrackHypoToolFromDict from TrigLongLivedParticlesHypo.TrigDisappearingTrackHypoConfig import createTrigDisappearingTrackHypoAlg @@ -20,7 +20,8 @@ def DisTrkTriggerHypoSequence(): DummyInputMakerAlg.RoITool = conf2toConfigurable(CompFactory.ViewCreatorInitialROITool()) log.debug("Building the Step dictinary for DisTrk") - return MenuSequence( Sequence = seqAND("DisTrkEmptyStep",[DummyInputMakerAlg]), + return MenuSequence( flags, + Sequence = seqAND("DisTrkEmptyStep",[DummyInputMakerAlg]), Maker = DummyInputMakerAlg, Hypo = theDisTrkHypo, HypoToolGen = TrigDisappearingTrackHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py index 2b9fb6d409a9..886c63ee0b85 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py @@ -47,7 +47,8 @@ def FullScanLRTTriggerMenuSequence(flags): log.info("Building the Step dictinary for FullScanLRT!") - return MenuSequence( Sequence = TrkSeq, + return MenuSequence(flags, + Sequence = TrkSeq, Maker = im_alg, Hypo = theHypoAlg, HypoToolGen = TrigLRTHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/HitDVConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/HitDVConfiguration.py index 571ee0111e9f..76c5cb533c44 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/HitDVConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/HitDVConfiguration.py @@ -41,14 +41,15 @@ def UTTJetRecoSequence(flags): from TrigT2CaloCommon.CaloDef import clusterFSInputMaker IMalg = clusterFSInputMaker() - return MenuSequence( Sequence = seqAND("UTTJetRecoSeq", [IMalg,topoClusterSequence,JetSeq]), + return MenuSequence( flags, + Sequence = seqAND("UTTJetRecoSeq", [IMalg,topoClusterSequence,JetSeq]), Maker = IMalg, Hypo = HypoAlg, HypoToolGen = StreamerHypoToolGenerator ) -def HitDVHypoSequence(): +def HitDVHypoSequence(flags): from TrigLongLivedParticlesHypo.TrigHitDVHypoConfig import TrigHitDVHypoToolFromDict from TrigLongLivedParticlesHypo.TrigHitDVHypoConfig import createTrigHitDVHypoAlg @@ -59,7 +60,8 @@ def HitDVHypoSequence(): DummyInputMakerAlg = conf2toConfigurable(CompFactory.InputMakerForRoI( "IM_HitDV_HypoOnlyStep" )) DummyInputMakerAlg.RoITool = conf2toConfigurable(CompFactory.ViewCreatorInitialROITool()) - return MenuSequence( Sequence = seqAND("HitDVEmptyStep",[DummyInputMakerAlg]), + return MenuSequence( flags, + Sequence = seqAND("HitDVEmptyStep",[DummyInputMakerAlg]), Maker = DummyInputMakerAlg, Hypo = theHitDVHypo, HypoToolGen = TrigHitDVHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py index 4f6223345392..62c716276706 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py @@ -25,7 +25,8 @@ def IsoHPtTrackTriggerHypoSequence(flags): DummyInputMakerAlg.RoITool = conf2toConfigurable(CompFactory.ViewCreatorInitialROITool()) log.debug("Building the Step dictinary for IsoHPt!") - return MenuSequence( Sequence = seqAND("UncTrkEmptySeq",[DummyInputMakerAlg]), + return MenuSequence( flags, + Sequence = seqAND("UncTrkEmptySeq",[DummyInputMakerAlg]), Maker = DummyInputMakerAlg, Hypo = theIsoHPtTrackTriggerHypo, HypoToolGen = TrigIsoHPtTrackTriggerHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py index 0448ded558e3..456f9c6cf75b 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py @@ -120,11 +120,11 @@ def VSITriggerCfg(flags): def dEdxTriggerCfg(flags): from TriggerMenuMT.HLT.UnconventionalTracking.dEdxTriggerConfiguration import dEdxTriggerHypoSequence - return dEdxTriggerHypoSequence() + return dEdxTriggerHypoSequence(flags) def HitDVTriggerCfg(flags): from TriggerMenuMT.HLT.UnconventionalTracking.HitDVConfiguration import HitDVHypoSequence - return HitDVHypoSequence() + return HitDVHypoSequence(flags) def JetRecoOnlyCfg(flags): from TriggerMenuMT.HLT.UnconventionalTracking.HitDVConfiguration import UTTJetRecoSequence @@ -132,11 +132,11 @@ def JetRecoOnlyCfg(flags): def DisTrkTriggerCfg(flags): from TriggerMenuMT.HLT.UnconventionalTracking.DisTrkTriggerConfiguration import DisTrkTriggerHypoSequence - return DisTrkTriggerHypoSequence() + return DisTrkTriggerHypoSequence(flags) def DJPromptStepCfg(flags): from TriggerMenuMT.HLT.UnconventionalTracking.DJTriggerConfiguration import DJPromptStep - return DJPromptStep() + return DJPromptStep(flags) def DJDispStepCfg(flags): from TriggerMenuMT.HLT.UnconventionalTracking.DJTriggerConfiguration import DJDispStep @@ -148,4 +148,4 @@ def DVRecoStepCfg(flags): def DVEDStepCfg(flags): from TriggerMenuMT.HLT.UnconventionalTracking.DVTriggerConfiguration import DVTriggerEDSequence - return DVTriggerEDSequence() + return DVTriggerEDSequence(flags) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/VrtSecInclusiveConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/VrtSecInclusiveConfiguration.py index ee619ba6767f..e998ce75e140 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/VrtSecInclusiveConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/VrtSecInclusiveConfiguration.py @@ -43,7 +43,8 @@ def VrtSecInclusiveMenuSequence(flags): theHypoAlg.isViewBased = False log.info("Building the Step dictinary for TrigVSI!") - return MenuSequence( Sequence = TrkSeq, + return MenuSequence(flags, + Sequence = TrkSeq, Maker = im_alg, Hypo = theHypoAlg, HypoToolGen = TrigVSIHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/dEdxTriggerConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/dEdxTriggerConfiguration.py index c80830ba0220..a6f20c95b302 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/dEdxTriggerConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/dEdxTriggerConfiguration.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration from AthenaCommon.CFElements import seqAND from TriggerMenuMT.HLT.Config.MenuComponents import MenuSequence from AthenaCommon.Logging import logging @@ -7,7 +7,7 @@ logging.getLogger().info("Importing %s",__name__) log = logging.getLogger(__name__) -def dEdxTriggerHypoSequence(): +def dEdxTriggerHypoSequence(flags): from TrigLongLivedParticlesHypo.TrigdEdxTrackHypoConfig import TrigdEdxTrackHypoToolFromDict from TrigLongLivedParticlesHypo.TrigdEdxTrackHypoConfig import createTrigdEdxTrackHypoAlg @@ -18,7 +18,8 @@ def dEdxTriggerHypoSequence(): DummyInputMakerAlg = conf2toConfigurable(CompFactory.InputMakerForRoI( "IM_dEdxTrack_HypoOnlyStep" )) DummyInputMakerAlg.RoITool = conf2toConfigurable(CompFactory.ViewCreatorInitialROITool()) - return MenuSequence( Sequence = seqAND("dEdxEmptyStep",[DummyInputMakerAlg]), + return MenuSequence( flags, + Sequence = seqAND("dEdxEmptyStep",[DummyInputMakerAlg]), Maker = DummyInputMakerAlg, Hypo = thedEdxTrackHypo, HypoToolGen = TrigdEdxTrackHypoToolFromDict, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/share/test_menu_cf.py b/Trigger/TriggerCommon/TriggerMenuMT/share/test_menu_cf.py index 4e223479d21e..9f0f727f3f79 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/share/test_menu_cf.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/share/test_menu_cf.py @@ -57,7 +57,7 @@ if testopt.menuType == 'menuManual': checkL1HLTConsistency(ConfigFlags) elif testopt.menuType == 'emuMenuTest': # HLT_TestChain - generateHLTSeedingAndChainsByMenu(topSequence) + generateHLTSeedingAndChainsByMenu(ConfigFlags, topSequence) elif testopt.menuType == 'emuManual': generateHLTSeedingAndChainsManually(topSequence) else: -- GitLab