Move ITk.useLocalGeometry to GeoModel.useLocalGeometry

Control/AthenaConfiguration/python/GeoModelConfigFlags.py

@@ -33,4 +33,6 @@ def createGeoModelConfigFlags():
                 lambda prevFlags : DetDescrInfo(prevFlags.GeoModel.AtlasVersion)['Pixel']['IBLlayout'])
                 # IBL layer layout  in {"planar", "3D", "noIBL"}
 
+    gcf.addFlag("GeoModel.useLocalGeometry", False)  # use local XML files for development
+
     return gcf

DetectorDescription/DetDescrCnvSvc/python/DetDescrCnvSvcConfig.py

@@ -9,7 +9,7 @@ def DetDescrCnvSvcCfg(flags, **kwargs):
     kwargs.setdefault("HasSTgc", flags.Detector.GeometrysTGC)
     kwargs.setdefault("HasMM", flags.Detector.GeometryMM)
 
-    if flags.ITk.useLocalGeometry:
+    if flags.GeoModel.useLocalGeometry:
         kwargs.setdefault("IdDictFromRDB", False)
         kwargs.setdefault("InDetIDFileName", "ITKLayouts/IdDictInnerDetector_ITK_LOCAL.xml")
         kwargs.setdefault("MuonIDFileName", "IdDictParser/IdDictMuonSpectrometer_R.09.NSW.xml")

InnerDetector/InDetConfig/python/ITkConfigFlags.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
 # TODO : Add some exta levels?
@@ -7,7 +7,6 @@ def createITkConfigFlags():
   itkcf = AthConfigFlags()
 
   # take geometry XML files from local instance rather than Detector Database, for development
-  itkcf.addFlag("ITk.useLocalGeometry", False)
   itkcf.addFlag("ITk.pixelGeometryFilename", "ITKLayouts/PixelGeoModelXml/ITkPixel.gmx")
   itkcf.addFlag("ITk.stripGeometryFilename", "ITKLayouts/Strip/ITkStrip.gmx")
 

InnerDetector/InDetConfig/test/ITkTest.py

@@ -20,7 +20,7 @@ Configurable.configurableRun3Behavior = True
 def defaultTestFlags(configFlags, args):
     """Fill default ITk flags for testing"""
     if args.localgeo:
-        configFlags.ITk.useLocalGeometry = True
+        configFlags.GeoModel.useLocalGeometry = True
 
     configFlags.Input.Files = [args.inputevntfile]
     

InnerDetector/InDetDetDescr/PixelGeoModelXml/python/ITkPixelGeoModelConfig.py

@@ -16,7 +16,7 @@ def ITkPixelGeometryCfg(flags):
     # ITkPixelDetectorTool.useDynamicAlignFolders = flags.GeoModel.Align.Dynamic
     ITkPixelDetectorTool.Alignable = False # make this a flag? Set true as soon as decided on folder structure
     ITkPixelDetectorTool.DetectorName = "ITkPixel"
-    if flags.ITk.useLocalGeometry:
+    if flags.GeoModel.useLocalGeometry:
       # Setting this filename triggers reading from local file rather than DB
       ITkPixelDetectorTool.GmxFilename = flags.ITk.pixelGeometryFilename
     geoModelSvc.DetectorTools += [ ITkPixelDetectorTool ]

InnerDetector/InDetDetDescr/StripGeoModelXml/python/ITkStripGeoModelConfig.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentFactory import CompFactory
 from AthenaConfiguration.Enums import ProductionStep
@@ -15,7 +15,7 @@ def ITkStripGeometryCfg( flags ):
     #ITkStripDetectorTool.useDynamicAlignFolders = flags.GeoModel.Align.Dynamic #Will we need to do dynamic alignment for ITk?
     ITkStripDetectorTool.Alignable = False # make this a flag? Set true as soon as decided on folder structure
     ITkStripDetectorTool.DetectorName = "ITkStrip"
-    if flags.ITk.useLocalGeometry:
+    if flags.GeoModel.useLocalGeometry:
       #Setting this filename triggers reading from local file rather than DB  
       ITkStripDetectorTool.GmxFilename = flags.ITk.stripGeometryFilename 
     geoModelSvc.DetectorTools += [ ITkStripDetectorTool ]

Simulation/Tools/HitAnalysis/tools/RunHitAnalysis.py

@@ -41,7 +41,7 @@ print()
 # Configure
 ConfigFlags.Input.Files = [args.input]
 if args.localgeo:
-    ConfigFlags.ITk.useLocalGeometry = True
+    ConfigFlags.GeoModel.useLocalGeometry = True
 if args.detectors:
     from AthenaConfiguration.DetectorConfigFlags import setupDetectorsFromList
     setupDetectorsFromList(ConfigFlags, args.detectors, toggle_geometry=True)