From 07cc5f62abf615e010ab283ae89069a160b55bb0 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <frank.winklmeier@cern.ch> Date: Tue, 21 Feb 2023 15:04:34 +0100 Subject: [PATCH] TrigInDetConfig+TriggerMenuMT: pass flags to GenericMonitoringTool --- .../python/xAODTrackingCnvMonitoring.py | 6 +++--- .../TrigInDetConfig/python/EFIDTracking.py | 10 ++++++---- .../python/InDetCosmicTracking.py | 4 ++-- .../TrigInDetConfig/python/InDetTrigCommon.py | 14 +++++++------- .../python/InDetTrigPrecisionTracking.py | 9 ++++----- .../TrigTools/TrigInDetConfig/python/README.md | 7 ++++--- .../python/TrigInDetTrackingMonitoring.py | 6 +++--- .../python/HLT/Bjet/BjetMenuSequences.py | 1 + .../HLT/Bjet/BjetTrackingConfiguration.py | 7 +++---- .../python/HLT/Bjet/docs/bjet_configuration.md | 1 + .../HLT/Bphysics/BphysicsMenuSequences.py | 2 +- .../HLT/Bphysics/BphysicsRecoSequences.py | 6 +++--- .../Electron/PrecisionTrackingMenuSequences.py | 2 +- .../Electron/PrecisionTrackingRecoSequences.py | 6 +++--- .../python/HLT/MinBias/MinBiasMenuSequences.py | 2 +- .../python/HLT/Muon/MuonMenuSequences.py | 4 ++-- .../python/HLT/Muon/MuonRecoSequences.py | 18 +++++++++--------- .../python/HLT/Tau/TauRecoSequences.py | 8 ++++---- .../FullScanLRTTrackingConfiguration.py | 2 +- 19 files changed, 59 insertions(+), 56 deletions(-) diff --git a/Event/xAOD/xAODTrackingCnv/python/xAODTrackingCnvMonitoring.py b/Event/xAOD/xAODTrackingCnv/python/xAODTrackingCnvMonitoring.py index 36b1ea0e89ef..4c4ddc704d1d 100644 --- a/Event/xAOD/xAODTrackingCnv/python/xAODTrackingCnvMonitoring.py +++ b/Event/xAOD/xAODTrackingCnv/python/xAODTrackingCnvMonitoring.py @@ -1,8 +1,8 @@ -# 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 AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool -def xAODTrackingCnvMonTool(): - montool = GenericMonitoringTool("xAODTrackingCnvMonTool") +def xAODTrackingCnvMonTool(flags): + montool = GenericMonitoringTool(flags, "xAODTrackingCnvMonTool") montool.defineHistogram('TIME_Total', path='EXPERT',type='TH1F',title="Total time (ms)", xbins = 100, xmin=0.0, xmax=200) return montool diff --git a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py index d464e22eceb3..18f9752f8e90 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py @@ -80,7 +80,7 @@ def remapToOffline( name ): else: return name -def makeInDetPatternRecognition( config, verifier = 'IDTrigViewDataVerifier' ): +def makeInDetPatternRecognition( flags, config, verifier = 'IDTrigViewDataVerifier' ): viewAlgs = [] #list of all algs running in this module dataVerifier = None @@ -184,7 +184,8 @@ def makeInDetPatternRecognition( config, verifier = 'IDTrigViewDataVerifier' ): #Verifier should not be necessary when both patt. rec. and PT runs in the same view -> None #Also provides particle cnv alg inside - precisionAlgs = ambiguitySolverForIDPatternRecognition(config = config, + precisionAlgs = ambiguitySolverForIDPatternRecognition(flags, + config = config, inputTracks = config.trkTracks_IDTrig(), verifier = None, summaryTool = summaryTool ) @@ -197,7 +198,7 @@ def makeInDetPatternRecognition( config, verifier = 'IDTrigViewDataVerifier' ): # This could potentially be unified with makeInDetTrigPrecisionTracking in the InDetTrigPrecisionTracking.py? -def ambiguitySolverForIDPatternRecognition( config, summaryTool, inputTracks,verifier=None ): +def ambiguitySolverForIDPatternRecognition( flags, config, summaryTool, inputTracks,verifier=None ): ptAlgs = [] #List containing all the precision tracking algorithms hence every new added alg has to be appended to the list #----------------------------------------------------------------------------- @@ -248,7 +249,8 @@ def ambiguitySolverForIDPatternRecognition( config, summaryTool, inputTracks,ver from InDetTrigRecExample.InDetTrigConfigRecLoadToolsPost import InDetTrigParticleCreatorToolWithSummary creatorTool = InDetTrigParticleCreatorToolWithSummary - trackParticleCnvAlg = trackParticleCnv_builder(name = add_prefix( 'xAODParticleCreatorAlg', config.name + '_IDTrig' ), + trackParticleCnvAlg = trackParticleCnv_builder(flags, + name = add_prefix( 'xAODParticleCreatorAlg', config.name + '_IDTrig' ), config = config, inTrackCollectionKey = config.trkTracks_IDTrig()+"_Amb", outTrackParticlesKey = config.tracks_IDTrig(), diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetCosmicTracking.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetCosmicTracking.py index 209ac2d209ed..a6e3f60510a5 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/InDetCosmicTracking.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetCosmicTracking.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 ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool @@ -21,5 +21,5 @@ def getTrigCosmicInDetTracking(flags): verifier.DataObjects += [('TrigRoiDescriptorCollection', 'StoreGateSvc+InputRoI')] from TrigInDetConfig.EFIDTracking import makeInDetPatternRecognition - efidAlgs, verifierForEF = makeInDetPatternRecognition(idTrigConfig, verifier='VDVCosmicsIDTracking') + efidAlgs, verifierForEF = makeInDetPatternRecognition(flags, idTrigConfig, verifier='VDVCosmicsIDTracking') return dataPrepInputMaker, [verifier,verifierForEF] + dataPrepAlgs + efidAlgs diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py index d5d668f66e8f..8fa2005e458f 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.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 # # Contains algs/tools used by Inner Detector Trigger @@ -143,10 +143,10 @@ def trackCollectionCnvTool_builder(name, trackParticleCreatorTool, config): -def trackMonitoringTool_builder(suffix): +def trackMonitoringTool_builder(flags, suffix): #First load the generic monitoring tool with set of histograms for Particle Cnv - from TrigInDetMonitoringTools.TrigInDetTrackingMonitoring import TrigInDetTrackCnvMonitoring - genericMonTool = TrigInDetTrackCnvMonitoring( name = 'GenericMonitoring_{}'.format(suffix)) + from TrigInDetMonitoringTools.TrigInDetTrackingMonitoring import TrigInDetTrackCnvMonitoring + genericMonTool = TrigInDetTrackCnvMonitoring(flags, name = 'GenericMonitoring_{}'.format(suffix)) @@ -169,7 +169,7 @@ def getTrackingSuffix( name ): return '' -def trackParticleCnv_builder(name, config, inTrackCollectionKey, outTrackParticlesKey, trackParticleCreatorTool ): +def trackParticleCnv_builder(flags, name, config, inTrackCollectionKey, outTrackParticlesKey, trackParticleCreatorTool ): """Alg that stages conversion of Trk::TrackCollection into xAOD::TrackParticle container""" if trackParticleCreatorTool is None: @@ -190,8 +190,8 @@ def trackParticleCnv_builder(name, config, inTrackCollectionKey, outTrackParticl TrackParticleCreator = trackParticleCreatorTool, #Add track monitoring DoMonitoring = True, - MonTool = xAODTrackingCnvMonTool(), - TrkMonTool = trackMonitoringTool_builder( config.input_name + getTrackingSuffix(name) ), + MonTool = xAODTrackingCnvMonTool(flags), + TrkMonTool = trackMonitoringTool_builder( flags, config.input_name + getTrackingSuffix(name) ), # Properties below are used for obsolete: Rec:TrackParticle, aod -> xAOD::TrackParticle (Turn off) ConvertTrackParticles = False, # Retrieve of Rec:TrackParticle, don't need this atm xAODContainerName = '', diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigPrecisionTracking.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigPrecisionTracking.py index 5a97f5fa1ce0..d8891574683a 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigPrecisionTracking.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigPrecisionTracking.py @@ -2,15 +2,13 @@ # # Setup of precision tracking -from __future__ import print_function - -from AthenaCommon.Logging import logging +from AthenaCommon.Logging import logging log = logging.getLogger("InDetTrigPrecisionTracking") from InDetTrigRecExample.InDetTrigCommonTools import CAtoLegacyPublicToolWrapper -def makeInDetTrigPrecisionTracking( config=None, verifier=False, rois='EMViewRoIs', prefix="InDetTrigMT" ) : +def makeInDetTrigPrecisionTracking( flags, config=None, verifier=False, rois='EMViewRoIs', prefix="InDetTrigMT" ) : log.info( "makeInDetTrigPrecisionTracking:: {} {} doTRT: {} ".format( config.input_name, config.name, config.doTRT ) ) @@ -86,7 +84,8 @@ def makeInDetTrigPrecisionTracking( config=None, verifier=False, rois='EMViewRoI if config.electronPID: creatorTool = InDetTrigParticleCreatorToolWithSummaryTRTPid - trackParticleCnvAlg = trackParticleCnv_builder( name = prefix+'xAODParticleCreatorAlg'+config.input_name+'_IDTrig', + trackParticleCnvAlg = trackParticleCnv_builder( flags, + name = prefix+'xAODParticleCreatorAlg'+config.input_name+'_IDTrig', config = config, inTrackCollectionKey = finalTrackCollection, outTrackParticlesKey = outTrackParticles, diff --git a/Trigger/TrigTools/TrigInDetConfig/python/README.md b/Trigger/TrigTools/TrigInDetConfig/python/README.md index 48c371c51e06..001b4d13be44 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/README.md +++ b/Trigger/TrigTools/TrigInDetConfig/python/README.md @@ -127,17 +127,18 @@ and should be configured using from TrigInDetConfig.InDetTrigPrecisionTracking import makeInDetTrigPrecisionTracking - viewAlgs, viewVerify = makeInDetTrigPrecisionTracking( config = idconfig, rois = RoIs ) + viewAlgs, viewVerify = makeInDetTrigPrecisionTracking( flags, config = idconfig, rois = RoIs ) TrackCollection = idconfig.tracks_IDTrig() The actual interface is <pre> - def makeInDetTrigPrecisionTracking( config = None, verifier = False, rois = 'EMViewRoIs', prefix = 'InDetTrigMT'): + def makeInDetTrigPrecisionTracking( flags, config = None, verifier = False, rois = 'EMViewRoIs', prefix = 'InDetTrigMT'): </pre> where the arguments are - + + flags - ConfigFlags instance config - the ID Trigger configuration for the signature verifier - the view data verifier rois - the view RoI name diff --git a/Trigger/TrigTools/TrigInDetMonitoringTools/python/TrigInDetTrackingMonitoring.py b/Trigger/TrigTools/TrigInDetMonitoringTools/python/TrigInDetTrackingMonitoring.py index bce4f65c01f2..2b844d341246 100644 --- a/Trigger/TrigTools/TrigInDetMonitoringTools/python/TrigInDetTrackingMonitoring.py +++ b/Trigger/TrigTools/TrigInDetMonitoringTools/python/TrigInDetTrackingMonitoring.py @@ -1,10 +1,10 @@ -# 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 AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool -def TrigInDetTrackCnvMonitoring(name="TrigInDetTrackCnvMonitoring"): +def TrigInDetTrackCnvMonitoring(flags, name="TrigInDetTrackCnvMonitoring"): - montool = GenericMonitoringTool(name) + montool = GenericMonitoringTool(flags, name) #TODO need to revisit binning with higher stats if 'minBias' in name or 'MinBias' in name: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py index d179f7265a1d..73f51162aa00 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetMenuSequences.py @@ -60,6 +60,7 @@ def getBJetSequence(flags, jc_name=None): # Second stage of Fast Tracking and Precision Tracking from TriggerMenuMT.HLT.Bjet.BjetTrackingConfiguration import getSecondStageBjetTracking secondStageAlgs, PTTrackParticles = getSecondStageBjetTracking( + flags, inputRoI=InputMakerAlg.InViewRoIs, inputVertex=prmVtxKey, inputJets=InputMakerAlg.InViewJets diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetTrackingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetTrackingConfiguration.py index bb90c9045db0..ceca20399359 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetTrackingConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetTrackingConfiguration.py @@ -1,9 +1,8 @@ -# 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 AthenaCommon.CFElements import parOR, seqAND -#from AthenaCommon.Constants import DEBUG -def getSecondStageBjetTracking( inputRoI, inputVertex, inputJets ): +def getSecondStageBjetTracking( flags, inputRoI, inputVertex, inputJets ): algSequence = [] @@ -31,7 +30,7 @@ def getSecondStageBjetTracking( inputRoI, inputVertex, inputJets ): # Precision Tracking from TrigInDetConfig.InDetTrigPrecisionTracking import makeInDetTrigPrecisionTracking - PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( config = IDTrigConfig, rois=inputRoI ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( flags, config = IDTrigConfig, rois=inputRoI ) algSequence.append( seqAND("PrecisionTrackingSequence",PTAlgs) ) return [ algSequence, PTTrackParticles ] 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 7e68fa8c2e97..872995d9904d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/docs/bjet_configuration.md +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/docs/bjet_configuration.md @@ -307,6 +307,7 @@ In '*BjetChainConfiguration.py*' the bjet sequence is added as one step of the c The first algorithms are second stage of fast tracking and precision tracking (see [BjetTrackingConfiguration.py](https://gitlab.cern.ch/atlas/athena/-/blob/master/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bjet/BjetTrackingConfiguration.py)). ```python secondStageAlgs, PTTrackParticles = getSecondStageBjetTracking( + flags, inputRoI=InputMakerAlg.InViewRoIs, inputVertex=prmVtxKey, inputJets=InputMakerAlg.InViewJets diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py index b344131b7b37..d13b2ade8a50 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsMenuSequences.py @@ -45,7 +45,7 @@ def bmumuxAlgSequence(flags): InViewMuons = 'HLT_Muons_Bmumux') from .BphysicsRecoSequences import bmumuxRecoSequence - recoSequence = bmumuxRecoSequence(viewMaker.InViewRoIs, viewMaker.InViewMuons) + recoSequence = bmumuxRecoSequence(flags, viewMaker.InViewRoIs, viewMaker.InViewMuons) viewMaker.ViewNodeName = recoSequence.name() diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsRecoSequences.py index bc346cac8ef0..9999eb9f74f3 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsRecoSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Bphysics/BphysicsRecoSequences.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 AthenaCommon.GlobalFlags import globalflags from AthenaCommon.CFElements import seqAND, parOR @@ -6,7 +6,7 @@ from AthenaCommon.Logging import logging log = logging.getLogger(__name__) -def bmumuxRecoSequence(rois, muons): +def bmumuxRecoSequence(flags, rois, muons): # ATR-20453, until such time as FS and RoI collections do not interfere, a hacky fix #recoSequence = parOR('bmumuxViewNode') @@ -32,7 +32,7 @@ def bmumuxRecoSequence(rois, muons): # Precision Tracking is requested in the same view as FTF, so viewDataVerifier must not be provided from TrigInDetConfig.InDetTrigPrecisionTracking import makeInDetTrigPrecisionTracking - ptTracks, ptTrackParticles, ptAlgs = makeInDetTrigPrecisionTracking(config, None, rois) + ptTracks, ptTrackParticles, ptAlgs = makeInDetTrigPrecisionTracking(flags, config, None, rois) precisionTrackingSequence = parOR('precisionTrackingInBmumux', ptAlgs) recoSequence += precisionTrackingSequence diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py index 51f33c150b26..aa264dd2f707 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingMenuSequences.py @@ -32,7 +32,7 @@ def precisionTrackingSequence(flags, ion=False, variant=''): # calling precision tracking from TriggerMenuMT.HLT.Electron.PrecisionTrackingRecoSequences import precisionTracking - precisionTrackInViewSequence, trackParticles = precisionTracking(InViewRoIs, ion, variant) + precisionTrackInViewSequence, trackParticles = precisionTracking(flags, InViewRoIs, ion, variant) precisionTrackingInViewAlgs = parOR(tag(ion) + "InViewAlgs" + variant, [precisionTrackInViewSequence]) precisionTrackingViewsMaker.ViewNodeName = tag(ion) + "InViewAlgs" + variant diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingRecoSequences.py index 32ef2db7193e..08b2601b913c 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingRecoSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTrackingRecoSequences.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 AthenaCommon.CFElements import parOR @@ -12,7 +12,7 @@ log = logging.getLogger(__name__) from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys -def precisionTracking(RoIs, ion=False, variant=''): +def precisionTracking(flags, RoIs, ion=False, variant=''): ## Taking Fast Track information computed in 2nd step ## TrigEgammaKeys = getTrigEgammaKeys(variant, ion=ion) @@ -46,7 +46,7 @@ def precisionTracking(RoIs, ion=False, variant=''): from TrigInDetConfig.InDetTrigPrecisionTracking import makeInDetTrigPrecisionTracking - PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( config = IDTrigConfig, verifier = ViewVerifyTrk, rois= RoIs ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( flags, config = IDTrigConfig, verifier = ViewVerifyTrk, rois= RoIs ) PTSeq = parOR("precisionTrackingInElectrons" + variant + tag, PTAlgs) #trackParticles = PTTrackParticles[-1] trackParticles = TrigEgammaKeys.precisionTrackingContainer diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py index 292b57d9e9a5..c356a9bc9a6b 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py @@ -182,7 +182,7 @@ def MinBiasTrkSequence(flags): idTrigConfig = getInDetTrigConfig('minBias') from TrigInDetConfig.EFIDTracking import makeInDetPatternRecognition - algs,_ = makeInDetPatternRecognition(idTrigConfig, verifier='VDVMinBiasIDTracking') + algs,_ = makeInDetPatternRecognition(flags, idTrigConfig, verifier='VDVMinBiasIDTracking') vdv = algs[0] assert vdv.DataObjects, "Likely not ViewDataVerifier, does not have DataObjects property" vdv.DataObjects += [("xAOD::TrigCompositeContainer", "HLT_vtx_z")] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py index 9fea5aeae8c9..4608a49f24ae 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonMenuSequences.py @@ -258,7 +258,7 @@ def muCombAlgSequence(flags): extraLoads += [( 'xAOD::TrigCompositeContainer' , 'StoreGateSvc+%s' % decision )] if isCosmic(flags): - muTrigIDRecoSequence = muonIDCosmicTrackingSequence( l2muCombViewsMaker.InViewRoIs , "", extraLoads ) + muTrigIDRecoSequence = muonIDCosmicTrackingSequence( flags, l2muCombViewsMaker.InViewRoIs , "", extraLoads ) else: muTrigIDRecoSequence = muonIDFastTrackingSequence( l2muCombViewsMaker.InViewRoIs , "", extraLoads, extraLoadsForl2mtmode ) @@ -923,7 +923,7 @@ def muEFIsoAlgSequence(flags, doMSiso=False): ### get EF reco sequence ### from .MuonRecoSequences import efmuisoRecoSequence - efmuisoRecoSequence, sequenceOut = efmuisoRecoSequence( efmuIsoViewsMaker.InViewRoIs, efmuIsoViewsMaker.InViewMuons, doMSiso ) + efmuisoRecoSequence, sequenceOut = efmuisoRecoSequence( flags, efmuIsoViewsMaker.InViewRoIs, efmuIsoViewsMaker.InViewMuons, doMSiso ) efmuIsoViewsMaker.ViewNodeName = efmuisoRecoSequence.name() diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonRecoSequences.py index 2a013da3e8aa..7c4b8a86f999 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonRecoSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonRecoSequences.py @@ -327,7 +327,7 @@ def muonIDFastTrackingSequence( RoIs, name, extraLoads=None, extraLoadsForl2mtmo return muonIDFastTrackingSequence -def muonIDCosmicTrackingSequence( RoIs, name, extraLoads=None ): +def muonIDCosmicTrackingSequence( flags, RoIs, name, extraLoads=None ): from AthenaCommon.CFElements import parOR viewNodeName=name+"IDTrackingViewNode" @@ -343,7 +343,7 @@ def muonIDCosmicTrackingSequence( RoIs, name, extraLoads=None ): dataVerifier.DataObjects += [( 'TrigRoiDescriptorCollection' , 'StoreGateSvc+%s'%RoIs )] from TrigInDetConfig.EFIDTracking import makeInDetPatternRecognition - trackingAlgs, _ = makeInDetPatternRecognition( config = IDTrigConfig, verifier = 'VDVCosmicIDTracking' ) + trackingAlgs, _ = makeInDetPatternRecognition( flags, config = IDTrigConfig, verifier = 'VDVCosmicIDTracking' ) if extraLoads: dataVerifier.DataObjects += extraLoads @@ -552,26 +552,26 @@ def muEFCBRecoSequence( flags, RoIs, name ): #Pass verifier as an argument and it will automatically append necessary DataObjects #@NOTE: Don't provide any verifier if loaded in the same view as FTF if 'FS' in name: - PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( config = IDTrigConfig, rois = RoIs, verifier = False) + PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( flags, config = IDTrigConfig, rois = RoIs, verifier = False) PTSeq = parOR("precisionTrackingInMuonsFS", PTAlgs ) muEFCBRecoSequence += PTSeq trackParticles = PTTrackParticles[-1] elif 'LRT' in name: - PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( config = IDTrigConfig, rois = RoIs, verifier = ViewVerifyTrk ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( flags, config = IDTrigConfig, rois = RoIs, verifier = ViewVerifyTrk ) PTSeq = parOR("precisionTrackingInMuonsLRT", PTAlgs ) muEFCBRecoSequence += PTSeq trackParticles = PTTrackParticles[-1] #In case of cosmic Precision Tracking has been already called before hence no need to call here just retrieve the correct collection of tracks elif isCosmic(flags): if 'LRT' in name: - PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( config = IDTrigConfig, rois = RoIs, verifier = ViewVerifyTrk ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( flags, config = IDTrigConfig, rois = RoIs, verifier = ViewVerifyTrk ) PTSeq = parOR("precisionTrackingInMuonsLRT", PTAlgs ) muEFCBRecoSequence += PTSeq trackParticles = PTTrackParticles[-1] else: trackParticles = getIDTracks(flags) else: - PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( config = IDTrigConfig, rois = RoIs, verifier = ViewVerifyTrk ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( flags, config = IDTrigConfig, rois = RoIs, verifier = ViewVerifyTrk ) PTSeq = parOR("precisionTrackingInMuons", PTAlgs ) muEFCBRecoSequence += PTSeq trackParticles = PTTrackParticles[-1] @@ -677,7 +677,7 @@ def muEFInsideOutRecoSequence(flags, RoIs, name): from TrigInDetConfig.InDetTrigPrecisionTracking import makeInDetTrigPrecisionTracking #When run in a different view than FTF some data dependencies needs to be loaded through verifier - PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( config = IDTrigConfig, rois=RoIs) + PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking(flags, config = IDTrigConfig, rois=RoIs) PTSeq = parOR("precisionTrackingInLateMuons", PTAlgs ) efmuInsideOutRecoSequence += PTSeq @@ -745,7 +745,7 @@ def muEFInsideOutRecoSequence(flags, RoIs, name): -def efmuisoRecoSequence( RoIs, Muons, doMSiso=False ): +def efmuisoRecoSequence( flags, RoIs, Muons, doMSiso=False ): from AthenaCommon.CFElements import parOR @@ -780,7 +780,7 @@ def efmuisoRecoSequence( RoIs, Muons, doMSiso=False ): PTTrackParticles = [] #List of TrackParticleKeys from TrigInDetConfig.InDetTrigPrecisionTracking import makeInDetTrigPrecisionTracking - PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( config = IDTrigConfig, rois=RoIs ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( flags, config = IDTrigConfig, rois=RoIs ) PTSeq = parOR("precisionTrackingInMuonsIso"+name, PTAlgs ) efmuisoRecoSequence += PTSeq diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauRecoSequences.py index 1b45d1114d38..dd1813cfae6a 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauRecoSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/TauRecoSequences.py @@ -198,7 +198,7 @@ def tauIdSequence(flags, RoIs, name): return tauIdSequence, sequenceOut -def precTrackSequence( RoIs , name): +def precTrackSequence( flags, RoIs , name): signatureName, signatureNameID = _getTauSignatureShort( name ) from TrigInDetConfig.ConfigSettings import getInDetTrigConfig @@ -232,7 +232,7 @@ def precTrackSequence( RoIs , name): from TrigInDetConfig.InDetTrigPrecisionTracking import makeInDetTrigPrecisionTracking #When run in a different view than FTF some data dependencies needs to be loaded through verifier #Pass verifier as an argument and it will automatically append necessary DataObjects@NOTE: Don't provide any verifier if loaded in the same view as FTF - PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( config = IDTrigConfig, verifier = ViewVerifyTrk, rois = RoIs ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetTrigPrecisionTracking( flags, config = IDTrigConfig, verifier = ViewVerifyTrk, rois = RoIs ) from TrigInDetConfig.InDetTrigVertices import makeInDetTrigVertices vtxAlg = makeInDetTrigVertices( whichSignature = signatureName, @@ -434,7 +434,7 @@ def tauPrecIsoTrackSequence(flags): tauPrecIsoViewsMaker.RequireParentView = True tauPrecIsoViewsMaker.ViewNodeName = RecoSequenceName - (tauPrecIsoTrackInViewSequence, sequenceOut) = precTrackSequence( tauPrecIsoViewsMaker.InViewRoIs, RecoSequenceName) + (tauPrecIsoTrackInViewSequence, sequenceOut) = precTrackSequence(flags, tauPrecIsoViewsMaker.InViewRoIs, RecoSequenceName) tauPrecIsoTrkSequence = seqAND("tauPrecIsoTrkSequence", [tauPrecIsoViewsMaker, tauPrecIsoTrackInViewSequence ]) return (tauPrecIsoTrkSequence, tauPrecIsoViewsMaker, sequenceOut) @@ -456,7 +456,7 @@ def tauPrecLRTTrackSequence(flags): tauPrecLRTViewsMaker.RequireParentView = True tauPrecLRTViewsMaker.ViewNodeName = RecoSequenceName - (tauPrecLRTTrackInViewSequence, sequenceOut) = precTrackSequence( tauPrecLRTViewsMaker.InViewRoIs, RecoSequenceName) + (tauPrecLRTTrackInViewSequence, sequenceOut) = precTrackSequence(flags, tauPrecLRTViewsMaker.InViewRoIs, RecoSequenceName) tauPrecLRTTrkSequence = seqAND("tauPrecLRTTrkSequence", [tauPrecLRTViewsMaker, tauPrecLRTTrackInViewSequence ]) return (tauPrecLRTTrkSequence, tauPrecLRTViewsMaker, sequenceOut) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py index 886c63ee0b85..372df7362c9f 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/UnconventionalTracking/FullScanLRTTrackingConfiguration.py @@ -19,7 +19,7 @@ def FullScanLRTTriggerSequence(flags): from TrigInDetConfig.InDetTrigPrecisionTracking import makeInDetTrigPrecisionTracking - tracks_name, track_particles_names, pt_reco_algs = makeInDetTrigPrecisionTracking(config = lrtcfg, rois = trkFSRoI) + tracks_name, track_particles_names, pt_reco_algs = makeInDetTrigPrecisionTracking(flags, config = lrtcfg, rois = trkFSRoI) pt_seq = parOR("UncTrkrecoSeqfslrtpt", [pt_reco_algs]) -- GitLab