Move TrigBSReadCfg references to ByteStreamReadCfg

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

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 )

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")

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

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 ) 

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:

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

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

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()

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