diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py index 05b9bb033e646469b1485b9f733c0795ed522ee6..e71fe41e31f8756627f47996973c1aa15f1e97c1 100755 --- a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py +++ b/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 diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/python/TRT_GeoModelConfig.py b/InnerDetector/InDetDetDescr/TRT_GeoModel/python/TRT_GeoModelConfig.py index c00c15470663414dbb8f5a504c68d0317aa6bb23..342752d70e5945115c2417ef95d168b6ab1b08a5 100644 --- a/InnerDetector/InDetDetDescr/TRT_GeoModel/python/TRT_GeoModelConfig.py +++ b/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 ]