Commit 90506b77 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'HLT_py3' into 'master'

HLT migration for python 3

See merge request atlas/athena!30129
parents eb7f8040 67bb70be
......@@ -97,8 +97,8 @@ else:
print(" +------------------------------------------------+ ")
print(" ---> Command = %s" % PscConfig.optmap['PRECOMMAND'])
try:
exec PscConfig.optmap['PRECOMMAND']
except Exception, e:
exec(PscConfig.optmap['PRECOMMAND'])
except Exception as e:
if isinstance( e, IncludeError ):
print(sys.exc_type, e)
theApp._exitstate = ExitCodes.INCLUDE_ERROR
......@@ -120,7 +120,7 @@ else:
### run user jobOptions file -------------------------------------------------
try:
include( "%s" % PscConfig.optmap['JOBOPTIONSPATH'] )
except Exception, e:
except Exception as e:
if isinstance(e,SystemExit):
raise
......@@ -163,8 +163,8 @@ else:
print(" +------------------------------------------------+ ")
print(" ---> Command = ", PscConfig.optmap['POSTCOMMAND'])
try:
exec PscConfig.optmap['POSTCOMMAND']
except Exception, e:
exec(PscConfig.optmap['POSTCOMMAND'])
except Exception as e:
if isinstance( e, IncludeError ):
print(sys.exc_type, e)
theApp._exitstate = ExitCodes.INCLUDE_ERROR
......
......@@ -3,7 +3,7 @@
# @file: TrigServicesConfig.py
# @purpose: customized configurables
from TrigServicesConf import TrigCOOLUpdateHelper as _TrigCOOLUpdateHelper
from TrigServices.TrigServicesConf import TrigCOOLUpdateHelper as _TrigCOOLUpdateHelper
from AthenaCommon.Logging import logging
log = logging.getLogger('TrigCOOLUpdateHelper')
......@@ -88,7 +88,7 @@ def setupMessageSvc():
MessageSvc.statLevel = WARNING
# online ROB data provider service
from TrigServicesConf import HltROBDataProviderSvc as _HltROBDataProviderSvc
from TrigServices.TrigServicesConf import HltROBDataProviderSvc as _HltROBDataProviderSvc
class HltROBDataProviderSvc(_HltROBDataProviderSvc):
__slots__ = ()
......@@ -119,7 +119,7 @@ class HltROBDataProviderSvc(_HltROBDataProviderSvc):
return
# online event loop manager
from TrigServicesConf import HltEventLoopMgr as _HltEventLoopMgr
from TrigServices.TrigServicesConf import HltEventLoopMgr as _HltEventLoopMgr
class HltEventLoopMgr(_HltEventLoopMgr):
__slots__ = ()
......
......@@ -115,7 +115,7 @@ def setupCommonServices():
theApp.EvtSel = "EventSelector"
# Online event loop manager
from TrigServicesConfig import HltEventLoopMgr
from TrigServices.TrigServicesConfig import HltEventLoopMgr
loopMgr = HltEventLoopMgr("HltEventLoopMgr")
loopMgr.WhiteboardSvc = "EventDataSvc"
loopMgr.SchedulerSvc = AlgScheduler.getScheduler().getName()
......
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from builtins import str
def HLTResultMTMakerCfg(name="HLTResultMTMaker"):
from TrigOutputHandlingConf import HLTResultMTMaker
from TrigOutputHandling.TrigOutputHandlingConf import HLTResultMTMaker
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
m = HLTResultMTMaker(name)
......@@ -80,7 +81,7 @@ def TriggerEDMSerialiserToolCfg(name="TriggerEDMSerialiserTool"):
when it gets to setting the serialiser property
"""
def __repr__(self):
return '[' +','.join( ['"'+str(typekey)+';'+','.join(map( lambda _:str(_), ids) )+'"' for typekey,ids in self.iteritems()] ) + ']'
return '[' +','.join( ['"'+str(typekey)+';'+','.join([str(_) for _ in ids] )+'"' for typekey,ids in self.items()] ) + ']'
def __str__(self):
return self.__repr__()
......
Markdown is supported
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