Merge branch 'ATLASRECTS-5407_part_I' into 'master'

Another try to fix ATLASRECTS-5407

Closes ATLASRECTS-5407

See merge request atlas/athena!58658

(cherry picked from commit ca266cf3)

2aaedce8 Another try to fix ATLASRECTS-5407

DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py

@@ -43,10 +43,15 @@ elif ( DetFlags.detdescr.ID_on() ):
 
         GeoModelSvc.DetectorTools['SCT_DetectorTool'].useDynamicAlignFolders = InDetGeometryFlags.useDynamicAlignFolders()
 
-    if ( DetFlags.detdescr.TRT_on() ):
+    if (DetFlags.detdescr.TRT_on()):
         from TRT_GeoModel.TRT_GeoModelConf import TRT_DetectorTool
         trtDetectorTool = TRT_DetectorTool()
         trtDetectorTool.useDynamicAlignFolders = InDetGeometryFlags.useDynamicAlignFolders()
+        # Use default TRT active gas in geo model unless in simulation.
+        if not DetFlags.simulate.TRT_on():
+            trtDetectorTool.DoXenonArgonMixture = False
+            trtDetectorTool.DoKryptonMixture = False
+
         GeoModelSvc.DetectorTools += [ trtDetectorTool ]
 
     from InDetServMatGeoModel.InDetServMatGeoModelConf import InDetServMatTool

InnerDetector/InDetDetDescr/TRT_GeoModel/python/TRT_GeoModelConfig.py

@@ -14,6 +14,13 @@ def TRT_GeoModelCfg(flags):
     trtDetectorTool = CompFactory.TRT_DetectorTool()
     trtDetectorTool.GeometryDBSvc = db.getPrimary()
     trtDetectorTool.useDynamicAlignFolders = flags.GeoModel.Align.Dynamic
+    # Use default TRT active gas in geo model unless in simulation.
+    from AthenaConfiguration.Enums import Project, ProductionStep
+    if (flags.Common.Project is not Project.AthSimulation
+            and flags.Common.ProductionStep is not ProductionStep.Simulation):
+        trtDetectorTool.DoXenonArgonMixture = False
+        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
     geoModelSvc.DetectorTools += [ trtDetectorTool ]