From 0aca2b2e507b5aeddf0fd7dba0cd7e71c8b22dee Mon Sep 17 00:00:00 2001
From: Benjamin Michael Wynne <b.m.wynne@ed.ac.uk>
Date: Sun, 29 Nov 2020 14:18:43 +0000
Subject: [PATCH] More concurrent tracking algs in HLT
---
.../python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py | 4 ++--
.../CalibCosmicMon/BeamspotChainConfiguration.py | 4 ++--
.../UnconventionalTrackingChainConfiguration.py | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py
index c8f1c48a584..a4fc83070d1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-from AthenaCommon.CFElements import seqAND
+from AthenaCommon.CFElements import parOR, seqAND
#from AthenaCommon.Constants import DEBUG
def getSecondStageBjetTracking( inputRoI, dataObjects ):
@@ -25,7 +25,7 @@ def getSecondStageBjetTracking( inputRoI, dataObjects ):
viewVerify.DataObjects += [( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs' )]
topSequence.SGInputLoader.Load += [( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs' )]
- algSequence.append( seqAND("SecondStageFastTrackingSequence",viewAlgs) )
+ algSequence.append( parOR("SecondStageFastTrackingSequence",viewAlgs) )
# Precision Tracking
from TrigInDetConfig.InDetPT import makeInDetPrecisionTracking
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
index c1cd7911254..a597710ea80 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
@@ -8,7 +8,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigu
from TrigStreamerHypo.TrigStreamerHypoConfigMT import StreamerHypoToolMTgenerator
from TrigStreamerHypo.TrigStreamerHypoConf import TrigStreamerHypoAlgMT
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
-from AthenaCommon.CFElements import seqAND
+from AthenaCommon.CFElements import seqAND, parOR
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
@@ -53,7 +53,7 @@ def allTE_trkfast( signature="FS" ):
topSequence = AlgSequence()
topSequence.SGInputLoader.Load += [( 'TagInfo' , 'DetectorStore+ProcessingTags' )]
- beamspotSequence = seqAND( "beamspotSequence_"+signature, viewAlgs+[vertexAlg] )
+ beamspotSequence = parOR( "beamspotSequence_"+signature, viewAlgs+[vertexAlg] )
inputMakerAlg.ViewNodeName = beamspotSequence.name()
beamspotViewsSequence = seqAND( "beamspotViewsSequence"+signature, [ inputMakerAlg, beamspotSequence ])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py
index f400f129a25..8748c672f2a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py
@@ -6,7 +6,7 @@ log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.UnconventionalTracking.Unco
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool
-from AthenaCommon.CFElements import seqAND
+from AthenaCommon.CFElements import parOR
from ..CommonSequences.FullScanDefs import caloFSRoI
def unconventionalTrackingChainParts(chainParts):
@@ -101,7 +101,7 @@ def IsoHPtTrackTriggerSequence(ConfigFlags):
prmVtx = vtxAlgs[-1]
- TrkSeq = seqAND("UncTrkrecoSeq", [InputMakerAlg,TrkInputNoViewAlg, prmVtx])
+ TrkSeq = parOR("UncTrkrecoSeq", [InputMakerAlg,TrkInputNoViewAlg, prmVtx])
sequenceOut = IDTrigConfig.FT.tracksFTF( doRecord = IDTrigConfig.isRecordable )
--
GitLab