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.


Former-commit-id: b7139344

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)

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

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'] )