From acf99b126d1eab95547ef92aaeb7faae3d66a680 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 16 Jun 2022 15:03:55 +0200
Subject: [PATCH] Remove loadAllDynamicFlags from unit tests
Remove loadAllDynamicFlags from unit tests
The use of `loadAllDynamicFlags` is not needed and can cause unnecessary
flags loading (and errors) in projects that do not include all packages.
---
Calorimeter/CaloClusterCorrection/python/compat.py | 1 -
Calorimeter/CaloClusterCorrection/test/config_t.py | 1 -
Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py | 1 -
Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py | 1 -
Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py | 1 -
Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py | 1 -
Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py | 1 -
Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py | 1 -
Calorimeter/CaloRec/python/ToolConstantsCondAlgConfig.py | 1 -
Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py | 1 -
.../EventSelectorAthenaPool/python/CondProxyProviderConfig.py | 1 -
Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py | 1 -
InnerDetector/InDetConfig/python/BackTrackingConfig.py | 1 -
InnerDetector/InDetConfig/python/SiliconPreProcessing.py | 1 -
InnerDetector/InDetConfig/python/TRTStandaloneConfig.py | 1 -
InnerDetector/InDetConfig/python/TrackingPassFlags.py | 1 -
LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py | 1 -
LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py | 1 -
LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py | 1 -
LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py | 1 -
LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py | 1 -
LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py | 1 -
LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py | 1 -
.../FastCaloSim/python/AddNoiseCellBuilderToolConfig.py | 1 -
Tracking/TrkConfig/python/SolenoidalIntersectorConfig.py | 1 -
Tracking/TrkConfig/python/TrackCollectionReadConfig.py | 1 -
.../TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py | 1 -
27 files changed, 27 deletions(-)
diff --git a/Calorimeter/CaloClusterCorrection/python/compat.py b/Calorimeter/CaloClusterCorrection/python/compat.py
index b39ea379975..7562aa2eb55 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 0652d5b909d..3370e454555 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 97248151291..d5f4fa8b22b 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 1d0a6748160..4fc32b1eb4a 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 ce039c60d81..ff31548f2a9 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 6414c8c2140..812e86a03d7 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 7f4718a32cc..6dc5df9370d 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 971c9a123da..e5b4640cc51 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 fda767a52cc..eb2d658e05e 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 018eb35a0cd..bd66d77dcaf 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 f35adab21e1..14af6c69f45 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 37008c2393b..cc26c2ba406 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 bbd8696ab5a..17d35d5a9cd 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 770980a8379..dd9a5a2f622 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 45d54283f88..901fc23e5e9 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 7879da9dc80..79ccee0220f 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 f5aac146b77..ddbfff8ebe3 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 fd19c2461ff..e90605abad3 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 9f56642f71d..9d5d7c3f653 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 e2044a8e302..502ff79414f 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 bbb5dfb6ec9..be2c0f70c56 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 32ff027b904..471d1db14e3 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 3b0f177640a..ec9713a8053 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 2d31cc3e5b5..61e241dc260 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 15342596618..909ebd2c610 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 31f44010839..d5f42e8d7e1 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 323ee0be61b..7316b6f429e 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")
--
GitLab