Skip to content
Snippets Groups Projects

Fix path resolution in trigger menu services (ATR-20864)

Merged Joerg Stelzer requested to merge stelzer/athena:master-ATR-20864-2 into master
3 files
+ 14
13
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -357,7 +357,7 @@ class SetupTrigConfigSvc(object):
@@ -357,7 +357,7 @@ class SetupTrigConfigSvc(object):
if TriggerFlags.doLVL2() or TriggerFlags.doEF() or TriggerFlags.doHLT() or TriggerFlags.configForStartup()=='HLToffline':
if TriggerFlags.doLVL2() or TriggerFlags.doEF() or TriggerFlags.doHLT() or TriggerFlags.configForStartup()=='HLToffline':
self.mlog.info( "setup HLTConfigSvc and add instance to ServiceMgr (xml file="+self.hltXmlFile+")" )
self.mlog.info( "setup HLTConfigSvc and add instance to ServiceMgr (xml file="+self.hltXmlFile+")" )
hlt = HLTConfigSvc("HLTConfigSvc")
hlt = HLTConfigSvc("HLTConfigSvc")
hlt.XMLMenuFile = findFileInXMLPATH(self.hltXmlFile)
hlt.XMLMenuFile = self.hltXmlFile
hlt.doMergedHLT = TriggerFlags.doHLT()
hlt.doMergedHLT = TriggerFlags.doHLT()
ServiceMgr += hlt
ServiceMgr += hlt
else:
else:
@@ -366,12 +366,12 @@ class SetupTrigConfigSvc(object):
@@ -366,12 +366,12 @@ class SetupTrigConfigSvc(object):
self.mlog.info( "setup LVL1ConfigSvc and add instance to ServiceMgr (xml file="+self.l1XmlFile+")" )
self.mlog.info( "setup LVL1ConfigSvc and add instance to ServiceMgr (xml file="+self.l1XmlFile+")" )
l1 = LVL1ConfigSvc("LVL1ConfigSvc")
l1 = LVL1ConfigSvc("LVL1ConfigSvc")
l1.XMLMenuFile = findFileInXMLPATH(self.l1XmlFile)
l1.XMLMenuFile = self.l1XmlFile
ServiceMgr += l1
ServiceMgr += l1
self.mlog.info( "setup L1TopoConfigSvc and add instance to ServiceMgr (xml file="+self.l1topoXmlFile+")" )
self.mlog.info( "setup L1TopoConfigSvc and add instance to ServiceMgr (xml file="+self.l1topoXmlFile+")" )
l1topo = L1TopoConfigSvc()
l1topo = L1TopoConfigSvc()
l1topo.XMLMenuFile = findFileInXMLPATH(self.l1topoXmlFile)
l1topo.XMLMenuFile = self.l1topoXmlFile
ServiceMgr += l1topo
ServiceMgr += l1topo
Loading