From a95ecea965b47ef34030c7f0f6572800b559d833 Mon Sep 17 00:00:00 2001 From: Siarhei Harkusha <siarhei.harkusha@cern.ch> Date: Tue, 27 Sep 2022 16:49:03 +0200 Subject: [PATCH] TileByteStream: Fix old-style configuration of TileHid2RESrcIDCondAlg (ATR-26346) TileByteStream: Fix old-style configuration of TileHid2RESrcIDCondAlg (ATR-26346) Old-style configuration of TileHid2RESrcIDCondAlg conditions algorithm has been fixed to produce TileHid2RESrcID conditions object with correct name. --- .../TileByteStream/python/TileByteStreamConfig.py | 8 +++----- .../python/TileHid2RESrcIDConfig.py | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/TileCalorimeter/TileSvc/TileByteStream/python/TileByteStreamConfig.py b/TileCalorimeter/TileSvc/TileByteStream/python/TileByteStreamConfig.py index ae90d7280124..e1eac7075a58 100644 --- a/TileCalorimeter/TileSvc/TileByteStream/python/TileByteStreamConfig.py +++ b/TileCalorimeter/TileSvc/TileByteStream/python/TileByteStreamConfig.py @@ -10,11 +10,9 @@ def _createTileContByteStreamToolsConfig (name, TileContByteStreamTool, Initiali tool = TileContByteStreamTool(**kwargs) if InitializeForWriting: - from AthenaCommon.AlgSequence import AthSequencer - condSequence = AthSequencer("AthCondSeq") - if not hasattr(condSequence, "TileHid2RESrcIDHLTCondAlg"): - from TileByteStream.TileByteStreamConf import TileHid2RESrcIDCondAlg - condSequence += TileHid2RESrcIDCondAlg(ForHLT=True) + from TileByteStream.TileHid2RESrcIDConfig import TileHid2RESrcIDCondAlg + TileHid2RESrcIDCondAlg(ForHLT=True) + if stream: stream.ExtraInputs += [('TileHid2RESrcID', 'ConditionStore+TileHid2RESrcIDHLT')] diff --git a/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py b/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py index 5f690826c1e7..d9a2b2609c84 100644 --- a/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py +++ b/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py @@ -5,6 +5,21 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory +def TileHid2RESrcIDCondAlg(ForHLT=False): + """Configure TileHid2ReSrcIDCondAlg conditions algorithm""" + + hid2RESrcID = 'TileHid2RESrcIDHLT' if ForHLT else 'TileHid2RESrcID' + hid2RESrcIDCondAlg = f'{hid2RESrcID}CondAlg' + from AthenaCommon.AlgSequence import AthSequencer + condSequence = AthSequencer("AthCondSeq") + if hasattr(condSequence, hid2RESrcIDCondAlg): + return #Already there.... + + from TileByteStream.TileByteStreamConf import TileHid2RESrcIDCondAlg + condSequence += TileHid2RESrcIDCondAlg(name=hid2RESrcIDCondAlg, ForHLT=ForHLT, TileHid2RESrcID=hid2RESrcID) + return + + def TileHid2RESrcIDCondAlgCfg(flags, **kwargs): """Return component accumulator with configured TileHid2ReSrcIDCondAlg conditions algorithm""" -- GitLab