From 117b466bab75644a0b1cc62aa684b70978bf063d Mon Sep 17 00:00:00 2001 From: Stewart Martin-Haugh <smh@cern.ch> Date: Wed, 17 Jun 2020 17:54:06 +0200 Subject: [PATCH] Move TrigBSReadCfg references to ByteStreamReadCfg --- DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py | 4 ++-- DetectorDescription/RegionSelector/python/RegSelConfig.py | 4 ++-- Event/ByteStreamCnvSvc/python/ByteStreamConfig.py | 7 +------ LArCalorimeter/LArMonitoring/python/LArHVDBConfig.py | 4 ++-- .../MuonConfig/python/MuonBytestreamDecodeConfig.py | 4 ++-- MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py | 4 ++-- .../TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py | 4 ++-- .../TrigTools/TrigInDetConfig/python/TrigInDetConfig.py | 4 ++-- .../TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py | 4 ++-- Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py | 4 ++-- 10 files changed, 19 insertions(+), 24 deletions(-) diff --git a/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py b/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py index 01e74965b800..859b37791fe5 100644 --- a/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py +++ b/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py @@ -173,9 +173,9 @@ if __name__ == '__main__': # Initialize configuration object, add accumulator, merge, and run. from AthenaConfiguration.MainServicesConfig import MainServicesCfg #from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg - from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg + from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg cfg = MainServicesCfg(ConfigFlags) - cfg.merge(TrigBSReadCfg(ConfigFlags)) + cfg.merge(ByteStreamReadCfg(ConfigFlags)) from TrigInDetConfig.InDetConfig import TrigInDetConfig cfg.merge(TrigInDetConfig(ConfigFlags)) diff --git a/DetectorDescription/RegionSelector/python/RegSelConfig.py b/DetectorDescription/RegionSelector/python/RegSelConfig.py index 29984e3bf91c..a440fb5b4393 100644 --- a/DetectorDescription/RegionSelector/python/RegSelConfig.py +++ b/DetectorDescription/RegionSelector/python/RegSelConfig.py @@ -136,8 +136,8 @@ if __name__ == "__main__": # cfg.merge( PoolReadCfg( ConfigFlags ) ) - from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg - cfg.merge(TrigBSReadCfg( ConfigFlags )) + from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg + cfg.merge(ByteStreamReadCfg( ConfigFlags )) acc = regSelCfg( ConfigFlags ) diff --git a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py index 17fbb7de231d..de44b7f9143c 100644 --- a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py +++ b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py @@ -64,11 +64,6 @@ def ByteStreamReadCfg( inputFlags, typeNames=[] ): return acc -def TrigBSReadCfg( flags, typeNames=[] ): - # TODO: Search and replace all clients to use ByteStreamReadCfg directly, then remove TrigBSReadCfg - return ByteStreamReadCfg( flags, typeNames ) - - def ByteStreamWriteCfg( flags, typeNames=[] ): acc = ComponentAccumulator("AthOutSeq") outputSvc = CompFactory.ByteStreamEventStorageOutputSvc() @@ -106,6 +101,6 @@ if __name__ == "__main__": ConfigFlags.Input.Files = defaultTestFiles.RAW - acc = TrigBSReadCfg( ConfigFlags ) + acc = ByteStreamReadCfg( ConfigFlags ) acc.store( open( "test.pkl", "wb" ) ) print("All OK") diff --git a/LArCalorimeter/LArMonitoring/python/LArHVDBConfig.py b/LArCalorimeter/LArMonitoring/python/LArHVDBConfig.py index a35f1155c2f7..e34f4a3f6ac6 100644 --- a/LArCalorimeter/LArMonitoring/python/LArHVDBConfig.py +++ b/LArCalorimeter/LArMonitoring/python/LArHVDBConfig.py @@ -49,8 +49,8 @@ if __name__=="__main__": ConfigFlags.lock() cfg=ComponentAccumulator() - from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg - cfg.merge( TrigBSReadCfg(ConfigFlags) ) + from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg + cfg.merge( ByteStreamReadCfg(ConfigFlags) ) from LArGeoAlgsNV.LArGMConfig import LArGMCfg cfg.merge(LArGMCfg(ConfigFlags)) diff --git a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py index ac542423ddc9..8f58c38694b5 100644 --- a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py +++ b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py @@ -228,8 +228,8 @@ if __name__=="__main__": cfg=ComponentAccumulator() # Seem to need this to read BS properly - from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg - cfg.merge(TrigBSReadCfg(ConfigFlags )) + from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg + cfg.merge(ByteStreamReadCfg(ConfigFlags )) # Schedule Rpc data decoding rpcdecodingAcc = RpcBytestreamDecodeCfg( ConfigFlags ) diff --git a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py index 0932823f79f2..f3a55a6af013 100644 --- a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py +++ b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py @@ -224,8 +224,8 @@ def muonRdoDecodeTestData( forTrigger = False ): cfg=ComponentAccumulator() # Seem to need this to read BS properly - from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg - cfg.merge(TrigBSReadCfg(ConfigFlags )) + from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg + cfg.merge(ByteStreamReadCfg(ConfigFlags )) # Add the MuonCache to ComponentAccumulator for trigger/RoI testing mode if forTrigger: diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py index 89b0204f7c36..814312213c79 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py @@ -94,8 +94,8 @@ if __name__ == "__main__": ConfigFlags.lock() acc = ComponentAccumulator() - from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg - acc.merge( TrigBSReadCfg( ConfigFlags ) ) + from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg + acc.merge( ByteStreamReadCfg( ConfigFlags ) ) acc.merge( trigCaloDataAccessSvcCfg( ConfigFlags ) ) diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py index 21b0c07f878f..a5fceef39452 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py @@ -417,8 +417,8 @@ if __name__ == "__main__": l1DecoderAcc, l1DecoderAlg = L1DecoderCfg( ConfigFlags ) acc.addEventAlgo(l1DecoderAlg) acc.merge(l1DecoderAcc) - from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg - acc.merge(TrigBSReadCfg(ConfigFlags)) + from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg + acc.merge(ByteStreamReadCfg(ConfigFlags)) acc.merge( TrigInDetConfig( ConfigFlags ) ) from RegionSelector.RegSelConfig import regSelCfg diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py index 84c4201a66e0..749f814e09d9 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py @@ -7,7 +7,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags from AthenaCommon.Constants import INFO, DEBUG, VERBOSE from AthenaCommon.Logging import logging -from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg +from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg from TrigUpgradeTest.TriggerHistSvcConfig import TriggerHistSvcConfig from MuonConfig.MuonCablingConfig import RPCCablingConfigCfg, TGCCablingConfigCfg from TrigConfigSvc.TrigConfigSvcConfig import TrigConfigSvcCfg @@ -31,7 +31,7 @@ flags.Trigger.L1Decoder.forceEnableAllChains = True flags.lock() acc = ComponentAccumulator() -acc.merge(TrigBSReadCfg(flags)) +acc.merge(ByteStreamReadCfg(flags)) acc.merge(TriggerHistSvcConfig(flags)) l1DecoderAlg, OrigHLTChains = generateL1DecoderAndChains() diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py index 29835f3dd108..8461b5949533 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py @@ -54,8 +54,8 @@ flags.lock() from AthenaCommon.Constants import INFO,DEBUG,WARNING acc = MainServicesCfg( flags ) -from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg -acc.merge(TrigBSReadCfg( flags )) +from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg +acc.merge(ByteStreamReadCfg( flags )) from TrigUpgradeTest.TriggerHistSvcConfig import TriggerHistSvcConfig -- GitLab