Merge branch 'updateckfconfig' into 'master'

use the trackinggeometry tool which has enabled the alignment condition algorithm

See merge request !316

Tracking/Acts/FaserActsKalmanFilter/python/CKF2Config.py

@@ -8,6 +8,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
 from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg
 from FaserActsGeometry.ActsGeometryConfig import ActsTrackingGeometrySvcCfg
+from FaserActsGeometry.ActsGeometryConfig import ActsTrackingGeometryToolCfg
 
 
 def FaserActsAlignmentCondAlgCfg(flags, **kwargs):
@@ -72,7 +73,11 @@ def CKF2Cfg(flags, **kwargs):
 
     actsExtrapolationTool = CompFactory.FaserActsExtrapolationTool("FaserActsExtrapolationTool")
     actsExtrapolationTool.MaxSteps = 1000
-    actsExtrapolationTool.TrackingGeometryTool = CompFactory.FaserActsTrackingGeometryTool("TrackingGeometryTool")
+
+    #use the tracking geometry tool which has enabled the alignment condition algo
+    result, actsTrackingGeometryTool = ActsTrackingGeometryToolCfg(flags)
+    actsExtrapolationTool.TrackingGeometryTool = actsTrackingGeometryTool
+    acc.merge(result)
 
     trajectory_performance_writer_tool = CompFactory.PerformanceWriterTool("PerformanceWriterTool")
     trajectory_performance_writer_tool.ExtrapolationTool = actsExtrapolationTool
@@ -95,6 +100,7 @@ def CKF2Cfg(flags, **kwargs):
     ckf.RootTrajectoryStatesWriterTool = trajectory_states_writer_tool
     ckf.RootTrajectorySummaryWriterTool = trajectory_summary_writer_tool
     ckf.PerformanceWriterTool = trajectory_performance_writer_tool
+    ckf.TrackingGeometryTool=actsTrackingGeometryTool
     ckf.isMC = flags.Input.isMC
     ckf.SummaryWriter = True
     ckf.StatesWriter = False