From 2208da48373988998b51a77cedcbbff09025538e Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Wed, 4 Nov 2020 11:44:08 +0100
Subject: [PATCH] Fix LuminosityCondAlg config for Trigger
---
LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py | 3 ++-
.../TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py | 4 ++--
.../TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py | 3 +--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py
index c7c87b4684bc..61d09e6cdba9 100644
--- a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py
+++ b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py
@@ -7,6 +7,7 @@
from AthenaCommon.Logging import logging
from AthenaCommon.AlgSequence import AthSequencer
+from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
_isOnline = False
@@ -14,7 +15,7 @@ _isOnline = False
def LuminosityCondAlgDefault (name = 'LuminosityCondAlg',
suffix = '',
- isOnline = None):
+ isOnline = athenaCommonFlags.isOnline()):
if name is None:
name = 'LuminosityCondAlg' + suffix
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
index 1e6cc0ea7fc7..e79e14e6ce19 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
@@ -172,8 +172,8 @@ def TrigEgammaFastCaloHypoToolFromDict( d ):
""" Use menu decoded chain dictionary to configure the tool """
cparts = [i for i in d['chainParts'] if ((i['signature']=='Electron') or (i['signature']=='Photon'))]
- from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgOnlineDefault
- LuminosityCondAlgOnlineDefault()
+ from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgDefault
+ LuminosityCondAlgDefault()
#def __mult(cpart):
# return int( cpart['multiplicity'] )
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index e858b28d1dc9..ca391ea9b078 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -182,6 +182,7 @@ if not ConfigFlags.Input.isMC:
globalflags.DatabaseInstance='CONDBR2' if opt.useCONDBR2 else 'COMP200'
ConfigFlags.IOVDb.DatabaseInstance=globalflags.DatabaseInstance()
athenaCommonFlags.isOnline.set_Value_and_Lock(opt.isOnline)
+ConfigFlags.Common.isOnline = athenaCommonFlags.isOnline()
log.info('Configured the following global flags:')
globalflags.print_JobProperties()
@@ -441,8 +442,6 @@ if ConfigFlags.Input.Format == 'POOL':
if objKeyStore.isInInput("xAOD::EventInfo"):
topSequence.SGInputLoader.Load += [( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' )]
else:
- from AthenaCommon.AlgSequence import AthSequencer
- condSeq = AthSequencer("AthCondSeq")
if not hasattr(hltBeginSeq, "xAODMaker::EventInfoCnvAlg"):
from xAODEventInfoCnv.xAODEventInfoCnvAlgDefault import xAODEventInfoCnvAlgDefault
xAODEventInfoCnvAlgDefault(sequence=hltBeginSeq)
--
GitLab