Merge branch 'Sweep23701to21.3' into '21.3'

Manual sweep of !27031 from master to 21.3: Fix for sTGC and MM in Data Overlay

See merge request atlas/athena!27397

Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayBS_tf.py

@@ -168,6 +168,18 @@ else:
     #DetFlags.overlay.LAr_setOff()
     DetFlags.overlay.Truth_setOn()
 
+## Tidy up NSW DetFlags: temporary measure
+DetFlags.sTGC_setOff()
+DetFlags.Micromegas_setOff()
+from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags
+if (CommonGeometryFlags.Run() in ["RUN3", "RUN4"]):
+    DetFlags.sTGC_setOn()
+    DetFlags.Micromegas_setOn()
+
+from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
+if not MuonGeometryFlags.hasCSC():
+    DetFlags.CSC_setOff()
+
 DetFlags.Print()
 
 include ( "RecExCond/AllDet_detDescr.py" )

Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.OverlayPool_tf.py

@@ -90,6 +90,18 @@ else:
 
     DetFlags.digitize.LVL1_setOff()
 
+## Tidy up NSW DetFlags: temporary measure
+DetFlags.sTGC_setOff()
+DetFlags.Micromegas_setOff()
+from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags
+if (CommonGeometryFlags.Run() in ["RUN3", "RUN4"]):
+    DetFlags.sTGC_setOn()
+    DetFlags.Micromegas_setOn()
+
+from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
+if not MuonGeometryFlags.hasCSC():
+    DetFlags.CSC_setOff()
+
 DetFlags.Print()
 
 globalflags.DataSource.set_Value_and_Lock('geant4')