From 04b70fdc98a38bee0c690fa7e8a9cddab41ebbb4 Mon Sep 17 00:00:00 2001
From: Ben Wynne <bwynne@cern.ch>
Date: Thu, 12 Nov 2020 16:11:09 +0100
Subject: [PATCH 1/2] Electrons and muons: undoing !27517
---
.../Egamma/ElectronSequenceSetup.py | 10 ++--------
.../python/HLTMenuConfig/Muon/MuonSetup.py | 19 ++++---------------
2 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
index 4642bc39b574..ad6fda1dcb1d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
@@ -6,10 +6,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
# menu components
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool
-# ATR-20453
-# Until such time as FS and RoI collections do not interfere, a hacky fix
-#from AthenaCommon.CFElements import parOR, seqAND
-from AthenaCommon.CFElements import seqAND
+from AthenaCommon.CFElements import parOR, seqAND
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
from TrigEDMConfig.TriggerEDMRun3 import recordable
@@ -51,10 +48,7 @@ def fastElectronSequence(ConfigFlags):
l2ElectronViewsMaker.RequireParentView = True
theElectronFex.RoIs = l2ElectronViewsMaker.InViewRoIs
- # ATR-20453
- # Until such time as FS and RoI collections do not interfere, a hacky fix
- #electronInViewAlgs = parOR("electronInViewAlgs", viewAlgs + [ theElectronFex ])
- electronInViewAlgs = seqAND("electronInViewAlgs", viewAlgs + [ theElectronFex ])
+ electronInViewAlgs = parOR("electronInViewAlgs", viewAlgs + [ theElectronFex ])
l2ElectronViewsMaker.ViewNodeName = "electronInViewAlgs"
electronAthSequence = seqAND("electronAthSequence", [l2ElectronViewsMaker, electronInViewAlgs ] )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index f0eca05add18..62e15e4f3d5d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -490,17 +490,11 @@ def muFastRecoSequence( RoIs, doFullScanID = False, InsideOutMode=False ):
def muonIDFastTrackingSequence( RoIs, name, extraLoads=None ):
- # ATR-20453
- # Until such time as FS and RoI collections do not interfere, a hacky fix
- #from AthenaCommon.CFElements import parOR
- from AthenaCommon.CFElements import seqAND
+ from AthenaCommon.CFElements import parOR
viewNodeName=name+"FastIDViewNode"
- # ATR-20453
- # Until such time as FS and RoI collections do not interfere, a hacky fix
- #muonIDFastTrackingSequence = parOR(viewNodeName)
- muonIDFastTrackingSequence = seqAND(viewNodeName)
+ muonIDFastTrackingSequence = parOR(viewNodeName)
### Define input data of Inner Detector algorithms ###
### and Define EventViewNodes to run the algorithms ###
@@ -939,14 +933,9 @@ def muEFInsideOutRecoSequence(RoIs, name):
def efmuisoRecoSequence( RoIs, Muons ):
- # ATR-20453
- # Until such time as FS and RoI collections do not interfere, a hacky fix
- from AthenaCommon.CFElements import seqAND,parOR
+ from AthenaCommon.CFElements import parOR
- # ATR-20453
- # Until such time as FS and RoI collections do not interfere, a hacky fix
- #efmuisoRecoSequence = parOR("efmuIsoViewNode")
- efmuisoRecoSequence = seqAND("efmuIsoViewNode")
+ efmuisoRecoSequence = parOR("efmuIsoViewNode")
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
IDTrigConfig = getInDetTrigConfig( 'muonIso' )
--
GitLab
From f43496233259fdf8bf727eaefb256642cf8c77f3 Mon Sep 17 00:00:00 2001
From: Ben Wynne <bwynne@cern.ch>
Date: Fri, 13 Nov 2020 18:32:08 +0100
Subject: [PATCH 2/2] Parallel tau tracking, undoing !32810 !28715
---
.../python/HLTMenuConfig/Tau/TauRecoSequences.py | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
index ae4748cd2862..784c131bdf93 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
@@ -213,8 +213,8 @@ def tauCaloMVASequence(ConfigFlags):
return (tauCaloMVASequence, tauCaloMVAViewsMaker, sequenceOut)
def preSelSequence( RoIs, name):
-
- tauPreSelSequence = seqAND(name)
+
+ tauPreSelSequence = parOR(name)
signatureName, signatureNameID = _getTauSignatureShort( name )
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
@@ -247,7 +247,7 @@ def preSelSequence( RoIs, name):
def tauIdSequence( RoIs, name):
- tauIdSequence = seqAND(name)
+ tauIdSequence = parOR(name)
signatureName, signatureNameID = _getTauSignatureShort( name )
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
@@ -288,8 +288,6 @@ def tauIdSequence( RoIs, name):
def precTrackSequence( RoIs , name):
- precTrackSequence = seqAND(name)
-
signatureName, signatureNameID = _getTauSignatureShort( name )
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
IDTrigConfig = getInDetTrigConfig( signatureNameID )
@@ -322,8 +320,6 @@ def precTrackSequence( RoIs , name):
topSequence.SGInputLoader.Load += [( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs' )]
ViewVerifyTrk.DataObjects += [( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs' )]
- precTrackSequence+= ViewVerifyTrk
-
#Precision Tracking
PTAlgs = [] #List of precision tracking algs
PTTracks = [] #List of TrackCollectionKeys
@@ -333,18 +329,16 @@ def precTrackSequence( RoIs , name):
#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 = makeInDetPrecisionTracking( config = IDTrigConfig, verifier = ViewVerifyTrk, rois = RoIs )
- PTSeq = parOR("precisionTrackingIn"+signatureName, PTAlgs )
+ precTrackSequence = parOR(name, [ViewVerifyTrk] + PTAlgs )
#Get last tracks from the list as input for other alg
- precTrackSequence += PTSeq
-
sequenceOut = PTTrackParticles[-1]
return precTrackSequence, sequenceOut
def tauFTFSequence( RoIs, name ):
- tauFTFSequence = seqAND(name)
+ tauFTFSequence = parOR(name)
signatureName, signatureNameID = _getTauSignatureShort( name )
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
--
GitLab