diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py index c0cdc0ddf52c03e74e6c8c36a55223a797cd2141..e29dc1f944b814ff2cd618d95cffff639ee71c45 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 3464da83e2547abe30529785f09e28d6180f517c..421936100bc83b3ff0074b14a0fa0fce5dabf333 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 9df87295c8710088d717a24fee7abb93fb16e8c4..4d2b8a4c975bdd92949182d085f972f4d8d34d6d 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 f74b8bb7b0aac92a7845d07cf73a4f8008a8ac91..7607f4a96ba7e305aacc8b75e5dd10522f7617f6 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 0575f83d9eb6b8d86f980efaedb9c8375cd14b8c..55a411a95494e6dd424b1f3edf380b1c3d66764a 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 94c4e0b8bd1465f16fea8d23f25a9025fe35537d..5671e1f8cda1d1f3b84f11849f8cba7243cafe32 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 807153b9fdf55099898f656840185facb45fbdd9..99382fa8b661d2c30533db5a627d37bdd825bdd3 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 6d04981e1a7a4318e32020c6775f79ec073692b4..f45b643c1acd771b269f23cb9af93d8274f1e7c9 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 1530c47784092f6fac62c51b4651208b5e5a2bec..939e50c33a1f2d0687f26df57546df0b067c536b 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 e8a4275eafb5a3929b2a39fa97966c66d146ab5f..6ef1d83b5f6a908c87c19ae55eb78c377b2e1202 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 8d315f05c3f450fc80f3783082f80008c27fd6c0..c02ea876efe32012a618c915ffe4d306dfa56d19 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 66b438930d4158d823374be5fc1bd7a1853146f2..e15f9deb9f917861ed724c3b3a3ac00afd4a18d3 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 464aab67813e4ef0d1088ecef6a8d512cfd1a84a..4bb482664c64dff556da008020539808d7e9a84b 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 6f7144709301992987c899d8815c7ff42e832fdc..9f6cdd9ab4b2c7b4b2c8b3c3661b5b2120d8562f 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 0000000000000000000000000000000000000000..df74be0661b9d00dfcf75b59b65c6a8d11909218 --- /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 73ab8f4e00012eb903385f78e7a30237c8bba680..9c8060185c30e58b62fe4140632faf22e07c1ba5 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 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391