From 80ae78005006469d75ebdad1f14cc0379b12faaf Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 7 Oct 2021 13:54:34 +0200
Subject: [PATCH] Remove usage of recAlgs.doTrigger
The `recAlgs.doTrigger` flag is obsolete with the Run-3 trigger. Remove
all code setting this flag (was already `False` by default).
Relates to ATR-22725.
---
.../ErrorScaling/jobOptionsESD_Run2.py | 4 +---
.../share/jobOption_RecExCommon.py | 1 -
.../share/preIncludeRecoForBeamspot.py | 1 -
.../share/jobOptions_RecExCommon.py | 2 --
.../share/myTopOptions_runReco.py | 2 +-
.../share/myTopOptions_runRecoRAW.py | 2 +-
.../share/jobOptions_RecExCommon_IBL.py | 2 --
.../share/jobOptions_RecExCommon_NewConfig.py | 2 --
.../share/jobOptions_RecExCommon_masking.py | 2 --
.../LArCafJobs/share/skeleton.LArNoise.py | 1 -
.../share/LArNoisyROMon_standalone.py | 1 -
.../share/MMMonRecOptions.py | 1 -
.../esd2RpcMon_data_withGRL_triggerSel.py | 2 --
.../share/truthDressing.py | 2 --
.../BTagging/share/BTagging_standAlone.py | 1 -
.../HIRecExample/share/hip_ESDReReco.py | 3 ---
.../Jet/JetRec/jetbtag/myTopOptions.py | 4 ++--
.../Jet/JetRec/rdotoesd/myTopOptions.py | 4 ++--
.../Jet/JetRec/rdotoesd/save_myTopOptions.py | 4 ++--
.../share/RecExCommon_topOptions.py | 18 ++++++------------
.../RecExCommon/share/myTopOptions.py | 2 +-
.../RecExCond/share/RecExCommon_flags.py | 17 +----------------
.../RecExOnline/share/RecExOnline_recoflags.py | 1 -
.../share/RecExOnline_recoflags_HItest.py | 1 -
.../share/RecExOnline_recoflags_RunHI.py | 1 -
.../share/skeleton.RAWtoALL_tf.py | 1 -
.../share/skeleton.RAWtoESD_tf.py | 1 -
.../python/egammaOnlyPreExec.py | 4 +---
...eco_newTracking_PseudoT_fullSim_fullDigi.sh | 2 +-
..._reco_noSplit_noPseudoT_fullSim_fullDigi.sh | 2 +-
...FC_reco_noSplit_noPseudoT_stdFullSimDigi.sh | 2 +-
...coinp_noSplit_noPseudoT_fastSim_fastDigi.sh | 2 +-
...coinp_noSplit_noPseudoT_fastSim_fullDigi.sh | 2 +-
...coinp_noSplit_noPseudoT_fullSim_fullDigi.sh | 2 +-
.../python/BunchCrossingConfProvider.py | 10 ++--------
.../python/BunchCrossingTool.py | 3 +--
.../share/job_match_test.py | 2 +-
.../share/testTrigEgammaMatchingTool.py | 2 +-
.../share/TrigMuonMatching_test.py | 1 -
.../share/testAthenaMatchingTool.py | 2 +-
.../share/testAthenaTrigAOD_TrigDecTool.py | 1 -
.../share/testAthenaTrigAOD_TrigEDMAuxCheck.py | 1 -
.../share/testAthenaTrigAOD_TrigEDMCheck.py | 1 -
43 files changed, 30 insertions(+), 92 deletions(-)
diff --git a/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/jobOptionsESD_Run2.py b/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/jobOptionsESD_Run2.py
index ed704629880f..07dd64a55870 100755
--- a/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/jobOptionsESD_Run2.py
+++ b/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/jobOptionsESD_Run2.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
@@ -108,8 +108,6 @@ recAlgs.doMuonSpShower.set_Value_and_Lock (False)
recAlgs.doStaco.set_Value_and_Lock (False)
recAlgs.doCaloTrkMuId.set_Value_and_Lock (False)
recAlgs.doTileMuID.set_Value_and_Lock (False)
-# --- trigger
-recAlgs.doTrigger.set_Value_and_Lock (False)
rec.doTagRawSummary.set_Value_and_Lock (False)
diff --git a/InnerDetector/InDetExample/InDetAlignExample/share/jobOption_RecExCommon.py b/InnerDetector/InDetExample/InDetAlignExample/share/jobOption_RecExCommon.py
index 11a6a877cb4a..15dbadaccfe6 100755
--- a/InnerDetector/InDetExample/InDetAlignExample/share/jobOption_RecExCommon.py
+++ b/InnerDetector/InDetExample/InDetAlignExample/share/jobOption_RecExCommon.py
@@ -203,7 +203,6 @@ recAlgs.doStaco.set_Value_and_Lock (False)
recAlgs.doCaloTrkMuId.set_Value_and_Lock (False)
recAlgs.doTileMuID.set_Value_and_Lock (False)
# --- trigger
-recAlgs.doTrigger.set_Value_and_Lock (False)
rec.doTagRawSummary.set_Value_and_Lock (False)
rec.doTrigger.set_Value_and_Lock (False)
diff --git a/InnerDetector/InDetExample/InDetBeamSpotExample/share/preIncludeRecoForBeamspot.py b/InnerDetector/InDetExample/InDetBeamSpotExample/share/preIncludeRecoForBeamspot.py
index 8debf2785155..6d9f157ad35f 100644
--- a/InnerDetector/InDetExample/InDetBeamSpotExample/share/preIncludeRecoForBeamspot.py
+++ b/InnerDetector/InDetExample/InDetBeamSpotExample/share/preIncludeRecoForBeamspot.py
@@ -34,7 +34,6 @@ rec.doHIP.set_Value_and_Lock(False)
#Diable some additional algs which throw warnings
from RecExConfig.RecAlgsFlags import recAlgs
recAlgs.doTrackParticleCellAssociation.set_Value_and_Lock(False)
-recAlgs.doTrigger.set_Value_and_Lock(False)
from ParticleBuilderOptions.AODFlags import AODFlags
AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py b/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py
index 35175491bedc..69ae6a5754e1 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py
@@ -130,8 +130,6 @@ recAlgs.doMuonSpShower.set_Value_and_Lock (False)
recAlgs.doStaco.set_Value_and_Lock (False)
recAlgs.doCaloTrkMuId.set_Value_and_Lock (False)
recAlgs.doTileMuID.set_Value_and_Lock (False)
-# --- trigger
-recAlgs.doTrigger.set_Value_and_Lock (False)
recAlgs.doTrackParticleCellAssociation.set_Value_and_Lock(False)
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py
index 225a8b4c871a..389d7e395a7d 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py
@@ -141,7 +141,7 @@ if cosmicData:
rec.doMuon=False
if runReco and IDRecoOnly or cosmicData:
- rec.doTrigger = False; recAlgs.doTrigger=False
+ rec.doTrigger = False
# autoconfiguration might trigger undesired feature
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py
index f1b9a8b509ed..32e8cea56511 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py
@@ -129,7 +129,7 @@ if cosmicData:
rec.doMuon=False
if runReco and IDRecoOnly or cosmicData:
- rec.doTrigger = False; recAlgs.doTrigger=False
+ rec.doTrigger = False
# autoconfiguration might trigger undesired feature
diff --git a/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_IBL.py b/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_IBL.py
index 4cd301d88a5c..0067ee77ccc8 100644
--- a/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_IBL.py
+++ b/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_IBL.py
@@ -120,8 +120,6 @@ recAlgs.doMuonSpShower.set_Value_and_Lock (False)
recAlgs.doStaco.set_Value_and_Lock (False)
recAlgs.doCaloTrkMuId.set_Value_and_Lock (False)
recAlgs.doTileMuID.set_Value_and_Lock (False)
-# --- trigger
-recAlgs.doTrigger.set_Value_and_Lock (False)
#--------------------------------------------------------------
# Printout config
diff --git a/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_NewConfig.py b/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_NewConfig.py
index 25870969a398..15b38b530610 100755
--- a/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_NewConfig.py
+++ b/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_NewConfig.py
@@ -128,8 +128,6 @@ recAlgs.doMuonSpShower.set_Value_and_Lock (False)
recAlgs.doStaco.set_Value_and_Lock (False)
recAlgs.doCaloTrkMuId.set_Value_and_Lock (False)
recAlgs.doTileMuID.set_Value_and_Lock (False)
-# --- trigger
-recAlgs.doTrigger.set_Value_and_Lock (False)
#--------------------------------------------------------------
# Printout config
diff --git a/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_masking.py b/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_masking.py
index 0cd2a14338cf..b314fbc6f3f4 100755
--- a/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_masking.py
+++ b/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_masking.py
@@ -135,8 +135,6 @@ recAlgs.doMuonSpShower.set_Value_and_Lock (False)
recAlgs.doStaco.set_Value_and_Lock (False)
recAlgs.doCaloTrkMuId.set_Value_and_Lock (False)
recAlgs.doTileMuID.set_Value_and_Lock (False)
-# --- trigger
-recAlgs.doTrigger.set_Value_and_Lock (False)
recAlgs.doTrackParticleCellAssociation.set_Value_and_Lock(False)
diff --git a/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise.py b/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise.py
index 917fdd394faa..45ddbdff59f2 100644
--- a/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise.py
+++ b/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise.py
@@ -52,7 +52,6 @@ rec.doHist.set_Value_and_Lock(False)
rec.doCBNT.set_Value_and_Lock(False)
rec.doAOD.set_Value_and_Lock(False)
rec.doTrigger.set_Value_and_Lock(True)
-recAlgs.doTrigger.set_Value_and_Lock(False)
rec.doPerfMon.set_Value_and_Lock(False)
rec.doDPD.set_Value_and_Lock(False)
diff --git a/LArCalorimeter/LArMonTools/share/LArNoisyROMon_standalone.py b/LArCalorimeter/LArMonTools/share/LArNoisyROMon_standalone.py
index 26276564d024..bfe243fed238 100644
--- a/LArCalorimeter/LArMonTools/share/LArNoisyROMon_standalone.py
+++ b/LArCalorimeter/LArMonTools/share/LArNoisyROMon_standalone.py
@@ -48,7 +48,6 @@ rec.doHist.set_Value_and_Lock(False)
rec.doCBNT.set_Value_and_Lock(False)
rec.doAOD.set_Value_and_Lock(False)
rec.doTrigger.set_Value_and_Lock(False)
-recAlgs.doTrigger.set_Value_and_Lock(False)
rec.doPerfMon.set_Value_and_Lock(False)
rec.doDPD.set_Value_and_Lock(False)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/share/MMMonRecOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/share/MMMonRecOptions.py
index 8194f25735b7..85f34e7473d7 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/share/MMMonRecOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/share/MMMonRecOptions.py
@@ -2,7 +2,6 @@
from RecExConfig.RecFlags import rec
from RecExConfig.RecAlgsFlags import recAlgs
-recAlgs.doTrigger=False
# reat ESD don't write anything
rec.readESD=True
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/esd2RpcMon_data_withGRL_triggerSel.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/esd2RpcMon_data_withGRL_triggerSel.py
index 9400e0a50baa..4636bbcfe50b 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/esd2RpcMon_data_withGRL_triggerSel.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/esd2RpcMon_data_withGRL_triggerSel.py
@@ -59,7 +59,6 @@ athenaCommonFlags.EvtMax=1000 # number of events to process run on all file
rec.doTrigger=True
-recAlgs.doTrigger=True
from TriggerJobOpts.TriggerFlags import TriggerFlags
TriggerFlags.doTriggerConfigOnly=True
## set up trigger decision tool
@@ -95,7 +94,6 @@ rec.doTau=False
rec.doBTagging=False
rec.doTagRawSummary=False
rec.doLucid=False
-#rec.doTrigger = False; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched of)
rec.doMuonCombined=False
rec.doTruth=False
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/truthDressing.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/truthDressing.py
index c4d1cf6eb380..56c388b80c96 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/truthDressing.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/truthDressing.py
@@ -106,8 +106,6 @@ recAlgs.doMuonSpShower.set_Value_and_Lock (False)
recAlgs.doStaco.set_Value_and_Lock (False)
recAlgs.doCaloTrkMuId.set_Value_and_Lock (False)
recAlgs.doTileMuID.set_Value_and_Lock (False)
-# --- trigger
-recAlgs.doTrigger.set_Value_and_Lock (False)
#--------------------------------------------------------------
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_standAlone.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_standAlone.py
index 90c3da2f03d6..2b000ab60bc6 100755
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_standAlone.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_standAlone.py
@@ -56,7 +56,6 @@ if rec.doESD():
recAlgs.doMuonSpShower.set_Value_and_Lock(False)
recAlgs.doCaloTrkMuId.set_Value_and_Lock(False)
recAlgs.doMissingET.set_Value_and_Lock(False)
- recAlgs.doTrigger.set_Value_and_Lock(False)
rec.doTau.set_Value_and_Lock(False)
# However, we redo tracking, so egamma and Combined muons have to be run again
# to match to the new TrackParticleCandidate container. (I redo only Staco/MuTag)
diff --git a/Reconstruction/HeavyIonRec/HIRecExample/share/hip_ESDReReco.py b/Reconstruction/HeavyIonRec/HIRecExample/share/hip_ESDReReco.py
index caa746804481..0d4d6cee4437 100644
--- a/Reconstruction/HeavyIonRec/HIRecExample/share/hip_ESDReReco.py
+++ b/Reconstruction/HeavyIonRec/HIRecExample/share/hip_ESDReReco.py
@@ -1,6 +1,3 @@
-from RecExConfig.RecAlgsFlags import recAlgs
-recAlgs.doTrigger.set_Value_and_Lock(False)
-
rec.doTrigger.set_Value_and_Lock(False)
rec.doAODCaloCells.set_Value_and_Lock(False)
rec.doESDReconstruction.set_Value_and_Lock(True)
diff --git a/Reconstruction/Jet/JetRec/jetbtag/myTopOptions.py b/Reconstruction/Jet/JetRec/jetbtag/myTopOptions.py
index 21efec3fdc4e..1b7a720b192e 100644
--- a/Reconstruction/Jet/JetRec/jetbtag/myTopOptions.py
+++ b/Reconstruction/Jet/JetRec/jetbtag/myTopOptions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#example of personal topOptions
#
@@ -39,7 +39,7 @@ else:
# rec.doCalo=False
# rec.doMuon=False
#rec.doEgamma=False
-rec.doTrigger = False; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched of)
+rec.doTrigger = False # disable trigger (maybe necessary if detectors switched of)
rec.doMuon=False
rec.doMuonCombined=False
#rec.doWriteAOD=False
diff --git a/Reconstruction/Jet/JetRec/rdotoesd/myTopOptions.py b/Reconstruction/Jet/JetRec/rdotoesd/myTopOptions.py
index 0a071a397e75..d42e2e453438 100644
--- a/Reconstruction/Jet/JetRec/rdotoesd/myTopOptions.py
+++ b/Reconstruction/Jet/JetRec/rdotoesd/myTopOptions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#example of personal topOptions
#
@@ -41,7 +41,7 @@ BTaggingFlags.CalibrationTag = 'BTagCalibRUN12-08-03'
# rec.doCalo=False
# rec.doMuon=False
#rec.doEgamma=False
-rec.doTrigger = False; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched of)
+rec.doTrigger = False # disable trigger (maybe necessary if detectors switched of)
#rec.doMuon=False
#rec.doMuonCombined=False
#rec.doWriteAOD=False
diff --git a/Reconstruction/Jet/JetRec/rdotoesd/save_myTopOptions.py b/Reconstruction/Jet/JetRec/rdotoesd/save_myTopOptions.py
index 573056489f96..b138faf8d9b4 100644
--- a/Reconstruction/Jet/JetRec/rdotoesd/save_myTopOptions.py
+++ b/Reconstruction/Jet/JetRec/rdotoesd/save_myTopOptions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#example of personal topOptions
#
@@ -39,7 +39,7 @@ else:
# rec.doCalo=False
# rec.doMuon=False
#rec.doEgamma=False
-rec.doTrigger = False; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched of)
+rec.doTrigger = False # disable trigger (maybe necessary if detectors switched of)
rec.doMuon=False
rec.doMuonCombined=False
#rec.doWriteAOD=False
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
index 59863351fe3e..3638cbf320d5 100644
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -530,11 +530,10 @@ pdr.flag_domain('trig')
# no trigger, if readESD _and_ doESD ! (from Simon George, #87654)
if rec.readESD() and rec.doESD():
rec.doTrigger=False
- recAlgs.doTrigger=False
logRecExCommon_topOptions.info("detected re-reconstruction from ESD, will switch trigger OFF !")
-# Disable Trigger output reading in MC if there is none, unless running Trigger selection algorithms
-if not globalflags.InputFormat.is_bytestream() and not recAlgs.doTrigger:
+# Disable Trigger output reading in MC if there is none
+if not globalflags.InputFormat.is_bytestream():
try:
from RecExConfig.ObjKeyStore import cfgKeyStore
from PyUtils.MetaReaderPeeker import convert_itemList
@@ -545,7 +544,7 @@ if not globalflags.InputFormat.is_bytestream() and not recAlgs.doTrigger:
if not cfgKeyStore.isInInputFile("HLT::HLTResult", "HLTResult_EF") \
and not cfgKeyStore.isInInputFile("xAOD::TrigNavigation", "TrigNavigation") \
and not cfgKeyStore.isInInputFile("xAOD::TrigCompositeContainer", getRun3NavigationContainerFromInput(ConfigFlags) ):
- logRecExCommon_topOptions.info('Disabled rec.doTrigger because recAlgs.doTrigger=False and there is no Trigger content in the input file')
+ logRecExCommon_topOptions.info('Disabled rec.doTrigger because there is no Trigger content in the input file')
rec.doTrigger = False
except Exception:
logRecExCommon_topOptions.warning('Failed to check input file for Trigger content, leaving rec.doTrigger value unchanged (%s)', rec.doTrigger)
@@ -556,14 +555,14 @@ if rec.doTrigger:
include("TriggerJobOpts/BStoESD_Tier0_HLTConfig_jobOptions.py")
except Exception:
treatException("Could not import TriggerJobOpts/BStoESD_Tier0_HLTConfig_jobOptions.py . Switching trigger off !" )
- rec.doTrigger = recAlgs.doTrigger = False
+ rec.doTrigger = False
else:
try:
from TriggerJobOpts.T0TriggerGetter import T0TriggerGetter
triggerGetter = T0TriggerGetter()
except Exception:
treatException("Could not import TriggerJobOpts.T0TriggerGetter . Switched off !" )
- rec.doTrigger = recAlgs.doTrigger = False
+ rec.doTrigger = False
# ESDtoAOD Run-3 Trigger Outputs: Don't run any trigger - only pass the HLT contents from ESD to AOD
if rec.readESD() and rec.doAOD():
@@ -658,7 +657,7 @@ if rec.doHeavyIon():
if rec.doHIP ():
protectedInclude ("HIRecExample/HIPRec_jobOptions.py")
-if rec.doWriteBS() and not recAlgs.doTrigger():
+if rec.doWriteBS():
include( "ByteStreamCnvSvc/RDP_ByteStream_jobOptions.py" )
pass
@@ -1464,11 +1463,6 @@ if rec.doWriteBS():
ServiceMgr.ByteStreamCnvSvc.IsSimulation = True
- # BS content definition
- # commented out since it was causing duplicates
- #if hasattr( topSequence, "StreamBS") and recAlgs.doTrigger() :
- # StreamBSFileOutput.ItemList += topSequence.StreamBS.ItemList
-
# LVL1
from TrigT1ResultByteStream.TrigT1ResultByteStreamConfig import L1ByteStreamEncodersRecExSetup
L1ByteStreamEncodersRecExSetup() # Configure BS encoder for RoIBResult
diff --git a/Reconstruction/RecExample/RecExCommon/share/myTopOptions.py b/Reconstruction/RecExample/RecExCommon/share/myTopOptions.py
index 037c315da236..cc7f6e1f303e 100755
--- a/Reconstruction/RecExample/RecExCommon/share/myTopOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/myTopOptions.py
@@ -34,7 +34,7 @@ ConfigFlags.Input.Files = athenaCommonFlags.FilesInput()
# rec.doCalo=False
# rec.doMuon=False
#rec.doEgamma=False
-#rec.doTrigger = False; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched of)
+#rec.doTrigger = False # disable trigger (maybe necessary if detectors switched of)
#rec.doMuon=False
#rec.doMuonCombined=False
#rec.doWriteAOD=False
diff --git a/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py b/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
index 3d9111ce9e2e..ce39b071cf73 100755
--- a/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
+++ b/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
@@ -352,8 +352,6 @@ else:
# hack handle name mismatch
if i=="donewTracking":
inew="doNewTracking"
- # hack do not map doTrigger to rec.doTrigger but to recAlgs.doTrigger
- # FIXME why not the contrary
if jobproperties.Rec.__dict__.keys().__contains__(i) :
if i in varInit:
i_value = eval ('%s' % (i))
@@ -594,7 +592,7 @@ try:
if rec.doTrigger():
from TriggerJobOpts.TriggerFlags import TriggerFlags, sync_Trigger2Reco
except Exception:
- logRecExCommon_flags.info("Could not load TriggerFlags. OK only if AtlasReconstruction. Switching of rec.doTrigger")
+ logRecExCommon_flags.info("Could not load TriggerFlags. Switching of rec.doTrigger")
rec.doTrigger=False
@@ -629,8 +627,6 @@ if rec.Commissioning():
# ----------------------------------------------------------------------
from RecExConfig.RecAlgsFlags import recAlgs
- #recAlgs.doTrigger
-
#
# hack...
#
@@ -943,23 +939,12 @@ if not rec.doTau:
pass
-# move up, need to know earlier if trigger is on
-#try:
-# if rec.doTrigger():
-# from TriggerJobOpts.TriggerFlags import TriggerFlags, sync_Trigger2Reco
-#except Exception:
-# logRecExCommon_flags.info("Could not load TriggerFlags. OK only if AtlasReconstruction. Switching of rec.doTrigger")
-# rec.doTrigger=False
-
-
if not rec.doTrigger:
#DR should use finer grain
#rec.doDPD=False
rec.doTagRawSummary=False
rec.doBeamBackgroundFiller=False
- #FIXME a separate container to be used eventually
- recAlgs.doTrigger=False
if _AODFlagsAvailable:
AODFlags.Trigger=False # obsolete
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags.py
index 030109d198ef..723845b6aea5 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags.py
@@ -59,7 +59,6 @@ rec.doForwardDet.set_Value_and_Lock(doLucid or doZdc or doAlfa)
rec.doTrigger.set_Value_and_Lock(doTrigger)
from RecExConfig.RecAlgsFlags import recAlgs
-#recAlgs.doTrigger.set_Value_and_Lock(doTrigger)
rec.doHeavyIon.set_Value_and_Lock(doHIRec)
rec.doHIP.set_Value_and_Lock(doHIPRec)
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_HItest.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_HItest.py
index 4dfe4ee2b560..35f1235c676a 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_HItest.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_HItest.py
@@ -56,7 +56,6 @@ rec.doForwardDet.set_Value_and_Lock(doLucid or doZdc or doAlfa)
rec.doTrigger.set_Value_and_Lock(doTrigger)
from RecExConfig.RecAlgsFlags import recAlgs
-#recAlgs.doTrigger.set_Value_and_Lock(doTrigger)
rec.doHeavyIon.set_Value_and_Lock(doHIRec)
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_RunHI.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_RunHI.py
index 65dc52f2e13b..9b2325cdc3bb 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_RunHI.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_RunHI.py
@@ -56,7 +56,6 @@ rec.doForwardDet.set_Value_and_Lock(doLucid or doZdc or doAlfa)
rec.doTrigger.set_Value_and_Lock(doTrigger)
from RecExConfig.RecAlgsFlags import recAlgs
-#recAlgs.doTrigger.set_Value_and_Lock(doTrigger)
rec.doHeavyIon.set_Value_and_Lock(doHIRec)
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py
index 4af6590b2cb2..531d8cd8c203 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py
@@ -83,7 +83,6 @@ if hasattr(runArgs,"inputRDO_TRIGFile"):
athenaCommonFlags.PoolRDOInput.set_Value_and_Lock( runArgs.inputRDO_TRIGFile)
ConfigFlags.Input.Files = athenaCommonFlags.PoolRDOInput()
rec.doTrigger.set_Value_and_Lock(False)
- recAlgs.doTrigger.set_Value_and_Lock(False)
from TrigHLTMonitoring.HLTMonFlags import HLTMonFlags
HLTMonFlags.doMonTier0 = False
from AthenaMonitoring.DQMonFlags import DQMonFlags
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py
index 5c7d28eb124b..20dbf64b7bbc 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py
@@ -78,7 +78,6 @@ if hasattr(runArgs,"inputRDO_TRIGFile"):
athenaCommonFlags.PoolRDOInput.set_Value_and_Lock( runArgs.inputRDO_TRIGFile)
ConfigFlags.Input.Files = athenaCommonFlags.PoolRDOInput()
rec.doTrigger.set_Value_and_Lock(False)
- recAlgs.doTrigger.set_Value_and_Lock(False)
from TrigHLTMonitoring.HLTMonFlags import HLTMonFlags
HLTMonFlags.doMonTier0 = False
from AthenaMonitoring.DQMonFlags import DQMonFlags
diff --git a/Reconstruction/egamma/egammaValidation/python/egammaOnlyPreExec.py b/Reconstruction/egamma/egammaValidation/python/egammaOnlyPreExec.py
index fe0cc9133957..4708feae31f3 100644
--- a/Reconstruction/egamma/egammaValidation/python/egammaOnlyPreExec.py
+++ b/Reconstruction/egamma/egammaValidation/python/egammaOnlyPreExec.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from RecExConfig.RecFlags import rec
from RecExConfig.RecAlgsFlags import recAlgs
@@ -18,7 +18,6 @@ def setRunEgammaOnlyRecoFlags():
recAlgs.doEFlowJet.set_Value_and_Lock(False)
recAlgs.doMissingET.set_Value_and_Lock(False)
recAlgs.doMissingETSig.set_Value_and_Lock(False)
- recAlgs.doTrigger.set_Value_and_Lock(False)
AODFlags.ThinGeantTruth.set_Value_and_Lock(False)
AODFlags.egammaTrackSlimmer.set_Value_and_Lock(False)
@@ -31,4 +30,3 @@ def setRunEgammaOnlyRecoFlags():
def setRunEgammaOnlyMergeFlags():
rec.doTrigger.set_Value_and_Lock(False)
- recAlgs.doTrigger.set_Value_and_Lock(False)
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_newTracking_PseudoT_fullSim_fullDigi.sh b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_newTracking_PseudoT_fullSim_fullDigi.sh
index f501a81b5119..fc78800535a4 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_newTracking_PseudoT_fullSim_fullDigi.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_newTracking_PseudoT_fullSim_fullDigi.sh
@@ -59,7 +59,7 @@ then
--conditionsTag OFLCOND-RUN12-SDR-31 \
--inputRDOFile ${rdoFile} \
--outputAODFile ${aodFile} \
- --preExec "RAWtoESD:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.doPseudoTracking.set_Value_and_Lock(True);InDetFlags.doNewTracking.set_Value_and_Lock(True);rec.doTrigger.set_Value_and_Lock(False);recAlgs.doTrigger.set_Value_and_Lock(False);InDetFlags.doTrackSegmentsTRT.set_Value_and_Lock(True);" \
+ --preExec "RAWtoESD:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.doPseudoTracking.set_Value_and_Lock(True);InDetFlags.doNewTracking.set_Value_and_Lock(True);rec.doTrigger.set_Value_and_Lock(False);InDetFlags.doTrackSegmentsTRT.set_Value_and_Lock(True);" \
--imf False
rc2=$?
if [ ${rc2} -eq 0 ]
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_noSplit_noPseudoT_fullSim_fullDigi.sh b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_noSplit_noPseudoT_fullSim_fullDigi.sh
index 6c126e309188..02379f40bd92 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_noSplit_noPseudoT_fullSim_fullDigi.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_noSplit_noPseudoT_fullSim_fullDigi.sh
@@ -60,7 +60,7 @@ then
--conditionsTag OFLCOND-RUN12-SDR-31 \
--inputRDOFile ${rdoFile} \
--outputAODFile ${aodFile} \
- --preExec "RAWtoESD:rec.doTrigger.set_Value_and_Lock(False);recAlgs.doTrigger.set_Value_and_Lock(False);" \
+ --preExec "RAWtoESD:rec.doTrigger.set_Value_and_Lock(False)" \
--postExec 'RAWtoESD:from AthenaCommon.ConfigurationShelve import saveToAscii;saveToAscii("RAWtoESD_config.txt")' \
--imf False
rc2=$?
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_noSplit_noPseudoT_stdFullSimDigi.sh b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_noSplit_noPseudoT_stdFullSimDigi.sh
index 2ba96e7feb02..d583ca6cfc2f 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_noSplit_noPseudoT_stdFullSimDigi.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_reco_noSplit_noPseudoT_stdFullSimDigi.sh
@@ -76,7 +76,7 @@ then
--conditionsTag OFLCOND-RUN12-SDR-31 \
--inputRDOFile ${rdoFile} \
--outputAODFile ${aodFile} \
- --preExec "RAWtoESD:rec.doTrigger.set_Value_and_Lock(False);recAlgs.doTrigger.set_Value_and_Lock(False);" \
+ --preExec "RAWtoESD:rec.doTrigger.set_Value_and_Lock(False)" \
--imf False
rc1=$?
if [ ${rc1} -eq 0 ]
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fastSim_fastDigi.sh b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fastSim_fastDigi.sh
index 952ea00db670..96da3a6373d8 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fastSim_fastDigi.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fastSim_fastDigi.sh
@@ -23,7 +23,7 @@ FastChain_tf.py --maxEvents 500 \
--conditionsTag OFLCOND-RUN12-SDR-31 \
--inputRDOFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/FastChainPileup/RecoInputRefs/RDO_pileup_fastsim_fastdigi.pool.root' \
--outputAODFile ${aodFile} \
- --preExec "all:rec.doTrigger.set_Value_and_Lock(False);recAlgs.doTrigger.set_Value_and_Lock(False);InDetFlags.doPixelClusterSplitting.set_Value_and_Lock(False);InDetFlags.doTIDE_Ambi.set_Value_and_Lock(False);" \
+ --preExec "all:rec.doTrigger.set_Value_and_Lock(False);InDetFlags.doPixelClusterSplitting.set_Value_and_Lock(False);InDetFlags.doTIDE_Ambi.set_Value_and_Lock(False);" \
--postExec 'RAWtoESD:from AthenaCommon.ConfigurationShelve import saveToAscii;saveToAscii("RAWtoESD_config.txt");ToolSvc.InDetPixelClusterOnTrackTool.ErrorStrategy=1' \
--imf False
rc2=$?
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fastSim_fullDigi.sh b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fastSim_fullDigi.sh
index fa0233996dfd..00e6992338b2 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fastSim_fullDigi.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fastSim_fullDigi.sh
@@ -23,7 +23,7 @@ FastChain_tf.py --maxEvents 500 \
--conditionsTag OFLCOND-RUN12-SDR-31 \
--inputRDOFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/FastChainPileup/RecoInputRefs/RDO_pileup_fastsim_fulldigi.pool.root' \
--outputAODFile ${aodFile} \
- --preExec "all:rec.doTrigger.set_Value_and_Lock(False);recAlgs.doTrigger.set_Value_and_Lock(False);" \
+ --preExec "all:rec.doTrigger.set_Value_and_Lock(False)" \
--postExec 'RAWtoESD:from AthenaCommon.ConfigurationShelve import saveToAscii;saveToAscii("RAWtoESD_config.txt")' \
--imf False
rc2=$?
diff --git a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fullSim_fullDigi.sh b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fullSim_fullDigi.sh
index 1680484cdb62..f0e3a8bff181 100755
--- a/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fullSim_fullDigi.sh
+++ b/Simulation/FastSimulation/FastChainPileup/test/test_ttFC_recoinp_noSplit_noPseudoT_fullSim_fullDigi.sh
@@ -24,7 +24,7 @@ FastChain_tf.py --maxEvents 500 \
--conditionsTag OFLCOND-RUN12-SDR-31 \
--inputRDOFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/FastChainPileup/RecoInputRefs/RDO_pileup_fullsim_fulldigi.pool.root' \
--outputAODFile ${aodFile} \
- --preExec "all:rec.doTrigger.set_Value_and_Lock(False);recAlgs.doTrigger.set_Value_and_Lock(False);" \
+ --preExec "all:rec.doTrigger.set_Value_and_Lock(False)" \
--postExec 'RAWtoESD:from AthenaCommon.ConfigurationShelve import saveToAscii;saveToAscii("RAWtoESD_config.txt")' \
--imf False
rc2=$?
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingConfProvider.py b/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingConfProvider.py
index 8a9cb7dd43f5..fa8e4d33bf7c 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingConfProvider.py
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingConfProvider.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-# $Id: BunchCrossingConfProvider.py 586922 2014-03-10 14:56:39Z krasznaa $
## @package BunchCrossingConfProvider
#
@@ -10,8 +9,6 @@
#
# @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
#
-# $Revision: 586922 $
-# $Date: 2014-03-10 15:56:39 +0100 (Mon, 10 Mar 2014) $
##
# @short Function creating an instance of Trig::IBunchCrossingConfProvider
@@ -25,8 +22,6 @@
#
# @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
#
-# $Revision: 586922 $
-# $Date: 2014-03-10 15:56:39 +0100 (Mon, 10 Mar 2014) $
def BunchCrossingConfProvider( type = "" ):
# Get ourselves a logger:
@@ -59,9 +54,8 @@ def BunchCrossingConfProvider( type = "" ):
return LHCBunchCrossingTool()
if globalflags.DataSource() == "data":
from RecExConfig.RecFlags import rec
- from RecExConfig.RecAlgsFlags import recAlgs
from TriggerJobOpts.TriggerFlags import TriggerFlags
- if rec.doTrigger() or TriggerFlags.doTriggerConfigOnly() or recAlgs.doTrigger():
+ if rec.doTrigger() or TriggerFlags.doTriggerConfigOnly():
from TrigBunchCrossingTool.BunchCrossingTool import TrigConfBunchCrossingTool
__logger.info( "Selecting TrigConfBunchCrossingTool for this job" )
return TrigConfBunchCrossingTool()
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py b/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py
index 544506f6302b..e4f0294bee8b 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/python/BunchCrossingTool.py
@@ -56,9 +56,8 @@ def BunchCrossingTool( type = "" ):
return LHCBunchCrossingTool()
if globalflags.DataSource() == "data":
from RecExConfig.RecFlags import rec
- from RecExConfig.RecAlgsFlags import recAlgs
from TriggerJobOpts.TriggerFlags import TriggerFlags
- if rec.doTrigger() or TriggerFlags.doTriggerConfigOnly() or recAlgs.doTrigger():
+ if rec.doTrigger() or TriggerFlags.doTriggerConfigOnly():
__logger.info( "Selecting TrigConfBunchCrossingTool for this job" )
return TrigConfBunchCrossingTool()
else:
diff --git a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/share/job_match_test.py b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/share/job_match_test.py
index 4596816cbcba..6d20f2dd4e4b 100644
--- a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/share/job_match_test.py
+++ b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/share/job_match_test.py
@@ -20,7 +20,7 @@ rec.doInDet=False
rec.doCalo=False
rec.doMuon=False
rec.doEgamma=False
-rec.doTrigger = True; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched off)
+rec.doTrigger = True
rec.doMuon=False
rec.doMuonCombined=False
rec.doWriteAOD=False
diff --git a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/share/testTrigEgammaMatchingTool.py b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/share/testTrigEgammaMatchingTool.py
index 92610b73ddcd..68defdc661b1 100755
--- a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/share/testTrigEgammaMatchingTool.py
+++ b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/share/testTrigEgammaMatchingTool.py
@@ -37,7 +37,7 @@ rec.doInDet=False
rec.doCalo=False
rec.doMuon=False
rec.doEgamma=False
-rec.doTrigger = True; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched off)
+rec.doTrigger = True
rec.doMuon=False
rec.doMuonCombined=False
rec.doWriteAOD=False
diff --git a/Trigger/TrigAnalysis/TrigMuonMatching/share/TrigMuonMatching_test.py b/Trigger/TrigAnalysis/TrigMuonMatching/share/TrigMuonMatching_test.py
index d4ebacc4140b..9427121fe853 100644
--- a/Trigger/TrigAnalysis/TrigMuonMatching/share/TrigMuonMatching_test.py
+++ b/Trigger/TrigAnalysis/TrigMuonMatching/share/TrigMuonMatching_test.py
@@ -10,7 +10,6 @@ rec.doCBNT=False
from RecExConfig.RecFlags import rec
rec.doTrigger=True
from RecExConfig.RecAlgsFlags import recAlgs
-recAlgs.doTrigger=True
recAlgs.doAtlfast=False
recAlgs.doMonteCarloReact=False
from TriggerJobOpts.TriggerFlags import TriggerFlags
diff --git a/Trigger/TrigAnalysis/TriggerMatchingTool/share/testAthenaMatchingTool.py b/Trigger/TrigAnalysis/TriggerMatchingTool/share/testAthenaMatchingTool.py
index e04ac1e7323a..edb97c54318b 100644
--- a/Trigger/TrigAnalysis/TriggerMatchingTool/share/testAthenaMatchingTool.py
+++ b/Trigger/TrigAnalysis/TriggerMatchingTool/share/testAthenaMatchingTool.py
@@ -16,7 +16,7 @@ rec.doInDet=False
rec.doCalo=False
rec.doMuon=False
rec.doEgamma=False
-rec.doTrigger = True; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched off)
+rec.doTrigger = True
rec.doMuon=False
rec.doMuonCombined=False
rec.doWriteAOD=False
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
index d428e6c61301..9ffb41c3542b 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
@@ -9,7 +9,6 @@ acf.FilesInput = fileList # noqa: F821 - from dir()
ConfigFlags.Input.Files = acf.FilesInput() or acf.PoolAODInput()
rec.doTrigger=False
-recAlgs.doTrigger=False
rec.readAOD=True
rec.doWriteAOD=False
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py
index cea706a5ee10..d6bf57b11247 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py
@@ -10,7 +10,6 @@ acf.FilesInput = fileList # noqa: F821 - from dir()
ConfigFlags.Input.Files = acf.FilesInput() or acf.PoolAODInput()
rec.doTrigger=False
-recAlgs.doTrigger=False
rec.readAOD=True
rec.doWriteAOD=False
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
index c2c8f9a8639f..99a5ed12b2c0 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
@@ -10,7 +10,6 @@ acf.FilesInput = fileList # noqa: F821 - from dir()
ConfigFlags.Input.Files = acf.FilesInput() or acf.PoolAODInput()
rec.doTrigger=False
-recAlgs.doTrigger=False
rec.readAOD=True
rec.doWriteAOD=False
--
GitLab