From f4c63d0698b4a95c70a30f0c938820d1a191558d Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Tue, 21 May 2019 15:33:36 +0200
Subject: [PATCH] Move overlay flags to a new OverlayConfiguration packages and
 make them dynamic

---
 .../AthenaConfiguration/python/AllConfigFlags.py |  6 ++++++
 .../python/testAllConfigFlags_RDO.py             |  9 +++++++++
 .../test/EventInfoOverlayLegacy_test.py          |  3 ---
 .../test/EventInfoOverlay_test.py                |  3 ---
 .../test/BCM_DigitizationConfigNew_test.py       |  2 --
 .../test/PixelDigitizationConfigNew_test.py      |  2 --
 .../test/SCT_DigitizationConfigNew_test.py       |  2 --
 .../test/TRT_DigitizationConfigNew_test.py       |  2 --
 .../InDetOverlay/test/SCTOverlayConfig_test.py   |  2 --
 .../test/CSC_DigitizationConfigNew_test.py       |  2 --
 .../test/MDT_DigitizationConfigNew_test.py       |  2 --
 .../test/RPC_DigitizationConfigNew_test.py       |  2 --
 .../test/TGC_DigitizationConfigNew_test.py       |  2 --
 .../test/DigitizationConfigNew_test.py           |  2 --
 .../Overlay/OverlayConfiguration/CMakeLists.txt  | 16 ++++++++++++++++
 .../python/OverlayConfigFlags.py                 |  8 +++-----
 .../OverlayConfiguration/python/__init__.py      |  0
 17 files changed, 34 insertions(+), 31 deletions(-)
 create mode 100644 Simulation/Overlay/OverlayConfiguration/CMakeLists.txt
 rename {Event/EventOverlay/OverlayCommonAlgs => Simulation/Overlay/OverlayConfiguration}/python/OverlayConfigFlags.py (81%)
 create mode 100644 Simulation/Overlay/OverlayConfiguration/python/__init__.py

diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index c0cdc0ddf52..e29dc1f944b 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -83,6 +83,12 @@ def _createCfgFlags():
         return createSimConfigFlags()
     _addFlagsCategory (acf, "Sim", __simulation, 'G4AtlasApps' )
 
+#Overlay Flags:
+    def __overlay():
+        from OverlayConfiguration.OverlayConfigFlags import createOverlayConfigFlags
+        return createOverlayConfigFlags()
+    _addFlagsCategory(acf, "Overlay", __overlay, 'OverlayConfiguration' )
+
 #Geo Model Flags:
     acf.addFlag('GeoModel.Layout', 'atlas') # replaces global.GeoLayout
     acf.addFlag("GeoModel.AtlasVersion", lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("Geometry","ATLAS-R2-2016-01-00-01")) #
diff --git a/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py b/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py
index 3464da83e25..421936100bc 100755
--- a/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py
+++ b/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py
@@ -15,6 +15,15 @@ except ImportError:
 if havesim:
     ConfigFlags._loadDynaFlags("Sim")
 
+# Don't fail just because OverlayConfiguration isn't present in this build.
+haveOverlay = True
+try:
+    import OverlayConfiguration # noqa: F401
+except ImportError:
+    haveOverlay = False
+if haveOverlay:
+    ConfigFlags._loadDynaFlags("Overlay")
+
 ConfigFlags.initAll()
 ConfigFlags.dump()
 
diff --git a/Event/EventOverlay/OverlayCommonAlgs/test/EventInfoOverlayLegacy_test.py b/Event/EventOverlay/OverlayCommonAlgs/test/EventInfoOverlayLegacy_test.py
index 9df87295c87..4d2b8a4c975 100755
--- a/Event/EventOverlay/OverlayCommonAlgs/test/EventInfoOverlayLegacy_test.py
+++ b/Event/EventOverlay/OverlayCommonAlgs/test/EventInfoOverlayLegacy_test.py
@@ -14,7 +14,6 @@ from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 from OverlayCommonAlgs.EventInfoOverlayConfig import EventInfoCnvAlgCfg, EventInfoOverlayCfg
 
 # Set up logging and new style config
@@ -22,8 +21,6 @@ log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 
 # Configure
-# ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG
 ConfigFlags.Input.SecondaryFiles = defaultTestFiles.HITS
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
diff --git a/Event/EventOverlay/OverlayCommonAlgs/test/EventInfoOverlay_test.py b/Event/EventOverlay/OverlayCommonAlgs/test/EventInfoOverlay_test.py
index f74b8bb7b0a..7607f4a96ba 100755
--- a/Event/EventOverlay/OverlayCommonAlgs/test/EventInfoOverlay_test.py
+++ b/Event/EventOverlay/OverlayCommonAlgs/test/EventInfoOverlay_test.py
@@ -14,7 +14,6 @@ from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 from OverlayCommonAlgs.EventInfoOverlayConfig import EventInfoCnvAlgCfg, EventInfoOverlayCfg
 
 # Set up logging and new style config
@@ -22,8 +21,6 @@ log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 
 # Configure
-# ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG
 ConfigFlags.Input.SecondaryFiles = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/TestCase_xAODEventInfo.root"]
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
index 0575f83d9eb..55a411a9549 100755
--- a/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
@@ -13,7 +13,6 @@ from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 from BCM_Digitization.BCM_DigitizationConfigNew import BCM_DigitizationCfg
 
 # Set up logging and new style config
@@ -21,7 +20,6 @@ log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
 ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.GeoModel.Align.Dynamic = False
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
index 94c4e0b8bd1..5671e1f8cda 100755
--- a/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
@@ -23,14 +23,12 @@ from PixelDigitization.PixelDigitizationConfigNew import (
     PixelDigitizationHSCfg, PixelDigitizationPUCfg, PixelDigitizationOverlayCfg,
 )
 from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 
 # Set up logging and new style config
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
 ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.GeoModel.Align.Dynamic = False
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
index 807153b9fdf..99382fa8b66 100755
--- a/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
@@ -14,14 +14,12 @@ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AtlasGeoModel.InDetGMConfig import InDetGeometryCfg
 from SCT_Digitization.SCT_DigitizationConfigNew import SCT_DigitizationHSCfg
 from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 
 # Set up logging and new style config
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
 ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.GeoModel.Align.Dynamic = False
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
index 6d04981e1a7..f45b643c1ac 100755
--- a/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
@@ -15,14 +15,12 @@ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AtlasGeoModel.InDetGMConfig import InDetGeometryCfg
 from TRT_Digitization.TRT_DigitizationConfigNew import TRT_DigitizationHSCfg
 from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 
 # Set up logging and new style config
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
 ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.GeoModel.Align.Dynamic = False
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlayConfig_test.py b/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlayConfig_test.py
index 1530c477840..939e50c33a1 100755
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlayConfig_test.py
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlayConfig_test.py
@@ -12,7 +12,6 @@ from AthenaConfiguration.MainServicesConfig import MainServicesThreadedCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 from OverlayCommonAlgs.OverlayCopyAlgsConfig import CopyMcEventCollectionCfg
 from InDetOverlay.SCTOverlayConfig import SCTOverlayCfg
 
@@ -23,7 +22,6 @@ nThreads = 1
 Configurable.configurableRun3Behavior = True
 
 ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG
 ConfigFlags.Input.SecondaryFiles = defaultTestFiles.HITS
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/test/CSC_DigitizationConfigNew_test.py b/MuonSpectrometer/MuonDigitization/CSC_Digitization/test/CSC_DigitizationConfigNew_test.py
index e8a4275eafb..6ef1d83b5f6 100755
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/test/CSC_DigitizationConfigNew_test.py
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/test/CSC_DigitizationConfigNew_test.py
@@ -11,7 +11,6 @@ from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from CSC_Digitization.CSC_DigitizationConfigNew import CSC_DigitBuilderCfg
 
@@ -23,7 +22,6 @@ ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.lock()
 # Function tests
 # Construct our accumulator to run
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/test/MDT_DigitizationConfigNew_test.py b/MuonSpectrometer/MuonDigitization/MDT_Digitization/test/MDT_DigitizationConfigNew_test.py
index 8d315f05c3f..c02ea876efe 100755
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/test/MDT_DigitizationConfigNew_test.py
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/test/MDT_DigitizationConfigNew_test.py
@@ -12,7 +12,6 @@ from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 # MDT imports
 from MDT_Digitization.MDT_DigitizationConfigNew import MDT_DigitizerCfg
 # Set up logging and new style config
@@ -23,7 +22,6 @@ ConfigFlags.Input.Files = defaultTestFiles.HITS_SPECIAL
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.lock()
 # Construct our accumulator to run
 acc = MainServicesSerialCfg()
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/test/RPC_DigitizationConfigNew_test.py b/MuonSpectrometer/MuonDigitization/RPC_Digitization/test/RPC_DigitizationConfigNew_test.py
index 66b438930d4..e15f9deb9f9 100755
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/test/RPC_DigitizationConfigNew_test.py
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/test/RPC_DigitizationConfigNew_test.py
@@ -12,7 +12,6 @@ from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 # RPC imports
 from RPC_Digitization.RPC_DigitizationConfigNew import (
     RPC_RangeToolCfg, RPC_DigitizationToolCfg, RPC_DigitizerCfg,
@@ -27,7 +26,6 @@ ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.lock()
 # Construct our accumulator to run
 acc = MainServicesSerialCfg()
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/test/TGC_DigitizationConfigNew_test.py b/MuonSpectrometer/MuonDigitization/TGC_Digitization/test/TGC_DigitizationConfigNew_test.py
index 464aab67813..4bb482664c6 100755
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/test/TGC_DigitizationConfigNew_test.py
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/test/TGC_DigitizationConfigNew_test.py
@@ -11,7 +11,6 @@ from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 # TGC imports
 from TGC_Digitization.TGC_DigitizationConfigNew import (
@@ -27,7 +26,6 @@ ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.lock()
 # Construct our accumulator to run
 acc = MainServicesSerialCfg()
diff --git a/Simulation/Digitization/test/DigitizationConfigNew_test.py b/Simulation/Digitization/test/DigitizationConfigNew_test.py
index 6f714470930..9f6cdd9ab4b 100755
--- a/Simulation/Digitization/test/DigitizationConfigNew_test.py
+++ b/Simulation/Digitization/test/DigitizationConfigNew_test.py
@@ -12,7 +12,6 @@ from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 from BCM_Digitization.BCM_DigitizationConfigNew import BCM_DigitizationCfg
 from SCT_Digitization.SCT_DigitizationConfigNew import SCT_DigitizationHSCfg
 from TRT_Digitization.TRT_DigitizationConfigNew import TRT_DigitizationHSCfg
@@ -29,7 +28,6 @@ log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
 ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.HITS_SPECIAL
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
diff --git a/Simulation/Overlay/OverlayConfiguration/CMakeLists.txt b/Simulation/Overlay/OverlayConfiguration/CMakeLists.txt
new file mode 100644
index 00000000000..df74be0661b
--- /dev/null
+++ b/Simulation/Overlay/OverlayConfiguration/CMakeLists.txt
@@ -0,0 +1,16 @@
+################################################################################
+# Package: OverlayConfiguration
+################################################################################
+
+# Declare the package name:
+atlas_subdir( OverlayConfiguration )
+
+# External dependencies:
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+
+# Check python syntax:
+atlas_add_test( flake8
+   SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
+   POST_EXEC_SCRIPT nopost.sh )
diff --git a/Event/EventOverlay/OverlayCommonAlgs/python/OverlayConfigFlags.py b/Simulation/Overlay/OverlayConfiguration/python/OverlayConfigFlags.py
similarity index 81%
rename from Event/EventOverlay/OverlayCommonAlgs/python/OverlayConfigFlags.py
rename to Simulation/Overlay/OverlayConfiguration/python/OverlayConfigFlags.py
index 73ab8f4e000..9c8060185c3 100644
--- a/Event/EventOverlay/OverlayCommonAlgs/python/OverlayConfigFlags.py
+++ b/Simulation/Overlay/OverlayConfiguration/python/OverlayConfigFlags.py
@@ -1,10 +1,11 @@
-"""Construct ConfigFlags for Overlay
+"""Construct Overlay configuration flags
 
 Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 """
+
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
 
-def createOverlayCfgFlags():
+def createOverlayConfigFlags():
     """Return an AthConfigFlags object with required flags"""
     flags = AthConfigFlags()
     # Data overlay flag
@@ -13,9 +14,6 @@ def createOverlayCfgFlags():
     flags.addFlag("Overlay.BkgPrefix", "Bkg_")
     # Overlay signal StoreGate key prefix
     flags.addFlag("Overlay.SigPrefix", "Sig_")
-    # Are we multithreaded?
-    flags.addFlag("Overlay.Legacy.MT", False)
     # Name of MC EvtStore to overlay
     flags.addFlag("Overlay.Legacy.EventStore", "BkgEvent_0_SG")
     return flags
-
diff --git a/Simulation/Overlay/OverlayConfiguration/python/__init__.py b/Simulation/Overlay/OverlayConfiguration/python/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
-- 
GitLab