Commit 80ae7800 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

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.
parent c699a8ef
# 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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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)
#--------------------------------------------------------------
......
......@@ -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)
......
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)
......
# 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
......
# 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
......
# 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
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment