Commit 01441826 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

TriggerJobOpts: Fix python warnings and extend flake8 unit test

Extend the flake8 unit test to the entire package and made the code
compliant. Mostly trivial python code fixes.

Deleted NtupleProdFlags.py which seems unused and an almost identical
copy exists in the TrigTier0 package.
parent 70048222
......@@ -22,11 +22,10 @@ atlas_add_test( TriggerMenuFlagsTest
SCRIPT python -m unittest TriggerJobOpts.MenuConfigFlags
POST_EXEC_SCRIPT nopost.sh )
atlas_add_test( TriggerConfigTest
SCRIPT python -m TriggerJobOpts.TriggerConfig
POST_EXEC_SCRIPT nopost.sh )
atlas_add_test( flake8
SCRIPT flake8 --select=F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python/TriggerConfig*.py
SCRIPT flake8 --select=ATL,F,E7,E9,W6 --enable-extension=ATL900,ATL901 ${CMAKE_CURRENT_SOURCE_DIR}/python
POST_EXEC_SCRIPT nopost.sh )
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
""" Combined slices specific flags """
from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer, jobproperties
from TriggerJobOpts.CommonSignatureHelper import CommonSignatureHelper, AllowedList
from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
from AthenaCommon.JobProperties import jobproperties # noqa: F401
from TriggerJobOpts.CommonSignatureHelper import CommonSignatureHelper
__author__ = 'T. Bold, B. Demirkoz'
__version__="$Revision: 1.53 $"
__doc__="Flags for combined slices "
......
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
""" Common signature flags """
from AthenaCommon.JobProperties import JobProperty, jobproperties
from AthenaCommon.JobProperties import JobProperty
from AthenaCommon.JobProperties import jobproperties # noqa: F401
__author__ = 'T. Bold'
__version__=""
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
""" helpers for signature flags manipulations """
class CommonSignatureHelper:
class CommonSignatureHelper(object):
def setAll(self):
#self.setL2()
#self.setEF()
......@@ -112,7 +112,7 @@ class CommonSignatureHelper:
self.signatures.set_Value(new)
class Bag:
class Bag(object):
def __init__(self,l):
self.allowedValues = l
......@@ -128,13 +128,14 @@ class Bag:
def __eq__(self, arg):
if type(arg)==list or type(arg)==tuple or type(arg)==set:
notContained = [a for a in arg if not a in self]
notContained = [a for a in arg if a not in self]
if len(notContained)==0: return True
if len(notContained)==0:
return True
from AthenaCommon.Logging import logging
log = logging.getLogger( 'AllowedList' )
log.error("the element %s is not in the list of allowed values: %s" % (notContained, self) )
log.error("the element %s is not in the list of allowed values: %s", notContained, self)
return False
return True
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaCommon.Logging import logging # loads logger
from PerfMonComps.PerfMonFlags import jobproperties
from AthenaCommon.Include import include
from AthenaCommon.GlobalFlags import GlobalFlags
from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
# serializer replacing usuall online (this needs to be moved to TrigNavigation in DEV) ???
from TrigSerializeResult.TrigSerializeResultConf import TrigTSerializer
from AthenaCommon.AppMgr import ServiceMgr, ToolSvc, theApp
from AthenaCommon.Include import include
from RecExConfig.Configured import Configured
from AthenaCommon.Constants import VERBOSE, DEBUG, INFO, ERROR
def getHLTOutputLevel():
from AthenaCommon.Constants import DEBUG
level=DEBUG
if globals().has_key('HLTOutputLevel'):
if 'HLTOutputLevel' in globals():
level= globals()['HLTOutputLevel']
return level
def makeKeysList(inputDict):
tmpList={}
for typename,v in inputDict.iteritems():
if type(v) is type({}):
if isinstance(v, dict):
stored = typename
if 'collection' in v.keys():
stored = v['collection']
......@@ -62,7 +55,7 @@ def monitoringTools(steering):
def assign_prop_value(a):
try:
a.LBNHistoryDepth = LBNdepth
except:
except Exception:
return False
return True
......@@ -88,7 +81,7 @@ def monitoringTools(steering):
alg.doTiming=True
if "Log" in TriggerFlags.enableMonitoring():
alg.OutputLevel=getHLTOutputLevel()
alg.OutputLevel=getHLTOutputLevel() # noqa: ATL900
# prune steering monitoring tools
......@@ -170,7 +163,6 @@ class HLTSimulationGetter(Configured):
from TrigSteering.TrigSteeringConfig import TrigSteer_HLT, ReruningTrigSteer_HLT
if TriggerFlags.doFEX():
from RecExConfig.RecFlags import rec
# schedule the conversion of the L1Calo ROIB data to topo simulation input
......@@ -197,7 +189,6 @@ class HLTSimulationGetter(Configured):
# TrigSteer_HLT.doL1TopoSimulation = TriggerFlags.doL1Topo() # this later needs to be extented to also run when we take data with L1Topo
TrigSteer_HLT.doL1TopoSimulation = True # always needs to run if the HLT is simulated
if hasattr(TrigSteer_HLT.LvlTopoConverter, 'MuonInputProvider'):
print "TrigSteer_HLT.LvlTopoConverter has attribute MuonInputProvider"
try: # this is temporary until TrigT1Muctpi-00-06-29 is in the release
from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiTool
......@@ -277,7 +268,7 @@ class HLTSimulationGetter(Configured):
TrigSerToolTP.ActiveClasses = getHLTBSTypeList()
from TriggerJobOpts.HLTTriggerResultGetter import HLTTriggerResultGetter
result = HLTTriggerResultGetter()
result = HLTTriggerResultGetter() # noqa: F841
return True
......@@ -285,7 +276,6 @@ class HLTSimulationGetter(Configured):
log = logging.getLogger("HLTTriggergetter.py")
log.info("postConfigure: update steering configuration from the menu")
from TriggerMenu.menu.GenerateMenu import GenerateMenu
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
if not hasattr( topSequence, 'TrigSteer_HLT' ):
......
......@@ -2,17 +2,11 @@
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaCommon.Logging import logging
from AthenaCommon.Include import include
from AthenaCommon.GlobalFlags import globalflags
from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
from AthenaCommon.AppMgr import ServiceMgr, ToolSvc, theApp
from AthenaCommon.Include import include
from AthenaCommon.AppMgr import ServiceMgr
from RecExConfig.Configured import Configured
from AthenaCommon.Constants import VERBOSE, DEBUG, INFO, ERROR
from TriggerJobOpts.TriggerFlags import TriggerFlags
from RecExConfig.RecAlgsFlags import recAlgs
from RecExConfig.RecFlags import rec
......@@ -27,9 +21,7 @@ def EDMDecodingVersion():
TriggerFlags.EDMDecodingVersion = 2
# run the AutoConfiguration
from RecExConfig.AutoConfiguration import ConfigureInputType
#ConfigureInputType()
from RecExConfig.InputFilePeeker import inputFileSummary
from RecExConfig.InputFilePeeker import inputFileSummary # noqa: F401
if globalflags.InputFormat.is_bytestream():
# BYTESTREAM: decide Run1/Run2 based on Run number
......@@ -45,8 +37,6 @@ def EDMDecodingVersion():
else:
#Pool files
from RecExConfig.ObjKeyStore import cfgKeyStore
ItemDic=inputFileSummary.get("eventdata_itemsDic")
ItemList=inputFileSummary.get('eventdata_itemsList')
TriggerFlags.doMergedHLTResult = True
if cfgKeyStore.isInInputFile( "HLTResult", "HLTResult_EF" ):
......@@ -58,7 +48,7 @@ def EDMDecodingVersion():
elif cfgKeyStore.isInInputFile( "xAOD::TrigCompositeContainer", "HLTSummary"):
TriggerFlags.EDMDecodingVersion = 3
else:
log.warning("Cannot recognise HLT EDM format, TriggerFlags.EDMDecodingVersion=%d" % TriggerFlags.EDMDecodingVersion())
log.warning("Cannot recognise HLT EDM format, TriggerFlags.EDMDecodingVersion=%d", TriggerFlags.EDMDecodingVersion())
pass
pass
......@@ -91,7 +81,7 @@ def EDMDecodingVersion():
# ESD/AOD files:
log.info("EDMDecoding set to %s"%TriggerFlags.EDMDecodingVersion )
log.info("EDMDecoding set to %s", TriggerFlags.EDMDecodingVersion )
return True
......@@ -99,8 +89,7 @@ def EDMDecodingVersion():
class xAODConversionGetter(Configured):
def configure(self):
log = logging.getLogger('xAODConversionGetter.py')
from AthenaCommon.AlgSequence import AlgSequence
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
#schedule xAOD conversions here
......@@ -110,8 +99,8 @@ class xAODConversionGetter(Configured):
from TrigNavigation.TrigNavigationConfig import HLTNavigationOffline
xaodconverter.Navigation = HLTNavigationOffline()
from TrigEDMConfig.TriggerEDM import getPreregistrationList,getL2PreregistrationList,getEFPreregistrationList
from TrigEDMConfig.TriggerEDM import getEFRun1BSList,getEFRun2EquivalentList,getL2Run1BSList,getL2Run2EquivalentList#,getHLTPreregistrationList
from TrigEDMConfig.TriggerEDM import getPreregistrationList
from TrigEDMConfig.TriggerEDM import getEFRun1BSList,getEFRun2EquivalentList,getL2Run1BSList,getL2Run2EquivalentList
xaodconverter.Navigation.ClassesToPreregister = getPreregistrationList(TriggerFlags.EDMDecodingVersion())
## if TriggerFlags.EDMDecodingVersion() == 2:
## # if TriggerFlags.doMergedHLTResult():
......@@ -147,12 +136,11 @@ class ByteStreamUnpackGetter(Configured):
topSequence = AlgSequence()
#if TriggerFlags.readBS():
log.info( "TriggerFlags.dataTakingConditions: %s" % TriggerFlags.dataTakingConditions() )
log.info( "TriggerFlags.dataTakingConditions: %s", TriggerFlags.dataTakingConditions() )
# in MC this is always FullTrigger
hasHLT = TriggerFlags.dataTakingConditions()=='HltOnly' or TriggerFlags.dataTakingConditions()=='FullTrigger'
if hasHLT:
from AthenaCommon.AppMgr import ServiceMgr
# Decide based on the run number whether to assume a merged, or a
# split HLT:
if not TriggerFlags.doMergedHLTResult():
......@@ -253,7 +241,7 @@ class TrigDecisionGetter(Configured):
log.info("Will write TrigDecision object to storegate")
from TrigDecisionMaker.TrigDecisionMakerConfig import WriteTrigDecision
trigDecWriter = WriteTrigDecision()
trigDecWriter = WriteTrigDecision() # noqa: F841
# from TrigDecisionMaker.TrigDecisionMakerConfig import WritexAODTrigDecision
# trigDecWriter = WritexAODTrigDecision()
......@@ -291,13 +279,13 @@ class HLTTriggerResultGetter(Configured):
if rec.doESD():
from RecExConfig.InputFilePeeker import inputFileSummary
if inputFileSummary.has_key('bs_metadata') and inputFileSummary['bs_metadata'].has_key('Stream'):
if 'bs_metadata' in inputFileSummary and 'Stream' in inputFileSummary['bs_metadata']:
stream=inputFileSummary['bs_metadata']['Stream']
log.debug("the stream found in 'bs_metadata' is "+stream)
if "express" in stream:
from TrigEDMConfig.TriggerEDM import getTypeAndKey,EDMDetails
type,key=getTypeAndKey("TrigOperationalInfo#HLT_EXPRESS_OPI_HLT")
if EDMDetails[type].has_key('collection'):
if 'collection'in EDMDetails[type]:
colltype = EDMDetails[type]['collection']
log.info("Adding HLT_EXPRESS_OPI_HLT to ESD for stream "+stream)
from RecExConfig.ObjKeyStore import objKeyStore
......@@ -321,9 +309,9 @@ class HLTTriggerResultGetter(Configured):
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
log.info("BS unpacking (TF.readBS): %d" % TriggerFlags.readBS() )
log.info("BS unpacking (TF.readBS): %d", TriggerFlags.readBS() )
if TriggerFlags.readBS():
bs = ByteStreamUnpackGetter()
bs = ByteStreamUnpackGetter() # noqa: F841
xAODContainers = {}
# if not recAlgs.doTrigger(): #only convert when running on old data
......@@ -332,7 +320,7 @@ class HLTTriggerResultGetter(Configured):
xAODContainers = xaodcnvrt.xaodlist
if recAlgs.doTrigger() or TriggerFlags.doTriggerConfigOnly():
tdt = TrigDecisionGetter()
tdt = TrigDecisionGetter() # noqa: F841
# TrigJetRec additions
if rec.doWriteESD():
......@@ -392,7 +380,7 @@ class HLTTriggerResultGetter(Configured):
else:
_TriggerESDList.update( getTriggerEDMList(TriggerFlags.ESDEDMSet(), TriggerFlags.EDMDecodingVersion()) )
log.info("ESD content set according to the ESDEDMSet flag: %s and EDM version %d" % (TriggerFlags.ESDEDMSet() ,TriggerFlags.EDMDecodingVersion()) )
log.info("ESD content set according to the ESDEDMSet flag: %s and EDM version %d", TriggerFlags.ESDEDMSet() ,TriggerFlags.EDMDecodingVersion())
# AOD objects choice
_TriggerAODList = {}
......@@ -400,7 +388,7 @@ class HLTTriggerResultGetter(Configured):
#from TrigEDMConfig.TriggerEDM import getAODList
_TriggerAODList.update( getTriggerEDMList(TriggerFlags.AODEDMSet(), TriggerFlags.EDMDecodingVersion()) )
log.info("AOD content set according to the AODEDMSet flag: %s and EDM version %d" % (TriggerFlags.AODEDMSet(),TriggerFlags.EDMDecodingVersion()) )
log.info("AOD content set according to the AODEDMSet flag: %s and EDM version %d", TriggerFlags.AODEDMSet(),TriggerFlags.EDMDecodingVersion())
log.debug("ESD EDM list: %s", _TriggerESDList)
log.debug("AOD EDM list: %s", _TriggerAODList)
......@@ -420,7 +408,7 @@ class HLTTriggerResultGetter(Configured):
def _addSlimming(stream, thinningSvc, edm):
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
from TrigNavTools.TrigNavToolsConf import HLT__StreamTrigNavSlimming, HLT__TrigNavigationSlimming
from TrigNavTools.TrigNavToolsConf import HLT__TrigNavigationSlimming
from TrigNavTools.TrigNavToolsConfig import navigationSlimming
edmlist = list(y.split('-')[0] for x in edm.values() for y in x) #flatten names
......@@ -431,17 +419,16 @@ class HLTTriggerResultGetter(Configured):
tHLT = navigationSlimming({'name':'HLTNav_%s'%stream, 'mode':'cleanup',
'ThinningSvc':thinningSvc, 'result':'HLTResult_HLT',
'features':edmlist})
#tHLT.SlimmingTool.OutputLevel=DEBUG
tHLT.ActInPlace=True
slimmerHLT.ThinningTool = tHLT
print slimmerHLT.ThinningTool
topSequence += slimmerHLT
log.info("Configured slimming of HLT")
print(slimmerHLT.ThinningTool) # noqa: ATL901
del edmlist
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaServices.Configurables import ThinningSvc, createThinningSvc
from AthenaServices.Configurables import ThinningSvc
if TriggerFlags.doNavigationSlimming() and rec.readRDO() and rec.doWriteAOD():
if not hasattr(svcMgr, 'ThinningSvc'): # if the default is there it is configured for AODs
......
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
""" Jet slice specific flags """
from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer, jobproperties
from TriggerJobOpts.CommonSignatureHelper import CommonSignatureHelper, AllowedList
from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
from AthenaCommon.JobProperties import jobproperties # noqa: F401
from TriggerJobOpts.CommonSignatureHelper import CommonSignatureHelper
__author__ = 'T. Bold'
__version__="$Revision: 1.31 $"
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# -------------------------------------------------------------
# L1 Getter of the result
# -------------------------------------------------------------
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaCommon.GlobalFlags import jobproperties
from CaloRec.CaloCellFlags import jobproperties
from AthenaCommon.DetFlags import DetFlags
from AthenaCommon.Constants import *
from AthenaCommon.Logging import logging # loads logger
from AthenaCommon.Include import include # to include old style job options
from AthenaCommon.AppMgr import theApp
......@@ -23,8 +18,6 @@ class Lvl1ResultBuilderGetter(Configured):
#_output = {"CTP_Decision":"CTP_Decision", "LVL1_ROI":"LVL1_ROI"}
def configure(self):
log = logging.getLogger( "LVL1ResultBuilderGetter.py" )
# from AthenaServices.AthenaServicesConf import AthenaOutputStream
# from AthenaCommon.AppMgr import ServiceMgr
# from AthenaCommon.AlgSequence import AlgSequence
......
......@@ -18,8 +18,7 @@ def Lvl1SimulationSequence( flags = None ):
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaCommon.AlgSequence import AthSequencer
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaCommon.Constants import DEBUG
TriggerFlags.readLVL1configFromXML = True
TriggerFlags.outputLVL1configFile = None
from TrigConfigSvc.TrigConfigSvcConfig import LVL1ConfigSvc, findFileInXMLPATH
......@@ -35,7 +34,6 @@ def Lvl1SimulationSequence( flags = None ):
from TrigT1CaloSim.TrigT1CaloSimRun2Config import Run2TriggerTowerMaker
caloTowerMaker = Run2TriggerTowerMaker("Run2TriggerTowerMaker25ns")
caloTowerMaker.ExtraInputs = ["LArTTL1Container#LArTTL1EM", "LArTTL1Container#LArTTL1HAD", "TileTTL1Container#TileTTL1Cnt" ]
caloTowerMaker.OutputLevel=DEBUG
caloTowerMaker.ZeroSuppress = True
caloTowerMaker.CellType = 3
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# -------------------------------------------------------------
# L1 configuration
# -------------------------------------------------------------
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaCommon.GlobalFlags import jobproperties
from CaloRec.CaloCellFlags import jobproperties
from AthenaCommon.DetFlags import DetFlags
from AthenaCommon.Constants import *
from AthenaCommon.Constants import WARNING
from AthenaCommon.Logging import logging # loads logger
from AthenaCommon.Include import include # to include old style job options
from AthenaCommon.AppMgr import theApp
from RecExConfig.Configured import Configured
from RecExConfig.ObjKeyStore import objKeyStore
def getLvl1OutputLevel():
......@@ -53,7 +50,6 @@ class Lvl1SimulationGetter (Configured):
def configure(self):
log = logging.getLogger( "Lvl1SimulationGetter" )
from AthenaServices.AthenaServicesConf import AthenaOutputStream
from AthenaCommon.AppMgr import ServiceMgr
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
......@@ -61,6 +57,7 @@ class Lvl1SimulationGetter (Configured):
if (not TriggerFlags.fakeLVL1()) and TriggerFlags.doLVL1():
if TriggerFlags.doCalo():
from CaloRec.CaloCellFlags import jobproperties
if TriggerFlags.useCaloTTL() and not jobproperties.CaloCellFlags.doFastCaloSim():
import re
if re.search("pp_v[5-9]|HI_v[3-9]|LS1_v[1-9]|DC14", TriggerFlags.triggerMenuSetup() ):
......@@ -86,10 +83,10 @@ class Lvl1SimulationGetter (Configured):
# schedule simulation
if TriggerFlags.doMuon() and (not DetFlags.readRIOPool.LVL1_on() ):
include( "MuonByteStreamCnvTest/jobOptions_MuonRDOToDigit.py" )
import TrigT1RPCRecRoiSvc.TrigT1RPCRecRoiConfig
import TrigT1TGCRecRoiSvc.TrigT1TGCRecRoiConfig
import TrigT1RPCsteering.TrigT1RPCsteeringConfig
import TrigT1TGC.TrigT1TGCConfig
import TrigT1RPCRecRoiSvc.TrigT1RPCRecRoiConfig # noqa: F401
import TrigT1TGCRecRoiSvc.TrigT1TGCRecRoiConfig # noqa: F401
import TrigT1RPCsteering.TrigT1RPCsteeringConfig # noqa: F401
import TrigT1TGC.TrigT1TGCConfig # noqa: F401
from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi
topSequence += L1Muctpi()
......@@ -106,7 +103,7 @@ class Lvl1SimulationGetter (Configured):
log.info("adding BCM simulation to the topSequence")
topSequence += alg
else:
log.warning("%s input (%s) missing, not adding to the topSequence" % (alg.getName(), sgKey))
log.warning("%s input (%s) missing, not adding to the topSequence", alg.getName(), sgKey)
TriggerFlags.doBcm.set_Value(False)
if TriggerFlags.doTrt():
......@@ -122,7 +119,7 @@ class Lvl1SimulationGetter (Configured):
log.info("adding TRTfast simulation to the topSequence")
topSequence += alg
else:
log.warning("%s input (%s) missing, not adding to the topSequence" % (alg.getName(), sgKey))
log.warning("%s input (%s) missing, not adding to the topSequence", alg.getName(), sgKey)
TriggerFlags.doTrt.set_Value(False)
if TriggerFlags.doZdc():
......@@ -147,7 +144,7 @@ class Lvl1SimulationGetter (Configured):
log.info("adding Lucid simulation to the topSequence")
topSequence += alg
else:
log.warning("%s input (%s) missing, not adding to the topSequence" % (alg.getName(), sgKey))
log.warning("%s input (%s) missing, not adding to the topSequence", alg.getName(), sgKey)
TriggerFlags.doLucid.set_Value(False)
......@@ -187,7 +184,7 @@ class Lvl1SimulationGetter (Configured):
LVL1MonitoringTools()
#jtb if not TriggerFlags.fakeLVL1():
# LVL1
# LVL1
#jtb theApp.Dlls += [ "TrigT1ResultByteStream" ]
......@@ -221,7 +218,7 @@ class Lvl1SimulationGetter (Configured):
include( "CSC_Digitization/CSC_Digitization_jobOptions.py" )
# TGC Digitization
include( "TGC_Digitization/TGC_Digitization_jobOptions.py" )
include( "MuonByteStreamCnvTest/MuonRdoDigit_jobOptions.py" )
# from TriggerJobOpts.Lvl1ResultBuilderGetter import Lvl1ResultBuilderGetter
......@@ -233,7 +230,8 @@ class Lvl1SimulationGetter (Configured):
# Will be replaced by config. from Lvl1ConfigSvc
if hasattr(ServiceMgr,'RPCcablingSimSvc'):
ServiceMgr.RPCcablingSimSvc.HackFor1031 = True
from AthenaCommon.GlobalFlags import jobproperties
if jobproperties.Global.InputFormat() != 'bytestream':
if TriggerFlags.doCalo() and DetFlags.writeBS.Calo_on():
......@@ -250,7 +248,7 @@ class Lvl1SimulationGetter (Configured):
# from AnalysisTriggerAlgs.AnalysisTriggerAlgsConfig import RoIBResultToAOD
# topSequence += RoIBResultToAOD("RoIBResultToAOD")
# from RecExConfig.ObjKeyStore import objKeyStore
# from TrigEDMConfig.TriggerEDM import getLvl1ESDList
# objKeyStore.addManyTypesStreamESD(getLvl1ESDList())
# from TrigEDMConfig.TriggerEDM import getLvl1AODList
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# -------------------------------------------------------------
# L1 configuration
# -------------------------------------------------------------
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaCommon.GlobalFlags import GlobalFlags
from AthenaCommon.DetFlags import DetFlags
from AthenaCommon.Constants import *
from AthenaCommon.Logging import logging # loads logger
from AthenaCommon.Include import include # to include old style job options
from AthenaCommon.AppMgr import theApp
if (not TriggerFlags.fakeLVL1()) and TriggerFlags.doLVL1():
from TrigT1CTP.TrigT1CTPConfig import CTPSimulation
from TrigT1RoIB.TrigT1RoIBConf import ROIB__RoIBuilder
import TrigT1RPCRecRoiSvc.TrigT1RPCRecRoiConfig
import TrigT1TGCRecRoiSvc.TrigT1TGCRecRoiConfig
import TrigT1RPCsteering.TrigT1RPCsteeringConfig
import TrigT1TGC.TrigT1TGCConfig
import TrigT1RPCRecRoiSvc.TrigT1RPCRecRoiConfig # noqa: F401
import TrigT1TGCRecRoiSvc.TrigT1TGCRecRoiConfig # noqa: F401
import TrigT1RPCsteering.TrigT1RPCsteeringConfig # noqa: F401
import TrigT1TGC.TrigT1TGCConfig # noqa: F401
from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi
from TrigT1MBTS.TrigT1MBTSConf import LVL1__TrigT1MBTS
......@@ -34,7 +30,6 @@ class Lvl1SimulationGetter (Configured):
log = logging.getLogger( "Lvl1TriggerOnlineGetter.py" )
from AthenaServices.AthenaServicesConf import AthenaOutputStream
from AthenaCommon.AppMgr import ServiceMgr
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
......@@ -62,7 +57,6 @@ class Lvl1SimulationGetter (Configured):
log.info("adding l1topo simulation to the topSequence")
from L1TopoSimulation.L1TopoSimulationConfig import L1TopoSimulation
topSequence += L1TopoSimulation()
topSequence.L1TopoSimulation.OutputLevel = DEBUG
try: # this is temporary until TrigT1Muctpi-00-06-29 is in the release
from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiTool
......
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.AthConfigFlags import AthConfigFlags
......@@ -22,7 +22,7 @@ def createMenuFlags():
return flags
class MenuUtils:
class MenuUtils(object):
@staticmethod
def toCTPSeedingDict( flags ):
seeding = {} # HLTChain to L1 item mapping
......
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
""" Muon slice specific flags """
from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer, jobproperties
from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
from AthenaCommon.JobProperties import jobproperties # noqa: F401
from TriggerJobOpts.CommonSignatureHelper import CommonSignatureHelper
......