From a124e7f99db99ae5da8525037f56def47c800eda Mon Sep 17 00:00:00 2001
From: Rafal Bielski <rafal.bielski@cern.ch>
Date: Fri, 22 May 2020 02:43:54 +0200
Subject: [PATCH] Make TrigBSReadCfg simply return ByteStreamReadCfg
---
.../python/ByteStreamConfig.py | 42 +------------------
1 file changed, 2 insertions(+), 40 deletions(-)
diff --git a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
index 73991be0861..5742bda133d 100644
--- a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
+++ b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
@@ -66,46 +66,8 @@ def ByteStreamReadCfg( inputFlags, typeNames=[] ):
return acc
def TrigBSReadCfg(inputFlags):
-
- acc=ByteStreamReadCfg( inputFlags )
-
- bsCnvSvc=acc.getService("ByteStreamCnvSvc")
- bsCnvSvc.InitCnvs += ["HLT::HLTResult" ]
-
- bsAddressProviderSvc=acc.getService("ByteStreamAddressProviderSvc")
-
- bsAddressProviderSvc.TypeNames += [
- "TileCellIDC/TileCellIDC",
- "MdtDigitContainer/MDT_DIGITS",
- "RpcDigitContainer/RPC_DIGITS",
- "TgcDigitContainer/TGC_DIGITS",
- "CscDigitContainer/CSC_DIGITS",
- "MuCTPI_RIO/MUCTPI_RIO",
- "CTP_RIO/CTP_RIO"
- ]
-
- bsAddressProviderSvc.TypeNames += [
- "LArRawChannelContainer/LArRawChannels",
- "TileRawChannelContainer/TileRawChannelCnt",
- "MuCTPI_RDO/MUCTPI_RDO",
- "HLT::HLTResult/HLTResult_L2",
- "HLT::HLTResult/HLTResult_EF",
- "CTP_RDO/CTP_RDO",
- "L1TopoRDOCollection/L1TopoRDOCollection"
- ]
-
-
-
- if inputFlags.Input.isMC is False:
- bsCnvSvc.GetDetectorMask=True
- from IOVDbSvc.IOVDbSvcConfig import addFolders
- acc.merge(addFolders(inputFlags,'/TDAQ/RunCtrl/SOR_Params','TDAQ' ))
- # still need to figure out how conditions are setup in new system
- #from IOVDbSvc.CondDB import conddb
- #conddb.addFolder( 'TDAQ', '/TDAQ/RunCtrl/SOR_Params' )
- #acc.addService( conddb )
-
- return acc
+ # TODO: Search and replace all clients to use ByteStreamReadCfg directly, then remove TrigBSReadCfg
+ return ByteStreamReadCfg( inputFlags )
def ByteStreamWriteCfg( flags, typeNames=[] ):
--
GitLab