From b713934491f254b3adea4eec8919e60b831a4fb2 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 5 Dec 2018 16:19:43 +0100
Subject: [PATCH] athenaHLT: Fix setting of interactive mode
The PSC modifies its state machine if we are running in interactive mode
(to allow debugging of the python configuration before initialize is
called). Previously interactive mode was flagged by a global
'interactive' variable. This is now done directly in athenaHLT.py.
---
HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py | 4 ++++
.../TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py | 4 ----
HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py | 5 -----
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py b/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py
index 4a9ad45ee084..a28bd028ba03 100755
--- a/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py
+++ b/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py
@@ -340,6 +340,10 @@ def main():
# Modify pre/postcommands if necessary
update_pcommands(args, cdict)
+ # Tell the PSC if we are in interactive mode (relevant for state machine)
+ import TrigPSC.PscConfig
+ TrigPSC.PscConfig.interactive = args.interactive
+
# Run HLTMPPU
from HLTMPPy.runner import runHLTMPPy
runHLTMPPy(cdict)
diff --git a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py
index e56abfb74e71..201aa3396d48 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py
+++ b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonDbSetup.py
@@ -59,10 +59,6 @@ if not _Conf.useOnlineTHistSvc:
isvcMgr.declareSvcType("THistSvc","THistSvc")
setTHistSvcOutput()
-if 'interactive' in dir():
- PscConfig.interactive = bool(interactive)
- del interactive
-
## Some cleanup
del _Conf
del logLevel
diff --git a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py
index c4bb4dedbbd8..a74a7961141b 100755
--- a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py
+++ b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py
@@ -144,11 +144,6 @@ else:
sys.exit( theApp._exitstate )
raise
- if 'interactive' in dir():
- import TrigPSC.PscConfig
- TrigPSC.PscConfig.interactive = bool(interactive)
- del interactive
-
### run user jobOptions file -------------------------------------------------
try:
include( "%s" % PscConfig.optmap['JOBOPTIONSPATH'] )
--
GitLab