Add intial ITk flags implementation, and use to steer loading of local Geometry XML files

Control/AthenaConfiguration/python/AllConfigFlags.py

@@ -167,7 +167,12 @@ def _createCfgFlags():
     def __indet():
         from InDetConfig.InDetConfigFlags import createInDetConfigFlags
         return createInDetConfigFlags()
-    _addFlagsCategory(acf, "InDet", __indet, 'InDetConfig' )    
+    _addFlagsCategory(acf, "InDet", __indet, 'InDetConfig' )
+
+    def __itk():
+        from InDetConfig.ITkConfigFlags import createITkConfigFlags
+        return createITkConfigFlags()
+    _addFlagsCategory(acf, "ITk", __itk, 'InDetConfig' )
 
     def __muon():
         from MuonConfig.MuonConfigFlags import createMuonConfigFlags

InnerDetector/InDetConfig/python/ITkConfigFlags.py

+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.AthConfigFlags import AthConfigFlags
+# TODO: clean up flags, should only contain general settings but no alg config
+# TODO : Add some exta levels?
+
+def createITkConfigFlags():
+  itkcf=AthConfigFlags()
+  itkcf.addFlag("ITk.useLocalGeometry", False) #take geometry XML files from local instance rather than Detector Database, for development
+  itkcf.addFlag("ITk.stripGeometryFilename", 'ITkStrip.gmx')
+  return itkcf

InnerDetector/InDetDetDescr/StripGeoModelXml/python/ITkStripGeoModelConfig.py

@@ -15,6 +15,9 @@ def ITkStripGeometryCfg( flags ):
     #ITkStripDetectorTool.useDynamicAlignFolders = flags.GeoModel.Align.Dynamic
     ITkStripDetectorTool.Alignable = False # make this a flag? Set true as soon as decided on folder structure
     ITkStripDetectorTool.DetectorName = "ITkStrip"
+    if flags.ITk.useLocalGeometry:
+      #Setting this filename triggers reading from local file rather than DB  
+      ITkStripDetectorTool.GmxFilename = flags.ITk.stripGeometryFilename 
     geoModelSvc.DetectorTools += [ ITkStripDetectorTool ]
     
     """