diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
index 35c9ac9e5b2e3c15e4269f13b577263e384dbbdc..78d2235659d61bff3f46c46b587aff97630f1119 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
@@ -12,65 +12,45 @@ def getHLTPrescaleFolderName():
# L1 Json file name
-def getL1MenuFileName( flags=None ):
- if flags is None:
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- l1MenuFileName = 'L1Menu_'+tf.triggerMenuSetup()+'_'+tf.menuVersion()+'.json'
- else:
- l1MenuFileName = 'L1Menu_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
+def getL1MenuFileName( flags ):
+ l1MenuFileName = 'L1Menu_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
l1MenuFileName = l1MenuFileName.replace(".xml",".json").replace("LVL1config", "L1Menu")
l1MenuFileName = l1MenuFileName.replace("_newJO","")
return l1MenuFileName
# HLT Json file name
-def getHLTMenuFileName( flags=None ):
- if flags is None:
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- hltMenuFileName = 'HLTMenu_'+tf.triggerMenuSetup()+'_'+tf.menuVersion()+'.json'
- else:
- hltMenuFileName = 'HLTMenu_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
+def getHLTMenuFileName( flags ):
+ hltMenuFileName = 'HLTMenu_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
hltMenuFileName = hltMenuFileName.replace(".xml",".json").replace("HLTconfig", "HLTMenu").replace("HLTmenu", "HLTMenu")
hltMenuFileName = hltMenuFileName.replace("_newJO","")
return hltMenuFileName
# L1 Prescales set json file name
-def getL1PrescalesSetFileName( flags=None ):
- if flags is None:
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- l1PrescalesSetFileName = 'L1PrescalesSet_'+tf.triggerMenuSetup()+'_'+tf.menuVersion()+'.json'
- else:
- l1PrescalesSetFileName = 'L1PrescalesSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
+def getL1PrescalesSetFileName( flags ):
+ l1PrescalesSetFileName = 'L1PrescalesSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
return l1PrescalesSetFileName
# HLT Prescales set json file name
-def getHLTPrescalesSetFileName( flags=None ):
- if flags is None:
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- hltPrescalesSetFileName = 'HLTPrescalesSet_'+tf.triggerMenuSetup()+'_'+tf.menuVersion()+'.json'
- else:
- hltPrescalesSetFileName = 'HLTPrescalesSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
+def getHLTPrescalesSetFileName( flags ):
+ hltPrescalesSetFileName = 'HLTPrescalesSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
return hltPrescalesSetFileName
# L1 Bunchgroups set json file name
-def getBunchGroupSetFileName( flags=None ):
- if flags is None:
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- bunchGroupSetFileName = 'BunchGroupSet_'+tf.triggerMenuSetup()+'_'+tf.menuVersion()+'.json'
- else:
- bunchGroupSetFileName = 'BunchGroupSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
+def getBunchGroupSetFileName( flags ):
+ bunchGroupSetFileName = 'BunchGroupSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
return bunchGroupSetFileName
# HLT Job options json file name
-def getHLTJobOptionsFileName( flags=None ):
+def getHLTJobOptionsFileName( ):
return 'HLTJobOptions.json'
# Creates an L1 Prescale file from the menu
# this is a temporary solution, in the final version the L1PrescalesSet file should come from the menu
-def createL1PrescalesFileFromMenu( flags=None ):
+def createL1PrescalesFileFromMenu( flags ):
log = logging.getLogger('TrigConfigSvcCfg')
menuFN = getL1MenuFileName( flags )
with open(menuFN,'r') as fh:
@@ -94,7 +74,7 @@ def createL1PrescalesFileFromMenu( flags=None ):
# Creates an HLT Prescale file from the menu
# this is a temporary solution, in the final version the HLTPrescalesSet file should come from the menu
-def createHLTPrescalesFileFromMenu( flags=None ):
+def createHLTPrescalesFileFromMenu( flags ):
log = logging.getLogger('TrigConfigSvcCfg')
menuFN = getHLTMenuFileName( flags )
with open(menuFN,'r') as fh:
@@ -118,15 +98,10 @@ def createHLTPrescalesFileFromMenu( flags=None ):
log.info("Generated default HLT prescale set %s", outfile.name)
-def getTrigConfigFromFlag( flags=None ):
+def getTrigConfigFromFlag( flags ):
log = logging.getLogger('TrigConfigSvcCfg')
- if flags is None: # old-style TriggerFlags
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- tcflag = tf.triggerConfig() if tf.triggerConfig.statusOn else None
- log.info("Parsing old-style trigger flags 'triggerConfig': %s", tcflag)
- else:
- tcflag = flags.Trigger.triggerConfig
- log.info("Parsing new-style trigger flag 'triggerConfig': %s", tcflag)
+ tcflag = flags.Trigger.triggerConfig
+ log.info("Parsing new-style trigger flag 'triggerConfig': %s", tcflag)
if tcflag is None:
tcflag = "FILE"
source, dbconn, keys = (tcflag+":::").split(":")[:3]
@@ -152,16 +127,12 @@ def getTrigConfigFromFlag( flags=None ):
# L1 menu generation
@memoize
-def generateL1Menu( flags=None ):
+def generateL1Menu( flags ):
log = logging.getLogger('TrigConfigSvcCfg')
- from TriggerJobOpts.TriggerFlags import TriggerFlags
fileName = getL1MenuFileName( flags )
- if flags:
- TriggerFlags.triggerMenuSetup = flags.Trigger.triggerMenuSetup
- menuName = TriggerFlags.triggerMenuSetup() if flags is None else flags.Trigger.triggerMenuSetup
- log.info("Generating L1 menu %s", menuName)
+ log.info("Generating L1 menu %s", flags.Trigger.triggerMenuSetup)
from TriggerMenuMT.L1.L1MenuConfig import L1MenuConfig
- l1cfg = L1MenuConfig( menuName = menuName )
+ l1cfg = L1MenuConfig( menuName = flags.Trigger.triggerMenuSetup)
outfile = l1cfg.writeJSON(outputFile = fileName)
if outfile is not None:
log.info("Wrote L1 menu file %s", outfile)
@@ -170,18 +141,18 @@ def generateL1Menu( flags=None ):
# configuration of L1ConfigSvc
@memoize
-def getL1ConfigSvc( flags = None ):
+def getL1ConfigSvc( flags ):
log = logging.getLogger('TrigConfigSvcCfg')
from AthenaCommon.Logging import log
- from TriggerJobOpts.TriggerFlags import TriggerFlags
# generate menu file
- generatedFile = generateL1Menu( flags=flags )
+ generatedFile = generateL1Menu( flags )
# configure config svc
TrigConf__LVL1ConfigSvc = CompFactory.getComp("TrigConf::LVL1ConfigSvc")
l1ConfigSvc = TrigConf__LVL1ConfigSvc("LVL1ConfigSvc")
l1ConfigSvc.ConfigSource = "XML"
+ from TriggerJobOpts.TriggerFlags import TriggerFlags
l1XMLFile = TriggerFlags.inputLVL1configFile() if flags is None else flags.Trigger.LVL1ConfigFile
# check if file exists in this directory otherwise add the package to aid path resolution
# also a '/' in the file name indicates that no package needs to be added
@@ -208,7 +179,7 @@ def getL1ConfigSvc( flags = None ):
# configuration of HLTConfigSvc
@memoize
-def getHLTConfigSvc( flags = None ):
+def getHLTConfigSvc( flags ):
log = logging.getLogger('TrigConfigSvcCfg')
TrigConf__HLTConfigSvc = CompFactory.getComp("TrigConf::HLTConfigSvc")
hltConfigSvc = TrigConf__HLTConfigSvc("HLTConfigSvc")
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 9c3191559b6606cd7d86ec02eda3b684f0b84633..1db7fb90d4bc2413e104b69db00fdd8f3b76bf44 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -431,7 +431,7 @@ elif globalflags.InputFormat.is_bytestream() and not ConfigFlags.Trigger.Online.
# ---------------------------------------------------------------
# Trigger config
# ---------------------------------------------------------------
-TriggerFlags.triggerMenuSetup = opt.setMenu
+ConfigFlags.Trigger.triggerMenuSetup = TriggerFlags.triggerMenuSetup = opt.setMenu
TriggerFlags.readLVL1configFromXML = True
TriggerFlags.outputLVL1configFile = None
@@ -506,14 +506,14 @@ svcMgr.MessageSvc.infoLimit=10000
from TrigConfigSvc.TrigConfigSvcCfg import getHLTConfigSvc
-svcMgr += conf2toConfigurable( getHLTConfigSvc() )
+svcMgr += conf2toConfigurable( getHLTConfigSvc(ConfigFlags) )
if not opt.createHLTMenuExternally:
# the generation of the prescale set file from the menu (with all prescales set to 1)
# is not really needed. If no file is provided all chains are either enabled or disabled,
# depending on the property L1Decoder.PrescalingTool.KeepUnknownChains being True or False
from TrigConfigSvc.TrigConfigSvcCfg import createHLTPrescalesFileFromMenu
- createHLTPrescalesFileFromMenu()
+ createHLTPrescalesFileFromMenu(ConfigFlags)