From 78a95d0d10fc6c0fe75ecfa2c3e12e47352703af Mon Sep 17 00:00:00 2001
From: tstreble <thomas.strebler@cern.ch>
Date: Tue, 21 Sep 2021 15:48:15 +0200
Subject: [PATCH] Fix ATR-24177

---
 .../TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py
index a06e0744fb20..bc3d39ff061e 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py
@@ -69,7 +69,10 @@ class ConfiguredTrackingGeometrySvc( Trk__TrackingGeometrySvc ) :
               if hasattr(ToolSvc, TrkDetFlags.InDetTrackingGeometryBuilderName()):
                   InDetTrackingGeometryBuilder = getattr(ToolSvc, TrkDetFlags.InDetTrackingGeometryBuilderName())
           else:
-              from InDetTrackingGeometry.ConfiguredStagedTrackingGeometryBuilder import ConfiguredStagedTrackingGeometryBuilder as IDGeometryBuilder
+              if not TrkDetFlags.InDetStagedGeometryBuilder():
+                  from InDetTrackingGeometry.ConfiguredInDetTrackingGeometryBuilder import ConfiguredInDetTrackingGeometryBuilder as IDGeometryBuilder
+              else:
+                  from InDetTrackingGeometry.ConfiguredStagedTrackingGeometryBuilder import ConfiguredStagedTrackingGeometryBuilder as IDGeometryBuilder
               InDetTrackingGeometryBuilder = IDGeometryBuilder(name ='InDetTrackingGeometryBuilder')
                 
           InDetTrackingGeometryBuilder.EnvelopeDefinitionSvc = AtlasEnvelopeSvc
-- 
GitLab