From 83f317779deceb58d8676fab87d744ec95b4ebab Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Fri, 5 Feb 2021 18:31:23 +0100
Subject: [PATCH] Move THistSvc config out of HLTTriggerGetter
---
.../TrigPSC/share/TrigPSCPythonDbSetup.py | 2 +-
.../share/EmuStepProcessingTest.py | 2 +-
.../TriggerJobOpts/python/HLTTriggerGetter.py | 17 -------------
.../python/TriggerHistSvcConfig.py | 24 +++++++++++++++----
.../TriggerJobOpts/share/runHLT_standalone.py | 2 +-
5 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py
index 120f219b32c..86fc7a26b1b 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py
+++ b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py
@@ -20,7 +20,7 @@ def setTHistSvcOutput():
"""Helper to set THistSvc.Output"""
## Do this only in a function to not pollute the global namespace
- from TriggerJobOpts.HLTTriggerGetter import setTHistSvcOutput
+ from TriggerJobOpts.TriggerHistSvcConfig import setTHistSvcOutput
output = []
setTHistSvcOutput(output)
setattr(iProperty("THistSvc"),"Output",output)
diff --git a/Trigger/TrigSteer/DecisionHandling/share/EmuStepProcessingTest.py b/Trigger/TrigSteer/DecisionHandling/share/EmuStepProcessingTest.py
index 5cf01919952..d185d3a804a 100644
--- a/Trigger/TrigSteer/DecisionHandling/share/EmuStepProcessingTest.py
+++ b/Trigger/TrigSteer/DecisionHandling/share/EmuStepProcessingTest.py
@@ -69,7 +69,7 @@ from AthenaCommon.AppMgr import theApp, ServiceMgr as svcMgr
from GaudiSvc.GaudiSvcConf import THistSvc
svcMgr += THistSvc()
if hasattr(svcMgr.THistSvc, "Output"):
- from TriggerJobOpts.HLTTriggerGetter import setTHistSvcOutput
+ from TriggerJobOpts.TriggerHistSvcConfig import setTHistSvcOutput
setTHistSvcOutput(svcMgr.THistSvc.Output)
print ("EmuStepProcessing: dump top Sequence after CF/DF Tree build")
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
index ee6d64b536b..162b7373805 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
@@ -27,23 +27,6 @@ def makeKeysList(inputDict):
return tmpList
-def setTHistSvcOutput(outputList):
- """Build the Output list of the THistSvc. This is used below and to
- configure athenaMT/PT when running from the online DB but with the
- offline THistSvc"""
-
- if 1 not in [ o.count('SHIFT') for o in outputList ]:
- outputList += [ "SHIFT DATAFILE='shift-monitoring.root' OPT='RECREATE'"]
- if 1 not in [ o.count('EXPERT') for o in outputList ]:
- outputList += [ "EXPERT DATAFILE='expert-monitoring.root' OPT='RECREATE'"]
- if 1 not in [ o.count('run_1') for o in outputList ]:
- outputList += [ "run_1 DATAFILE='lbn-monitoring.root' OPT='RECREATE'"]
- if 1 not in [ o.count('RUNSTAT') for o in outputList ]:
- outputList += [ "RUNSTAT DATAFILE='runstat-monitoring.root' OPT='RECREATE'"]
- if 1 not in [ o.count('DEBUG') for o in outputList ]:
- outputList += [ "DEBUG DATAFILE='debug-monitoring.root' OPT='RECREATE'"]
-
- return
def monitoringTools(steering):
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerHistSvcConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerHistSvcConfig.py
index 9cd56732471..b989a1dcb27 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerHistSvcConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerHistSvcConfig.py
@@ -2,15 +2,29 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
+def setTHistSvcOutput(outputList):
+ """Build the Output list of the THistSvc. This is used to
+ configure athenaHLT when running from the online DB but with the
+ offline THistSvc"""
+
+ if 1 not in [ o.count('SHIFT') for o in outputList ]:
+ outputList += [ "SHIFT DATAFILE='shift-monitoring.root' OPT='RECREATE'"]
+ if 1 not in [ o.count('EXPERT') for o in outputList ]:
+ outputList += [ "EXPERT DATAFILE='expert-monitoring.root' OPT='RECREATE'"]
+ if 1 not in [ o.count('run_1') for o in outputList ]:
+ outputList += [ "run_1 DATAFILE='lbn-monitoring.root' OPT='RECREATE'"]
+ if 1 not in [ o.count('RUNSTAT') for o in outputList ]:
+ outputList += [ "RUNSTAT DATAFILE='runstat-monitoring.root' OPT='RECREATE'"]
+ if 1 not in [ o.count('DEBUG') for o in outputList ]:
+ outputList += [ "DEBUG DATAFILE='debug-monitoring.root' OPT='RECREATE'"]
+
+ return
+
def TriggerHistSvcConfig(flags):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
acc = ComponentAccumulator()
histSvc = CompFactory.THistSvc()
- histSvc.Output = ["SHIFT DATAFILE='shift-monitoring.root' OPT='RECREATE'",
- "EXPERT DATAFILE='expert-monitoring.root' OPT='RECREATE'",
- "run_1 DATAFILE='lbn-monitoring.root' OPT='RECREATE'",
- "RUNSTAT DATAFILE='runstat-monitoring.root' OPT='RECREATE'",
- "DEBUG DATAFILE='debug-monitoring.root' OPT='RECREATE'"]
+ setTHistSvcOutput(histSvc.Output)
acc.addService( histSvc )
return acc
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index ecdfa517ae0..15325491dd1 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -519,7 +519,7 @@ if not hasattr(svcMgr, 'THistSvc'):
from GaudiSvc.GaudiSvcConf import THistSvc
svcMgr += THistSvc()
if hasattr(svcMgr.THistSvc, "Output"):
- from TriggerJobOpts.HLTTriggerGetter import setTHistSvcOutput
+ from TriggerJobOpts.TriggerHistSvcConfig import setTHistSvcOutput
setTHistSvcOutput(svcMgr.THistSvc.Output)
#-------------------------------------------------------------
--
GitLab