From 53fb387038bb95ab52dc6d0faa21160dbe3ea7d9 Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Wed, 15 Sep 2021 09:14:49 +0200
Subject: [PATCH] LArByteStream: Depend on LAr GeoModel directly
---
.../LArByteStream/python/LArRawCalibDataReadingConfig.py | 6 ++----
.../LArCnv/LArByteStream/python/LArRawDataReadingConfig.py | 6 ++----
.../LArByteStream/python/LArRawSCDataReadingConfig.py | 6 ++----
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawCalibDataReadingConfig.py b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawCalibDataReadingConfig.py
index d0bac9050b65..dcda51c63b66 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawCalibDataReadingConfig.py
+++ b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawCalibDataReadingConfig.py
@@ -8,8 +8,8 @@ LArRawCalibDataReadingAlg=CompFactory.LArRawCalibDataReadingAlg
def LArRawCalibDataReadingCfg(configFlags,gain="HIGH",doAccDigit=False,doAccCalibDigit=False,doCalibDigit=False):
acc=ComponentAccumulator()
- from DetDescrCnvSvc.DetDescrCnvSvcConfig import DetDescrCnvSvcCfg
- acc.merge(DetDescrCnvSvcCfg(configFlags))
+ from LArGeoAlgsNV.LArGMConfig import LArGMCfg
+ acc.merge(LArGMCfg(configFlags))
acc.merge(ByteStreamReadCfg(configFlags))
accKey=""
accCalibKey=""
@@ -41,8 +41,6 @@ if __name__=="__main__":
ConfigFlags.lock()
acc = MainServicesCfg( ConfigFlags )
- from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg
- acc.merge(AtlasGeometryCfg(ConfigFlags))
acc.merge(LArRawCalibDataReadingCfg(ConfigFlags,doAccCalibDigit=True))
from LArCabling.LArCablingConfig import LArOnOffIdMappingCfg
diff --git a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py
index 4294ea67645c..d6c017c5c58c 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py
+++ b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py
@@ -8,8 +8,8 @@ LArRawDataReadingAlg=CompFactory.LArRawDataReadingAlg
def LArRawDataReadingCfg(configFlags, **kwargs):
acc=ComponentAccumulator()
- from DetDescrCnvSvc.DetDescrCnvSvcConfig import DetDescrCnvSvcCfg
- acc.merge(DetDescrCnvSvcCfg(configFlags))
+ from LArGeoAlgsNV.LArGMConfig import LArGMCfg
+ acc.merge(LArGMCfg(configFlags))
acc.merge(ByteStreamReadCfg(configFlags))
if configFlags.Overlay.DataOverlay:
@@ -42,8 +42,6 @@ if __name__=="__main__":
ConfigFlags.lock()
acc = MainServicesCfg( ConfigFlags )
- from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg
- acc.merge(AtlasGeometryCfg(ConfigFlags))
acc.merge(LArRawDataReadingCfg(ConfigFlags))
DumpLArRawChannels=CompFactory.DumpLArRawChannels
diff --git a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py
index 72fd8a8ceef4..bdf4f4f50892 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py
+++ b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py
@@ -10,8 +10,8 @@ LArLATOMEDecoder=CompFactory.LArLATOMEDecoder
def LArRawSCDataReadingCfg(configFlags, **kwargs):
acc=ComponentAccumulator()
- from DetDescrCnvSvc.DetDescrCnvSvcConfig import DetDescrCnvSvcCfg
- acc.merge(DetDescrCnvSvcCfg(configFlags))
+ from LArGeoAlgsNV.LArGMConfig import LArGMCfg
+ acc.merge(LArGMCfg(configFlags))
acc.merge(ByteStreamReadCfg(configFlags))
LArRawSCDataReadingAlg1 = LArRawSCDataReadingAlg(**kwargs)
@@ -38,8 +38,6 @@ if __name__=="__main__":
ConfigFlags.lock()
acc = MainServicesCfg( ConfigFlags )
- from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg
- acc.merge(AtlasGeometryCfg(ConfigFlags))
acc.merge(LArRawSCDataReadingCfg(ConfigFlags))
acc.run(2,OutputLevel=DEBUG)
--
GitLab