Skip to content
Snippets Groups Projects
Commit c5bb5e24 authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Merge branch 'tf_configonly' into 'master'

TriggerJobOpts: delete unused doTriggerConfigOnly flag

See merge request !47652
parents a7b56918 5204378e
No related branches found
No related tags found
5 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!51674Fixing hotSpotInHIST for Run3 HIST,!50012RecExConfig: Adjust log message levels from GetRunNumber and GetLBNumber,!47652TriggerJobOpts: delete unused doTriggerConfigOnly flag
Showing
with 11 additions and 151 deletions
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# ------------------------------------------------------------
# DerivationFrameworkMaster.py
......@@ -16,11 +16,9 @@ from AthenaCommon.AlgSequence import AlgSequence
from JetRec.JetRecFlags import jetFlags
from AthenaCommon.GlobalFlags import globalflags
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
# AODFix object, for checking whether it ran or not
import os
if "AthAnalysisBase" not in os.environ.get("CMTEXTRATAGS",""):
from AODFix.AODFix import * # noqa: F401, F403
# AODFix object, for checking whether it ran or not
from AODFix.AODFix import * # noqa: F401, F403
# Trap for ROOT6 errors
theApp.CreateSvc += ["AthROOTErrorHandlerSvc"]
......@@ -73,15 +71,6 @@ if not hasattr(svcMgr, 'DecisionSvc'):
svcMgr += CfgMgr.DecisionSvc()
svcMgr.DecisionSvc.CalcStats = True
# Trigger decision tool
# SUPERFLUOUS
#if rec.doTrigger() or TriggerFlags.doTriggerConfigOnly():
# from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
# cfg = TriggerConfigGetter('ReadPool')
# from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
# tdt = Trig__TrigDecisionTool("TrigDecisionTool")
# ToolSvc += tdt
# Centrally setting flags
jetFlags.useTracks = True
# MC-related flags
......
......@@ -154,17 +154,7 @@ doAllReco = False
#doCommissioning = False
# Found that this must be true for REB runs but not for SFI
if (partitionName == "L1CaloStandalone"):
doTrigger = False #True #Default: False
else:
doTrigger = False
#doTrigger = True
#doTriggerConfigOnly=True
#TriggerModernConfig=True
#from TriggerJobOpts.TriggerFlags import TriggerFlags
#TriggerFlags.doTriggerConfigOnly=True
doTrigger = False
################
......@@ -438,13 +428,6 @@ if (partitionName.find("L1CaloStandalone") >= 0) or (partitionName.find("ATLAS")
#conddb.addFolder("", "<dbConnection>sqlite://;schema=/det/l1calo/calib/tdaq-05/calib.sqlite;dbname=L1CALO</dbConnection>/TRIGGER/Receivers/Factors/CalibGains<tag>HEAD</tag>")
#from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
#cfg = TriggerConfigGetter()
#if rec.doLArg and rec.doTile:
# from AthenaCommon.AlgSequence import AlgSequence
# TTjob = AlgSequence()
# TTjob.TriggerTowerMaker.LVL1ConfigSvc = "Trig::TrigConfigSvc/TrigConfigSvc"
#M6
#rec.doTau=False;
#rec.doEgamma=False;
......
......@@ -153,17 +153,7 @@ doAllReco = False
#doCommissioning = False
# Found that this must be true for REB runs but not for SFI
if (partitionName == "L1CaloStandalone"):
doTrigger = False #True #Default: False
else:
doTrigger = False
#doTrigger = True
#doTriggerConfigOnly=True
#TriggerModernConfig=True
#from TriggerJobOpts.TriggerFlags import TriggerFlags
#TriggerFlags.doTriggerConfigOnly=True
doTrigger = False
################
......@@ -428,13 +418,6 @@ if (partitionName.find("L1CaloStandalone") >= 0) or (partitionName.find("ATLAS")
#conddb.addFolder("", "<dbConnection>sqlite://;schema=/det/l1calo/calib/tdaq-05/calib.sqlite;dbname=L1CALO</dbConnection>/TRIGGER/Receivers/Factors/CalibGains<tag>HEAD</tag>")
#from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
#cfg = TriggerConfigGetter()
#if rec.doLArg and rec.doTile:
# from AthenaCommon.AlgSequence import AlgSequence
# TTjob = AlgSequence()
# TTjob.TriggerTowerMaker.LVL1ConfigSvc = "Trig::TrigConfigSvc/TrigConfigSvc"
#M6
#rec.doTau=False;
#rec.doEgamma=False;
......
......@@ -157,18 +157,7 @@ doAllReco = False
#doCommissioning = False
# Found that this must be true for REB runs but not for SFI
if (partitionName == "L1CaloStandalone"):
doTrigger = False #True #Default: False
else:
doTrigger = False
#doTrigger = True
#doTriggerConfigOnly=True
#TriggerModernConfig=True
#from TriggerJobOpts.TriggerFlags import TriggerFlags
#TriggerFlags.doTriggerConfigOnly=True
doTrigger = False
################
## -- flags set in: RecExOnline_monitoring.py (from RecExOnline_jobOptions.py)
......@@ -441,13 +430,6 @@ if (partitionName.find("L1CaloStandalone") >= 0) or (partitionName.find("ATLAS")
#conddb.addFolder("", "<dbConnection>sqlite://;schema=/det/l1calo/calib/tdaq-05/calib.sqlite;dbname=L1CALO</dbConnection>/TRIGGER/Receivers/Factors/CalibGains<tag>HEAD</tag>")
#from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
#cfg = TriggerConfigGetter()
#if rec.doLArg and rec.doTile:
# from AthenaCommon.AlgSequence import AlgSequence
# TTjob = AlgSequence()
# TTjob.TriggerTowerMaker.LVL1ConfigSvc = "Trig::TrigConfigSvc/TrigConfigSvc"
#M6
#rec.doTau=False;
#rec.doEgamma=False;
......
......@@ -54,8 +54,7 @@ def BunchCrossingConfProvider( type = "" ):
return LHCBunchCrossingTool()
if globalflags.DataSource() == "data":
from RecExConfig.RecFlags import rec
from TriggerJobOpts.TriggerFlags import TriggerFlags
if rec.doTrigger() or TriggerFlags.doTriggerConfigOnly():
if rec.doTrigger():
from TrigBunchCrossingTool.BunchCrossingTool import TrigConfBunchCrossingTool
__logger.info( "Selecting TrigConfBunchCrossingTool for this job" )
return TrigConfBunchCrossingTool()
......
......@@ -56,8 +56,7 @@ def BunchCrossingTool( type = "" ):
return LHCBunchCrossingTool()
if globalflags.DataSource() == "data":
from RecExConfig.RecFlags import rec
from TriggerJobOpts.TriggerFlags import TriggerFlags
if rec.doTrigger() or TriggerFlags.doTriggerConfigOnly():
if rec.doTrigger():
__logger.info( "Selecting TrigConfBunchCrossingTool for this job" )
return TrigConfBunchCrossingTool()
else:
......
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigMuonMatching )
......@@ -14,7 +14,3 @@ atlas_add_library( TrigMuonMatchingLib
atlas_add_component( TrigMuonMatching
src/components/*.cxx
LINK_LIBRARIES TrigMuonMatchingLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
if not acf.EvtMax.is_locked():
acf.EvtMax=2000
FNAME= ["/afs/cern.ch/user/k/kokasaha/public/sample/AOD.04274415._000011.pool.root.1"]
acf.FilesInput=FNAME
rec.doCBNT=False
from RecExConfig.RecFlags import rec
rec.doTrigger=True
from RecExConfig.RecAlgsFlags import recAlgs
recAlgs.doAtlfast=False
recAlgs.doMonteCarloReact=False
from TriggerJobOpts.TriggerFlags import TriggerFlags
TriggerFlags.doTriggerConfigOnly=True
rec.doWriteAOD=False
rec.doWriteESD=False
rec.doWriteTAG=False
rec.doAOD=False
rec.doDPD=False
rec.doESD=False
doTAG=False
rec.doTruth=False
rec.doRecoTiming=False
rec.doDetStatus=False
rec.doShowSizeStatistics=False
rec.readTAG=False
rec.readRDO=False
rec.doHist=False
rec.doContainerRemapping=False
rec.doJiveXML=False
rec.doEdmMonitor=False
rec.doDumpPoolInputContent=False
rec.doHeavyIon=False
rec.doHIP=False
rec.doWriteBS=False
rec.doPhysValMonHists=False
rec.doVP1=False
rec.doJiveXML=False
rec.doMuon=False
rec.doCheckDictionary=False
rec.doFileMetaData=False
rec.doCalo=False
rec.doAODCaloCells=False
rec.doEgamma=False
include("RecExCommon/RecExCommon_topOptions.py")
from AthenaCommon.AlgSequence import AlgSequence
theJob = AlgSequence()
from TrigMuonMatching.TrigMuonMatchingConf import Trig__TrigMuonMatching
matchtool = Trig__TrigMuonMatching("MatchingTool");
from AthenaCommon.AppMgr import ToolSvc
ToolSvc += matchtool
from TrigMuonMatching.TrigMuonMatchingConf import Trig__TrigMuonMatching_example
alg = Trig__TrigMuonMatching_example()
alg.MuonMatchTool = matchtool
alg.OutputLevel = DEBUG
theJob += alg
include("TriggerTest/TriggerTestCommon.py")
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaCommon.Logging import logging
......@@ -280,7 +279,7 @@ class HLTTriggerResultGetter(Configured):
if ConfigFlags.Trigger.EDMVersion == 1 or \
ConfigFlags.Trigger.EDMVersion == 2:
if rec.doTrigger() or TriggerFlags.doTriggerConfigOnly():
if rec.doTrigger():
tdt = TrigDecisionGetterRun1or2() # noqa: F841
elif ConfigFlags.Trigger.EDMVersion >= 3:
if ConfigFlags.Trigger.readBS:
......
......@@ -122,9 +122,6 @@ def createTriggerFlags():
# Flag to sense if trigger configuration POOL metadata is available on the job's input
flags.addFlag('Trigger.InputContainsConfigMetadata', lambda prevFlags: __trigConfMeta(prevFlags))
# only enable services for analysis and BS -> ESD processing (we need better name)
flags.addFlag('Trigger.doTriggerConfigOnly', False)
# Enables collection and export of detailed monitoring data of the HLT execution
flags.addFlag('Trigger.CostMonitoring.doCostMonitoring', False)
flags.addFlag('Trigger.CostMonitoring.chain', 'HLT_noalg_CostMonDS_L1All')
......
......@@ -85,8 +85,7 @@ class TriggerConfigGetter(Configured):
"Turning off trigger [rec.doTrigger=False]")
rec.doTrigger = False
# TODO: Review doTriggerConfigOnly
if not (rec.doTrigger() or TriggerFlags.doTriggerConfigOnly()):
if not rec.doTrigger():
log.info("Aborting TriggerConfigGetter as the trigger flags were switched to false")
return True
......
......@@ -21,7 +21,6 @@ def bool_flag_with_default(name, val):
})
default_false_flags = [
"doTriggerConfigOnly", # if True only the configuration services should be set, no algorithm """
"readMenuFromTriggerDb", # define the TriggerDb to be the source of the LVL1 and HLT trigger menu
]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment