Merge branch 'TrackingVolumeHelperCA' into 'master'

Update CA config of TrackingVolumeHelper for ITk

See merge request atlas/athena!61575

Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py

@@ -65,14 +65,19 @@ def GeometryBuilderCfg(flags, name='AtlasGeometryBuilder',
     if "TrackingVolumeArrayCreator" not in kwargs:
         from TrackingGeometryCondAlg.TrkDetDescrToolsConfig import (
             TrackingVolumeArrayCreatorCfg)
-        kwargs.setdefault("TrackingVolumeArrayCreator", result.popToolsAndMerge(
-            TrackingVolumeArrayCreatorCfg(flags)))
+        TrackingVolumeArrayCreator = result.popToolsAndMerge(
+            TrackingVolumeArrayCreatorCfg(flags))
+        result.addPublicTool(TrackingVolumeArrayCreator)
+        kwargs.setdefault("TrackingVolumeArrayCreator",
+                          TrackingVolumeArrayCreator)
 
     if "TrackingVolumeHelper" not in kwargs:
         from TrackingGeometryCondAlg.TrkDetDescrToolsConfig import (
             TrackingVolumeHelperCfg)
-        kwargs.setdefault("TrackingVolumeHelper", result.popToolsAndMerge(
-            TrackingVolumeHelperCfg(flags)))
+        TrackingVolumeHelper = result.popToolsAndMerge(
+            TrackingVolumeHelperCfg(flags))
+        result.addPublicTool(TrackingVolumeHelper)
+        kwargs.setdefault("TrackingVolumeHelper", TrackingVolumeHelper)
 
     # Depending on the job configuration, setup the various detector builders,
     # and add to atlas_geometry_builder

Tracking/TrkConditions/TrackingGeometryCondAlg/python/TrkDetDescrToolsConfig.py

@@ -7,7 +7,7 @@ from AthenaConfiguration.AccumulatorCache import AccumulatorCache
 def InDetTrackingVolumeHelperCfg(flags, name='InDetTrackingVolumeHelper',
                                  **kwargs):
     result = ComponentAccumulator()
-    result.setPrivateTools(CompFactory.Trk.TrackingVolumeHelper(name))
+    result.setPrivateTools(CompFactory.Trk.TrackingVolumeHelper(name, **kwargs))
     return result
 
 def ITkTrackingVolumeHelperCfg(flags, name='ITkTrackingVolumeHelper', **kwargs):
@@ -20,7 +20,7 @@ def ITkTrackingVolumeHelperCfg(flags, name='ITkTrackingVolumeHelper', **kwargs):
                       flags.ITk.trackingGeometry.passiveEndcapMatRbins)
     kwargs.setdefault("EndcapLayerBinsPhi",
                       flags.ITk.trackingGeometry.passiveEndcapMatPhiBins)
-    result.setPrivateTools(CompFactory.Trk.TrackingVolumeHelper(name))
+    result.setPrivateTools(CompFactory.Trk.TrackingVolumeHelper(name, **kwargs))
     return result
 
 # Generic interface for conveniency
@@ -41,7 +41,7 @@ def HGTD_TrackingVolumeHelperCfg(flags, name='HGTD_TrackingVolumeHelper',
                       flags.HGTD.trackingGeometry.passiveEndcapMatRbins)
     kwargs.setdefault("EndcapLayerBinsPhi",
                       flags.HGTD.trackingGeometry.passiveEndcapMatPhiBins)
-    result.setPrivateTools(CompFactory.Trk.TrackingVolumeHelper(name))
+    result.setPrivateTools(CompFactory.Trk.TrackingVolumeHelper(name, **kwargs))
     return result
 
 def TrackingVolumeArrayCreatorCfg(flags, name="TrackingVolumeArrayCreator",