Merge branch 'overlay/des' into 'master'

Fix tests after ReadAthenaPoolDouble changes

See merge request atlas/athena!35319

AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadDoubleSelector.py

@@ -23,6 +23,11 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 ## get a handle to the ApplicationManager
 from AthenaCommon.AppMgr import theApp
 
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
 #--------------------------------------------------------------
 # Load POOL support for DoubleEventSelector
 #--------------------------------------------------------------

AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py

@@ -24,6 +24,11 @@ from AthenaCommon.AppMgr import theApp
 ## get a handle to the ServiceManager
 from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
 #--------------------------------------------------------------
 # Load POOL support for DoubleEventSelector
 #--------------------------------------------------------------

AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py

@@ -23,6 +23,11 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 # get a handle to the ApplicationManager
 from AthenaCommon.AppMgr import theApp
 
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
 #--------------------------------------------------------------
 # Load POOL support for DoubleEventSelector
 #--------------------------------------------------------------

AtlasTest/DatabaseTest/AthenaPoolTest/share/ReadRDODoubleSelector.py

@@ -23,6 +23,11 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 ## get a handle to the ApplicationManager
 from AthenaCommon.AppMgr import theApp
 
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
 #--------------------------------------------------------------
 # Load POOL support for DoubleEventSelector
 #--------------------------------------------------------------

Event/xAOD/xAODEventInfoCnv/share/EventInfoOverlayLegacyTest.py

@@ -24,11 +24,6 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 # get a handle to the ApplicationManager
 from AthenaCommon.AppMgr import theApp
 
-#--------------------------------------------------------------
-# Load POOL support for DoubleEventSelector
-#--------------------------------------------------------------
-import AthenaPoolCnvSvc.ReadAthenaPoolDouble
-
 #--------------------------------------------------------------
 # Set flags and load det descr
 #--------------------------------------------------------------
@@ -41,6 +36,11 @@ globalflags.isOverlay.set_Value_and_Lock(True)
 overlayFlags.isDataOverlay.set_Value_and_Lock(False)
 overlayFlags.isOverlayMT.set_Value_and_Lock(True)
 
+#--------------------------------------------------------------
+# Load POOL support for DoubleEventSelector
+#--------------------------------------------------------------
+import AthenaPoolCnvSvc.ReadAthenaPoolDouble
+
 # For general flags
 rec.doAOD       = False
 rec.doTrigger   = False

Event/xAOD/xAODEventInfoCnv/share/EventInfoOverlayTest.py

@@ -24,11 +24,6 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 # get a handle to the ApplicationManager
 from AthenaCommon.AppMgr import theApp
 
-#--------------------------------------------------------------
-# Load POOL support for DoubleEventSelector
-#--------------------------------------------------------------
-import AthenaPoolCnvSvc.ReadAthenaPoolDouble
-
 #--------------------------------------------------------------
 # Set flags and load det descr
 #--------------------------------------------------------------
@@ -41,6 +36,11 @@ globalflags.isOverlay.set_Value_and_Lock(True)
 overlayFlags.isDataOverlay.set_Value_and_Lock(False)
 overlayFlags.isOverlayMT.set_Value_and_Lock(True)
 
+#--------------------------------------------------------------
+# Load POOL support for DoubleEventSelector
+#--------------------------------------------------------------
+import AthenaPoolCnvSvc.ReadAthenaPoolDouble
+
 # For general flags
 rec.doAOD       = False
 rec.doTrigger   = False