diff --git a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawCalibDataReadingConfig.py b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawCalibDataReadingConfig.py index d0bac9050b65caff165ad0c78f392f445795c746..dcda51c63b66444220757d29d2018f6cdd0029bd 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 4294ea67645cb8afd8920a12c3910e25b4524c36..d6c017c5c58c6f0ad666575aa2b96d2dc13057aa 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 72fd8a8ceef47873971a1c4f76eefffb2b941c04..bdf4f4f50892ae7f702b17738abc3bcf2f0e5c2a 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)