Skip to content
Snippets Groups Projects
Commit c35e20f9 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'ca/larbs' into 'master'

LArByteStream: Depend on LAr GeoModel directly

See merge request atlas/athena!46496
parents c7a3df72 53fb3870
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment