Skip to content
Snippets Groups Projects
Commit 62a9d322 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'master-dq-ctp-hi' into 'master'

Fix DQ steering crash in HI mode (ATLASRECTS-5690)

See merge request !37161
parents bc0361ac dc985dc2
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!37161Fix DQ steering crash in HI mode (ATLASRECTS-5690)
......@@ -47,7 +47,7 @@ from AthenaCommon.AppMgr import ToolSvc as toolSvc
from TrigT1CTMonitoring.TrigT1CTMonitoringConf import TrigT1CTMonitoring__BSMonitoring as BSMon
#-----------ONLINE CODE---------------------
if isOnline and jp.ConcurrencyFlags.NumThreads() == 0:
if athenaCommonFlags.isOnline() and jp.ConcurrencyFlags.NumThreads() == 0:
#from TrigServices.TrigServicesConf import TrigMonTHistSvc
#THistSvc = TrigMonTHistSvc("THistSvc")
#svcMgr += THistSvc
......@@ -173,7 +173,7 @@ if isOnline and jp.ConcurrencyFlags.NumThreads() == 0:
#-----------OFFLINE CODE---------------------
if not isOnline and jp.ConcurrencyFlags.NumThreads() == 0:
if not athenaCommonFlags.isOnline() and jp.ConcurrencyFlags.NumThreads() == 0:
from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
cfg = TriggerConfigGetter()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment