diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py b/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py index afcef75d6ce5d335da6504c21ddf44ae8fc507e2..5585743c64083743a9cef6651b8099a13bc3046c 100644 --- a/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py +++ b/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py @@ -8,6 +8,7 @@ from CalypsoConfiguration.AllConfigFlags import ConfigFlags from CalypsoConfiguration.MainServicesConfig import MainServicesCfg from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg +from FaserGeoModel.FaserGeoModelConfig import FaserGeometryCfg from TrackerPrepRawDataFormation.TrackerPrepRawDataFormationConfig import FaserSCT_ClusterizationCfg from TrackerSpacePointFormation.TrackerSpacePointFormationConfig import TrackerSpacePointFinderCfg from TrackerSegmentFit.TrackerSegmentFitConfig import SegmentFitAlgCfg @@ -30,11 +31,12 @@ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02" ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" ConfigFlags.GeoModel.Align.Dynamic = False ConfigFlags.Beam.NumberOfCollisions = 0. -ConfigFlags.TrackingGeometry.MaterialSource = "Input" +ConfigFlags.TrackingGeometry.MaterialSource = "geometry-maps.json" ConfigFlags.Input.isMC = True ConfigFlags.lock() acc = MainServicesCfg(ConfigFlags) +acc.merge(FaserGeometryCfg(ConfigFlags)) acc.merge(PoolReadCfg(ConfigFlags)) acc.merge(PoolWriteCfg(ConfigFlags)) diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py b/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py index f6c5a5af53581d986d57ee32ad2e4d5706c6f6e1..fffb07177a028816aa47fea33d0521692c6cc2f3 100644 --- a/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py +++ b/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py @@ -8,6 +8,7 @@ from CalypsoConfiguration.AllConfigFlags import ConfigFlags from CalypsoConfiguration.MainServicesConfig import MainServicesCfg from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg # from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg +from FaserGeoModel.FaserGeoModelConfig import FaserGeometryCfg from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg from FaserByteStreamCnvSvc.FaserByteStreamCnvSvcConfig import FaserByteStreamCnvSvcCfg from TrackerPrepRawDataFormation.TrackerPrepRawDataFormationConfig import FaserSCT_ClusterizationCfg @@ -31,10 +32,11 @@ ConfigFlags.Common.isOnline = False ConfigFlags.GeoModel.Align.Dynamic = False ConfigFlags.Beam.NumberOfCollisions = 0. ConfigFlags.Detector.GeometryFaserSCT = True -ConfigFlags.TrackingGeometry.MaterialSource = "Input" +ConfigFlags.TrackingGeometry.MaterialSource = "geometry-maps.json" ConfigFlags.lock() acc = MainServicesCfg(ConfigFlags) +acc.merge(FaserGeometryCfg(ConfigFlags)) acc.merge(PoolWriteCfg(ConfigFlags)) acc.merge(FaserByteStreamCnvSvcCfg(ConfigFlags)) acc.merge(FaserSCT_ClusterizationCfg(ConfigFlags, DataObjectName="SCT_LEVELMODE_RDOs", ClusterToolTimingPattern="X1X"))