From 71f49e532ed9a84d908ba1e4b43e7985512dba46 Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Thu, 6 Mar 2025 08:45:51 +0100
Subject: [PATCH] Fix TRT detector tool
---
.../InDetDetDescr/TRT_GeoModel/python/TRT_GeoModelConfig.py | 5 +++--
.../InDetDetDescr/TRT_GeoModel/src/TRT_DetectorTool.cxx | 1 -
.../InDetDetDescr/TRT_GeoModel/src/TRT_DetectorTool.h | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/python/TRT_GeoModelConfig.py b/InnerDetector/InDetDetDescr/TRT_GeoModel/python/TRT_GeoModelConfig.py
index 7d8a1cd1285..a71eda873d0 100644
--- a/InnerDetector/InDetDetDescr/TRT_GeoModel/python/TRT_GeoModelConfig.py
+++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/python/TRT_GeoModelConfig.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
#
from AthenaConfiguration.AccumulatorCache import AccumulatorCache
@@ -24,7 +24,8 @@ def TRT_GeoModelCfg(flags):
trtDetectorTool.DoKryptonMixture = False
from TRT_ConditionsServices.TRT_ConditionsServicesConfig import TRT_StrawStatusSummaryToolCfg
- acc.popToolsAndMerge(TRT_StrawStatusSummaryToolCfg(flags))
+ trtDetectorTool.SummaryTool = acc.popToolsAndMerge(TRT_StrawStatusSummaryToolCfg(flags))
+
geoModelSvc.DetectorTools += [ trtDetectorTool ]
acc.merge(db)
return acc
diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetectorTool.cxx b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetectorTool.cxx
index 28651a2f883..ab3c2b52cd0 100755
--- a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetectorTool.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetectorTool.cxx
@@ -36,7 +36,6 @@ TRT_DetectorTool::TRT_DetectorTool( const std::string& type, const std::string&
m_initialLayout(true),
m_geoDbTagSvc("GeoDbTagSvc",name),
m_geometryDBSvc("InDetGeometryDBSvc",name),
- m_sumTool("TRT_StrawStatusSummaryTool", this),
m_doArgonMixture(1),
m_doKryptonMixture(1),
m_useDynamicAlignFolders(false),
diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetectorTool.h b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetectorTool.h
index 23b8d73875a..4ff5ea5dd3e 100755
--- a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetectorTool.h
+++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetectorTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRT_GEOMODEL_TRTDETECTORTOOL_H
@@ -53,7 +53,7 @@ public:
ServiceHandle< IGeoDbTagSvc > m_geoDbTagSvc;
ServiceHandle< IGeometryDBSvc > m_geometryDBSvc;
- ToolHandle<ITRT_StrawStatusSummaryTool> m_sumTool; // added for Argon
+ ToolHandle<ITRT_StrawStatusSummaryTool> m_sumTool{this, "SummaryTool", "TRT_StrawStatusSummaryTool"}; // added for Argon
bool m_doArgonMixture;
bool m_doKryptonMixture;
--
GitLab