Merge branch 'RUN3TmpFix' into '21.3'

adjustment for Run-3 geometries

See merge request atlas/athena!10658

Former-commit-id: 75c8a4057236a8bea68a5158a5594212e7129fdd

DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py

@@ -70,7 +70,7 @@ class InDetGMFlags(CommonGMFlags, object):
         self.__dict__["SLHC"] = False
         if _layout in ['IBL'] : self.__dict__["IBL"] = True
         if self.__dict__["IBL"] == False: self.__dict__["IBLlayout"]="noIBL"
-        if _layout not in ['SLHC'] and CommonGeometryFlags.Run().lower()=="run2": self.__dict__["IBL"] = True
+        if _layout not in ['SLHC'] and ( CommonGeometryFlags.Run() in ["RUN2", "RUN3"] ) : self.__dict__["IBL"] = True
         if _layout in ['SLHC'] : self.__dict__["SLHC"] = True
 
 

InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py

@@ -7,7 +7,7 @@ from InDetRecExample.InDetKeys import InDetKeys
 
 if doAllHits:
   doDCS = False
-  if  (globalflags.DataSource() == 'data' and geoFlags.Run() == "RUN2" and conddb.dbdata == "CONDBR2"):
+  if  (globalflags.DataSource() == 'data' and ( geoFlags.Run() in ["RUN2", "RUN3"] ) and conddb.dbdata == "CONDBR2"):
      doDCS = True 
   InDetPixelMainsMon=PixelMainMon(name                = "InDetPixelMonitoringAllHits",
                                   onTrack             = False,

InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py

@@ -75,8 +75,8 @@ if DetFlags.haveRIO.pixel_on():
                 conddb.addFolder("DCS_OFL","/PIXEL/DCS/FSMSTATE")
             from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as geoFlags
             # from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as idGeoFlags
-            if (rec.doMonitoring() and globalflags.DataSource() == 'data' and geoFlags.Run() == "RUN2" and conddb.dbdata == "CONDBR2"): 
-                # idGeoFlags.isIBL() == True may work too instead of geoFlags.Run() == "RUN2"
+            if (rec.doMonitoring() and globalflags.DataSource() == 'data' and ( geoFlags.Run() in ["RUN2", "RUN3"] ) and conddb.dbdata == "CONDBR2"):
+                # idGeoFlags.isIBL() == True may work too instead of ( geoFlags.Run() in ["RUN2", "RUN3"] )
                 if not conddb.folderRequested('/PIXEL/DCS/PIPES'):
                     conddb.addFolder("DCS_OFL","/PIXEL/DCS/PIPES")
                 if not conddb.folderRequested('/PIXEL/DCS/LV'):

InnerDetector/InDetG4/TRT_G4_SD/python/TRT_G4_SDConfig.py

@@ -15,7 +15,7 @@ def getTRTSensitiveDetector(name="TRTSensitiveDetector", **kwargs):
                                                               merger_input_property)
     logicalVolumeNames = ["TRT::Gas","TRT::GasMA"]
     from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as geoFlags
-    if geoFlags.Run()=="RUN2":
+    if ( geoFlags.Run() in ["RUN2", "RUN3"] ) :
         ## RUN2 configuration
         logicalVolumeNames += ["TRT::Gas_Ar","TRT::GasMA_Ar",
                                "TRT::Gas_Kr","TRT::GasMA_Kr"]

Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfig.py

@@ -8,8 +8,8 @@ def getATLAS_RegionCreatorList():
     regionCreatorList = []
     from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
     from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
-    isUpgrade = commonGeoFlags.Run()=="RUN3" or commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
-    isRUN2 = commonGeoFlags.Run()=="RUN2" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
+    isUpgrade = commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
+    isRUN2 = (commonGeoFlags.Run() in ["RUN2", "RUN3"]) or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
 
     from G4AtlasApps.SimFlags import simFlags
     from AthenaCommon.DetFlags import DetFlags

Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfig.py

@@ -69,8 +69,8 @@ def generateInDetSensitiveDetectorList():
 
     from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
     from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
-    isUpgrade = commonGeoFlags.Run()=="RUN3" or commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
-    isRUN2 = commonGeoFlags.Run()=="RUN2" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
+    isUpgrade = commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
+    isRUN2 = (commonGeoFlags.Run() in ["RUN2", "RUN3"]) or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
     isRUN1 = not (isRUN2 or isUpgrade)
 
     from AthenaCommon.DetFlags import DetFlags

Simulation/G4Atlas/G4AtlasTools/python/G4GeometryConfig.py

@@ -64,8 +64,8 @@ def getCavernInfraGeoDetectorTool(name='CavernInfra', **kwargs):
 def getIDETEnvelope(name="IDET", **kwargs):
     from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
     from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
-    isUpgrade = commonGeoFlags.Run()=="RUN3" or commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
-    isRUN2 = commonGeoFlags.Run()=="RUN2" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
+    isUpgrade = commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
+    isRUN2 = (commonGeoFlags.Run() in ["RUN2", "RUN3"]) or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
     isRUN1 = not (isRUN2 or isUpgrade)
 
     kwargs.setdefault("DetectorName", "IDET")

Simulation/G4Atlas/G4AtlasTools/python/G4PhysicsRegionConfig.py

@@ -52,7 +52,7 @@ def getPixelPhysicsRegionTool(name='PixelPhysicsRegionTool', **kwargs):
     volumeList = ['Pixel::siLog', 'Pixel::siBLayLog']
     from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
     from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
-    if commonGeoFlags.Run()=="RUN2" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL()):
+    if (commonGeoFlags.Run() in ["RUN2", "RUN3"]) or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL()):
         volumeList += ['Pixel::dbmDiamondLog']
     kwargs.setdefault("VolumeList",  volumeList)
     kwargs.setdefault("ElectronCut", 0.05)