diff --git a/Calorimeter/CaloClusterCorrection/python/compat.py b/Calorimeter/CaloClusterCorrection/python/compat.py
index b39ea3799756db0538ab4f3666d002f5d84f7534..7562aa2eb550502c2d227ce2b718ab0300aacb39 100644
--- a/Calorimeter/CaloClusterCorrection/python/compat.py
+++ b/Calorimeter/CaloClusterCorrection/python/compat.py
@@ -20,7 +20,6 @@ import string
#
def makeFlags():
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.loadAllDynamicFlags()
flags = ConfigFlags.clone()
from CaloClusterCorrection.CaloClusterCorrectionFlags \
diff --git a/Calorimeter/CaloClusterCorrection/test/config_t.py b/Calorimeter/CaloClusterCorrection/test/config_t.py
index 0652d5b909dd4cf7feb261dd71c07a7c5c4f0999..3370e454555f17331b56195e7e83344b2bb532de 100644
--- a/Calorimeter/CaloClusterCorrection/test/config_t.py
+++ b/Calorimeter/CaloClusterCorrection/test/config_t.py
@@ -1081,7 +1081,6 @@ def test23 (flags_in):
from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.AllConfigFlags import ConfigFlags
-ConfigFlags.loadAllDynamicFlags()
ConfigFlags.Input.Files = defaultTestFiles.RAW
ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-05"
diff --git a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
index 97248151291b0d38edbccb42a51618b9b9f267c5..d5f4fa8b22ba59cbf7ef42e0dcf676a6a52c742f 100644
--- a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
@@ -28,7 +28,6 @@ def CaloBCIDAvgAlgCfg (flags):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.loadAllDynamicFlags()
only = ['CaloBCIDAvgAlg',
'CaloBCIDCoeffsCondAlg',
diff --git a/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py
index 1d0a6748160d2e6cd697fb4319293ee2b5b4b255..4fc32b1eb4a8412e54d17569ef30d4b3434362aa 100644
--- a/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py
@@ -68,7 +68,6 @@ def CaloBCIDCoeffsCondAlgCfg (flags):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
only = ['CaloBCIDCoeffsCondAlg',
'LArPileUpAvgSymCondAlg',
diff --git a/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py
index ce039c60d81872c44784dff9a67e653117b49152..ff31548f2a9eef13510f63cadc973bf4280b5fba 100644
--- a/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py
@@ -38,7 +38,6 @@ def CaloBCIDLumiCondAlgCfg (flags):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
only = ['CaloBCIDCoeffsCondAlg',
'CaloBCIDLumiCondAlg',
diff --git a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py
index 6414c8c214061955522d594e0d70e5420e74dc63..812e86a03d7c920d2fe203588d145ff6c9653fcb 100644
--- a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py
@@ -23,7 +23,6 @@ def CaloCellContainerAliasAlgCfg (flags, alias, cells = 'AllCalo'):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
only = ['CaloCellContainerAliasAlg_myalias',
]
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py
index 7f4718a32cc4397e52d1669b767c33ab64e541a2..6dc5df9370deec7bb630842fce1bad8c4c095ef0 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py
@@ -26,7 +26,6 @@ def CaloThinCellsByClusterAlgCfg(flags, streamName, clusters,
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
only = ['CaloThinCellsByClusterAlg_myclusters',
]
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py
index 971c9a123da8984a4e08748f2631a7c5378aff87..e5b4640cc51e5875eb0c83bf193e2f48ec8d32ec 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py
@@ -32,7 +32,6 @@ def CaloThinCellsBySamplingAlgCfg (flags, streamName,
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
only = ['CaloThinCellsBySamplingAlg_TileGap3',
]
diff --git a/Calorimeter/CaloRec/python/ToolConstantsCondAlgConfig.py b/Calorimeter/CaloRec/python/ToolConstantsCondAlgConfig.py
index fda767a52cc71ae3240998b083a5ec29728bf55f..eb2d658e05e4c7949d4f07b14da5f85e30864e03 100644
--- a/Calorimeter/CaloRec/python/ToolConstantsCondAlgConfig.py
+++ b/Calorimeter/CaloRec/python/ToolConstantsCondAlgConfig.py
@@ -38,7 +38,6 @@ def ToolConstantsCondAlgCfg (flags, key, DetStoreKey='', COOLFolder=''):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
ConfigFlags.Input.Files = []
- ConfigFlags.loadAllDynamicFlags()
flags = ConfigFlags.clone()
flags.lock()
diff --git a/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py b/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py
index 018eb35a0cdd06283da23a1efb04d2dac625e8fa..bd66d77dcaf0b8e01a37a90caaa5802cb72c3db4 100644
--- a/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py
+++ b/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py
@@ -61,7 +61,6 @@ def CaloEstimatedGainToolCfg (configFlags):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
flags1 = ConfigFlags.clone()
flags1.Input.Files = defaultTestFiles.RDO_RUN2
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/python/CondProxyProviderConfig.py b/Database/AthenaPOOL/EventSelectorAthenaPool/python/CondProxyProviderConfig.py
index f35adab21e16caf0a22f90b1821c96caa1c8c2a4..14af6c69f4566d7ea38a157d627f8ecca5ee5b50 100644
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/python/CondProxyProviderConfig.py
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/python/CondProxyProviderConfig.py
@@ -30,7 +30,6 @@ if __name__ == "__main__":
from AthenaConfiguration.Enums import LHCPeriod
ConfigFlags.Input.Files = []
ConfigFlags.GeoModel.Run = LHCPeriod.Run2 # flags validation workaround
- ConfigFlags.loadAllDynamicFlags()
flags1 = ConfigFlags.clone()
flags1.lock()
diff --git a/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py b/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py
index 37008c2393b98127d6748d66011711166d997e5b..cc26c2ba4067284658efab168e87907af73ddd7b 100644
--- a/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py
+++ b/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py
@@ -45,7 +45,6 @@ def BunchLumisCondAlgCfg (configFlags):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
print ('--- data')
flags1 = ConfigFlags.clone()
diff --git a/InnerDetector/InDetConfig/python/BackTrackingConfig.py b/InnerDetector/InDetConfig/python/BackTrackingConfig.py
index bbd8696ab5a2be7b155f48f06c099994431d5649..17d35d5a9cd78396b7b67ff6dd981d8f8bce744f 100644
--- a/InnerDetector/InDetConfig/python/BackTrackingConfig.py
+++ b/InnerDetector/InDetConfig/python/BackTrackingConfig.py
@@ -41,7 +41,6 @@ if __name__ == "__main__":
flags.Concurrency.NumThreads=numThreads
flags.Concurrency.NumConcurrentEvents=numThreads
- flags.loadAllDynamicFlags()
flags = flags.cloneAndReplace("InDet.Tracking.ActivePass","InDet.Tracking.MainPass")
flags.lock()
diff --git a/InnerDetector/InDetConfig/python/SiliconPreProcessing.py b/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
index 770980a837980ef8ece9715b5230e301d13dc55f..dd9a5a2f622681a93e42e5253cfd1f3bd6bd91c5 100644
--- a/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
+++ b/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
@@ -143,7 +143,6 @@ if __name__ == "__main__":
ConfigFlags.Concurrency.NumThreads=numThreads
ConfigFlags.Concurrency.NumConcurrentEvents=numThreads
- ConfigFlags.loadAllDynamicFlags()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
index 45d54283f8873bca90865a814c0bfc8f662d10c5..901fc23e5e9bf924ecc430205aebcbfb324d40b6 100644
--- a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
@@ -188,7 +188,6 @@ if __name__ == "__main__":
ConfigFlags.Concurrency.NumThreads=numThreads
ConfigFlags.Concurrency.NumConcurrentEvents=numThreads
- ConfigFlags.loadAllDynamicFlags()
ConfigFlags.lock()
ConfigFlags.dump()
diff --git a/InnerDetector/InDetConfig/python/TrackingPassFlags.py b/InnerDetector/InDetConfig/python/TrackingPassFlags.py
index 7879da9dc80ceb9f03c61e6a30d6df2e5ea94315..79ccee0220f713ef0ca77ffb6739e9a5738e9074 100644
--- a/InnerDetector/InDetConfig/python/TrackingPassFlags.py
+++ b/InnerDetector/InDetConfig/python/TrackingPassFlags.py
@@ -1079,7 +1079,6 @@ if __name__ == "__main__":
l = logging.getLogger('AthConfigFlags')
from AthenaCommon.Constants import WARNING
l.setLevel(WARNING)
- ConfigFlags.loadAllDynamicFlags()
ConfigFlags = ConfigFlags.cloneAndReplace("InDet.Tracking.ActivePass","InDet.Tracking.MainPass")
diff --git a/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py b/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
index f5aac146b7730b1ef2f53ed72927eb6039b985e0..ddbfff8ebe3fdd12397886d439ccf693551ffec0 100644
--- a/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
+++ b/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
@@ -218,7 +218,6 @@ def LArElecCalibDBMCSCCfg(ConfigFlags,folders):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
print ('--- run2')
flags1 = ConfigFlags.clone()
diff --git a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
index fd19c2461ffcf96182db45124a81146267afd6ae..e90605abad348719adf73d687c24ca9a5b153379 100644
--- a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
@@ -42,7 +42,6 @@ def LArADC2MeVCondAlgCfg(configFlags):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
print ('--- data')
flags1 = ConfigFlags.clone()
diff --git a/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py b/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py
index 9f56642f71de73165df0714fc09f55bc702359b3..9d5d7c3f65395de2136d8bbc12be7e194854298a 100644
--- a/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py
@@ -42,7 +42,6 @@ def LArADC2MeVSCCondAlgCfg(configFlags):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
print ('--- data')
flags1 = ConfigFlags.clone()
diff --git a/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py b/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
index e2044a8e302c121a7dfeeb87ddf3b6cea83b5117..502ff79414faa9ea614d621abbecc44407238ab3 100644
--- a/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
@@ -204,7 +204,6 @@ def LArRoIMapCondAlgCfg (flags, name = 'LArRoIMapCondAlg', **kwargs):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
print ('--- LArOFCCondAlg 1')
flags1 = ConfigFlags.clone()
diff --git a/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py b/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py
index bbb5dfb6ec9e5d9637295605c57cc3dd1bbe7331..be2c0f70c56b03429b76420df24646b9e2b31583 100644
--- a/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py
+++ b/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py
@@ -36,7 +36,6 @@ if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = []
- ConfigFlags.loadAllDynamicFlags()
print ('--- collisions')
flags1 = ConfigFlags.clone()
diff --git a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py
index 32ff027b904183cf30b996c8ab8ea7b78abcc4fd..471d1db14e365ae6d8f98062427821cc2f7e0ec6 100644
--- a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py
+++ b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py
@@ -194,7 +194,6 @@ def luminosityCondAlgOnlineCfg (configFlags, name, result):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
print ('--- run2')
flags1 = ConfigFlags.clone()
diff --git a/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py b/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py
index 3b0f177640aaf736aab577a06b97d9539707775f..ec9713a805337278c4bfbe1e286ce728170ab6b6 100644
--- a/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py
+++ b/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py
@@ -45,7 +45,6 @@ def TrigLiveFractionCondAlgCfg (configFlags):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
print ('--- run2')
flags1 = ConfigFlags.clone()
diff --git a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py
index 2d31cc3e5b5c6b377ba3ad159791d18a630d72f1..61e241dc260f3eccd5bcd27bbc627ff9b2895d06 100644
--- a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py
+++ b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py
@@ -38,7 +38,6 @@ def AddNoiseCellBuilderToolCfg (configFlags):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
flags1 = ConfigFlags.clone()
flags1.Input.Files = defaultTestFiles.HITS_RUN2
diff --git a/Tracking/TrkConfig/python/SolenoidalIntersectorConfig.py b/Tracking/TrkConfig/python/SolenoidalIntersectorConfig.py
index 15342596618e389ee31df10b1b6ba27df6a1aac7..909ebd2c61064dcda44db0cc668a90ba9d319921 100644
--- a/Tracking/TrkConfig/python/SolenoidalIntersectorConfig.py
+++ b/Tracking/TrkConfig/python/SolenoidalIntersectorConfig.py
@@ -21,7 +21,6 @@ def SolenoidalIntersectorCfg(flags, name='SolenoidalIntersector', **kwargs):
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.loadAllDynamicFlags()
flags1 = ConfigFlags.clone()
acc1 = SolenoidalIntersectorCfg (flags1)
diff --git a/Tracking/TrkConfig/python/TrackCollectionReadConfig.py b/Tracking/TrkConfig/python/TrackCollectionReadConfig.py
index 31f440108393d07899c7599ceb3a242b730e227f..d5f42e8d7e1b7bffc4a134a75e4ac856979e8469 100644
--- a/Tracking/TrkConfig/python/TrackCollectionReadConfig.py
+++ b/Tracking/TrkConfig/python/TrackCollectionReadConfig.py
@@ -77,7 +77,6 @@ in the input file."""
if __name__ == "__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
- ConfigFlags.loadAllDynamicFlags()
print ('--- Reference aliased object by base name.')
flags1 = ConfigFlags.clone()
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py
index 323ee0be61ba782a876963669fabc907a1bd52d7..7316b6f429e8fe029b943dfb6c8fbccd1f179641 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py
@@ -78,7 +78,6 @@ class FlagsCopiedTest(unittest.TestCase):
flags.Trigger.doID
flags.Trigger.InDetTracking.Muon
flags.Trigger.InDetTracking.Electron.minPT = 2.0 * Units.GeV
- flags.loadAllDynamicFlags()
self.newflags = flags.cloneAndReplace('InDet.Tracking.ActivePass', 'Trigger.InDetTracking.Electron')
self.newflags.dump(".*InDet")