Merge branch 'trt-fix' into '24.0'

Fix TRT conditions access in non G4 jobs

See merge request !77902

InnerDetector/InDetConditions/TRT_ConditionsServices/python/TRT_ConditionsServicesConfig.py

@@ -20,7 +20,7 @@ def TRT_CalDbToolCfg(flags, name="TRT_CalDbTool", **kwags):
     return acc
 
 
-def TRT_StrawStatusSummaryToolCfg(flags, name="TRT_StrawStatusSummaryTool", forceLegacyAccess=False, **kwargs):
+def TRT_StrawStatusSummaryToolCfg(flags, name="TRT_StrawStatusSummaryTool", **kwargs):
     """Return a ComponentAccumulator for TRT_StrawStatusSummaryTool"""
     acc = ComponentAccumulator()
 
@@ -34,11 +34,12 @@ def TRT_StrawStatusSummaryToolCfg(flags, name="TRT_StrawStatusSummaryTool", forc
         acc.merge(TRTStrawStatusCondAlgCfg(flags))
 
     
-    kwargs.setdefault("isGEANT4", flags.GeoModel.Align.LegacyConditionsAccess or forceLegacyAccess)
+    kwargs.setdefault("isGEANT4", flags.GeoModel.Align.LegacyConditionsAccess)
 
     acc.setPrivateTools(CompFactory.TRT_StrawStatusSummaryTool(name, **kwargs))
     return acc
 
+
 def TRT_StrawNeighbourSvcCfg(flags, name="TRT_StrawNeighbourSvc", **kwargs):
     acc = ComponentAccumulator()
     acc.addService(CompFactory.TRT_StrawNeighbourSvc(name, **kwargs), primary=True)

InnerDetector/InDetDetDescr/TRT_GeoModel/python/TRT_GeoModelConfig.py

@@ -24,7 +24,7 @@ def TRT_GeoModelCfg(flags):
         trtDetectorTool.DoKryptonMixture = False
 
     from TRT_ConditionsServices.TRT_ConditionsServicesConfig import TRT_StrawStatusSummaryToolCfg
-    acc.popToolsAndMerge(TRT_StrawStatusSummaryToolCfg(flags, forceLegacyAccess=True))  # FIXME: if we set the tool, things break for unknown reasons
+    acc.popToolsAndMerge(TRT_StrawStatusSummaryToolCfg(flags))
     geoModelSvc.DetectorTools += [ trtDetectorTool ]
     acc.merge(db)
     return acc