From ee63f7176504a659c23f0aca8cb34c7a6a38c5fb Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Tue, 7 Jun 2022 08:46:31 +0200 Subject: [PATCH 1/4] Overlay: remove redundant setting of configurableRun3Behavior in tests --- .../OverlayConfiguration/python/OverlaySkeleton.py | 3 --- .../test/OverlayMetadataConfig_test.py | 6 +----- .../Overlay/OverlayConfiguration/test/OverlayTest.py | 8 +------- .../Overlay/OverlayCopyAlgs/test/OverlayCopyAlgs_test.py | 6 +----- 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/Simulation/Overlay/OverlayConfiguration/python/OverlaySkeleton.py b/Simulation/Overlay/OverlayConfiguration/python/OverlaySkeleton.py index ee1e460a6b2..25b3b0e3b5e 100644 --- a/Simulation/Overlay/OverlayConfiguration/python/OverlaySkeleton.py +++ b/Simulation/Overlay/OverlayConfiguration/python/OverlaySkeleton.py @@ -54,9 +54,6 @@ def setOverlayInputFiles(runArgs, configFlags, log): def fromRunArgs(runArgs): - from AthenaCommon.Configurable import Configurable - Configurable.configurableRun3Behavior = True - from AthenaCommon.Logging import logging logOverlay = logging.getLogger('Overlay') logOverlay.info('****************** STARTING OVERLAY *****************') diff --git a/Simulation/Overlay/OverlayConfiguration/test/OverlayMetadataConfig_test.py b/Simulation/Overlay/OverlayConfiguration/test/OverlayMetadataConfig_test.py index c71c2ef052e..fdd793d0dc4 100755 --- a/Simulation/Overlay/OverlayConfiguration/test/OverlayMetadataConfig_test.py +++ b/Simulation/Overlay/OverlayConfiguration/test/OverlayMetadataConfig_test.py @@ -1,11 +1,10 @@ #!/usr/bin/env python """Run tests for overlay metadata -Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration """ import sys -from AthenaCommon.Configurable import Configurable from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.MainServicesConfig import MainServicesCfg from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg @@ -14,9 +13,6 @@ from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoOverlayCfg from OverlayConfiguration.OverlayMetadata import overlayMetadataCheck, overlayMetadataWrite from OverlayConfiguration.OverlayTestHelpers import defaultTestFlags, postprocessAndLockFlags, printAndRun, CommonTestArgumentParser -# Set up logging and new style config -Configurable.configurableRun3Behavior = True - # Argument parsing parser = CommonTestArgumentParser("OverlayMetadataConfig_test.py") args = parser.parse_args() diff --git a/Simulation/Overlay/OverlayConfiguration/test/OverlayTest.py b/Simulation/Overlay/OverlayConfiguration/test/OverlayTest.py index dac3275804c..35557458532 100755 --- a/Simulation/Overlay/OverlayConfiguration/test/OverlayTest.py +++ b/Simulation/Overlay/OverlayConfiguration/test/OverlayTest.py @@ -1,13 +1,10 @@ #!/usr/bin/env python """Run tests for MC+MC or MC+data overlay -Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration """ -from __future__ import print_function - import sys -from AthenaCommon.Configurable import Configurable from AthenaConfiguration.AllConfigFlags import ConfigFlags from Digitization.DigitizationSteering import DigitizationMessageSvcCfg @@ -16,9 +13,6 @@ from OverlayConfiguration.OverlayTestHelpers import \ CommonTestArgumentParser, OverlayJobOptsDumperCfg, \ defaultTestFlags, postprocessAndLockFlags, printAndRun -# Set up logging and new style config -Configurable.configurableRun3Behavior = True - # Argument parsing parser = CommonTestArgumentParser("OverlayTest.py") parser.add_argument("detectors", metavar="detectors", type=str, nargs="*", diff --git a/Simulation/Overlay/OverlayCopyAlgs/test/OverlayCopyAlgs_test.py b/Simulation/Overlay/OverlayCopyAlgs/test/OverlayCopyAlgs_test.py index b11f1ff0ed9..89b5a16ce94 100755 --- a/Simulation/Overlay/OverlayCopyAlgs/test/OverlayCopyAlgs_test.py +++ b/Simulation/Overlay/OverlayCopyAlgs/test/OverlayCopyAlgs_test.py @@ -1,11 +1,10 @@ #!/usr/bin/env python """Run tests on OverlayCopyAlgsConfig.py -Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration """ import sys -from AthenaCommon.Configurable import Configurable from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.MainServicesConfig import MainServicesCfg from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg @@ -16,9 +15,6 @@ from OverlayCopyAlgs.OverlayCopyAlgsConfig import \ CopyTimingsCfg, CopyTrackRecordCollectionsCfg from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoOverlayCfg -# Configure -Configurable.configurableRun3Behavior = True - # Argument parsing parser = CommonTestArgumentParser("OverlayCopyAlgs_test.py") args = parser.parse_args() -- GitLab From 14f1473380067e238bebe8ee011942f1067667d5 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Tue, 7 Jun 2022 08:46:38 +0200 Subject: [PATCH 2/4] ISF: remove redundant setting of configurableRun3Behavior in tests --- Simulation/ISF/ISF_Config/test/ISF_MainConfigNew_Test.py | 4 +--- .../ISF_Services/test/ISF_ServicesConfigNew_test.py | 7 ++----- .../test/FastCaloSimServicesTest.py | 5 +---- .../ISF_FatrasServices/python/ISF_FatrasConfig.py | 2 -- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Simulation/ISF/ISF_Config/test/ISF_MainConfigNew_Test.py b/Simulation/ISF/ISF_Config/test/ISF_MainConfigNew_Test.py index 1cf1b35a6fa..bbf6b6bb165 100644 --- a/Simulation/ISF/ISF_Config/test/ISF_MainConfigNew_Test.py +++ b/Simulation/ISF/ISF_Config/test/ISF_MainConfigNew_Test.py @@ -12,12 +12,10 @@ if __name__ == '__main__': from AthenaConfiguration.MainServicesConfig import MainServicesCfg - # Set up logging and config behaviour + # Set up logging from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable log.setLevel(DEBUG) - Configurable.configurableRun3Behavior = 1 #import and set config flags diff --git a/Simulation/ISF/ISF_Core/ISF_Services/test/ISF_ServicesConfigNew_test.py b/Simulation/ISF/ISF_Core/ISF_Services/test/ISF_ServicesConfigNew_test.py index b3d65b5d01f..bd7856169d2 100755 --- a/Simulation/ISF/ISF_Core/ISF_Services/test/ISF_ServicesConfigNew_test.py +++ b/Simulation/ISF/ISF_Core/ISF_Services/test/ISF_ServicesConfigNew_test.py @@ -1,18 +1,15 @@ #!/usr/bin/env python """Run tests on ISF_ServicesConfigNew.py -Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration """ if __name__ == '__main__': from AthenaConfiguration.MainServicesConfig import MainServicesCfg - import os - # Set up logging and config behaviour + # Set up logging from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable log.setLevel(DEBUG) - Configurable.configurableRun3Behavior = 1 #import config flags diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/test/FastCaloSimServicesTest.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/test/FastCaloSimServicesTest.py index f5d2d66e61c..d1c045989c8 100755 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/test/FastCaloSimServicesTest.py +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/test/FastCaloSimServicesTest.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """Run tests for FastCaloSimServices configuration -Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration """ @@ -73,12 +73,9 @@ if __name__ == '__main__': ) - from AthenaCommon.Configurable import Configurable from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.ComponentFactory import CompFactory - # Set up new style config - Configurable.configurableRun3Behavior = True # Configure args = CommonTestArgumentParser().parse_args() defaultTestFlags(ConfigFlags, args) diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py index dd28bb2a8fc..dbdce5ae862 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py @@ -780,9 +780,7 @@ if __name__ == "__main__": from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable from AthenaConfiguration.TestDefaults import defaultTestFiles - Configurable.configurableRun3Behavior = 1 log.setLevel(DEBUG) -- GitLab From 97a8b215f0f0976dd312ace3dcc928bd5ded0f54 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Tue, 7 Jun 2022 08:46:48 +0200 Subject: [PATCH 3/4] G4Atlas: remove redundant setting of configurableRun3Behavior in tests --- .../G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfigNew_Test.py | 4 +--- .../G4AtlasServices/test/G4AtlasFieldServices_test.py | 6 ++---- .../G4AtlasServices/test/G4AtlasServicesConfig_test.py | 4 +--- Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py | 2 -- .../G4AtlasTools/test/G4AtlasToolsConfigNew_test.py | 4 +--- .../G4Atlas/G4AtlasTools/test/G4FieldConfig_test.py | 8 ++------ .../G4AtlasTools/test/G4GeometryToolConfig_Simtest.py | 6 ++---- .../G4AtlasTools/test/G4GeometryToolConfig_test.py | 7 ++----- .../G4AtlasTools/test/G4PhysicsRegionConfig_test.py | 8 ++------ 9 files changed, 13 insertions(+), 36 deletions(-) diff --git a/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfigNew_Test.py b/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfigNew_Test.py index 4a0185b7ac8..639984c1375 100755 --- a/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfigNew_Test.py +++ b/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfigNew_Test.py @@ -12,12 +12,10 @@ if __name__ == '__main__': from AthenaConfiguration.MainServicesConfig import MainServicesCfg - # Set up logging and config behaviour + # Set up logging from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable log.setLevel(DEBUG) - Configurable.configurableRun3Behavior = 1 #import and set config flags diff --git a/Simulation/G4Atlas/G4AtlasServices/test/G4AtlasFieldServices_test.py b/Simulation/G4Atlas/G4AtlasServices/test/G4AtlasFieldServices_test.py index 9991458d146..6a2e1d6c200 100755 --- a/Simulation/G4Atlas/G4AtlasServices/test/G4AtlasFieldServices_test.py +++ b/Simulation/G4Atlas/G4AtlasServices/test/G4AtlasFieldServices_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """Run tests on G4AtlasFieldServices -Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration from __future__ import print_function """ @@ -9,12 +9,10 @@ if __name__ == '__main__': from AthenaConfiguration.MainServicesConfig import MainServicesCfg import os - # Set up logging and config behaviour + # Set up logging from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable log.setLevel(DEBUG) - Configurable.configurableRun3Behavior = 1 #import config flags diff --git a/Simulation/G4Atlas/G4AtlasServices/test/G4AtlasServicesConfig_test.py b/Simulation/G4Atlas/G4AtlasServices/test/G4AtlasServicesConfig_test.py index e73569b975c..240b6ecd678 100755 --- a/Simulation/G4Atlas/G4AtlasServices/test/G4AtlasServicesConfig_test.py +++ b/Simulation/G4Atlas/G4AtlasServices/test/G4AtlasServicesConfig_test.py @@ -7,12 +7,10 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration if __name__ == '__main__': from AthenaConfiguration.MainServicesConfig import MainServicesCfg - # Set up logging and config behaviour + # Set up logging from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable log.setLevel(DEBUG) - Configurable.configurableRun3Behavior = 1 #import config flags diff --git a/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py b/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py index 553445fd04c..9b350f685cf 100644 --- a/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py +++ b/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py @@ -116,9 +116,7 @@ if __name__ == "__main__": from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable from AthenaConfiguration.TestDefaults import defaultTestFiles - Configurable.configurableRun3Behavior = 1 log.setLevel(DEBUG) diff --git a/Simulation/G4Atlas/G4AtlasTools/test/G4AtlasToolsConfigNew_test.py b/Simulation/G4Atlas/G4AtlasTools/test/G4AtlasToolsConfigNew_test.py index 7df676f70df..c1d827cec59 100755 --- a/Simulation/G4Atlas/G4AtlasTools/test/G4AtlasToolsConfigNew_test.py +++ b/Simulation/G4Atlas/G4AtlasTools/test/G4AtlasToolsConfigNew_test.py @@ -7,12 +7,10 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration if __name__ == '__main__': from AthenaConfiguration.MainServicesConfig import MainServicesCfg - # Set up logging and config behaviour + # Set up logging from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable log.setLevel(DEBUG) - Configurable.configurableRun3Behavior = 1 #import config flags diff --git a/Simulation/G4Atlas/G4AtlasTools/test/G4FieldConfig_test.py b/Simulation/G4Atlas/G4AtlasTools/test/G4FieldConfig_test.py index b8e99f2af56..fcb9a054d79 100755 --- a/Simulation/G4Atlas/G4AtlasTools/test/G4FieldConfig_test.py +++ b/Simulation/G4Atlas/G4AtlasTools/test/G4FieldConfig_test.py @@ -1,21 +1,17 @@ #!/usr/bin/env python """Run tests on G4AtlasFieldConfig -Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration """ -from __future__ import print_function - if __name__ == '__main__': from AthenaConfiguration.MainServicesConfig import MainServicesCfg import os - # Set up logging and config behaviour + # Set up logging from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable log.setLevel(DEBUG) - Configurable.configurableRun3Behavior = 1 #import config flags diff --git a/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_Simtest.py b/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_Simtest.py index d12854fd441..f6ed05f6965 100755 --- a/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_Simtest.py +++ b/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_Simtest.py @@ -1,18 +1,16 @@ #!/usr/bin/env python """Run tests on G4Geometry Tool configuration -Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration """ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator if __name__ == '__main__': - # Set up logging and config behaviour + # Set up logging from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable log.setLevel(DEBUG) - Configurable.configurableRun3Behavior = 1 #import config flags diff --git a/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_test.py b/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_test.py index 94efb46c10a..8884d227568 100755 --- a/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_test.py +++ b/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_test.py @@ -1,19 +1,16 @@ #!/usr/bin/env python """Run tests on G4Geometry Tool configuration -Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration """ -from __future__ import print_function from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator if __name__ == '__main__': - # Set up logging and config behaviour + # Set up logging from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable log.setLevel(DEBUG) - Configurable.configurableRun3Behavior = 1 #import config flags diff --git a/Simulation/G4Atlas/G4AtlasTools/test/G4PhysicsRegionConfig_test.py b/Simulation/G4Atlas/G4AtlasTools/test/G4PhysicsRegionConfig_test.py index 5e1694c6222..bb57f5ebffb 100755 --- a/Simulation/G4Atlas/G4AtlasTools/test/G4PhysicsRegionConfig_test.py +++ b/Simulation/G4Atlas/G4AtlasTools/test/G4PhysicsRegionConfig_test.py @@ -2,21 +2,17 @@ """Run tests on G4PhysicsRegionConfig configuration -Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration from __future__ import print_function """ -from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator if __name__ == '__main__': from AthenaConfiguration.MainServicesConfig import MainServicesCfg - import os - # Set up logging and config behaviour + # Set up logging from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable log.setLevel(DEBUG) - Configurable.configurableRun3Behavior = 1 #import config flags -- GitLab From 79c72ac48211615ec2b9e93bc6665a923a2eb099 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Tue, 7 Jun 2022 08:48:20 +0200 Subject: [PATCH 4/4] Simulation: remove redundant setting of configurableRun3Behavior in tests --- Simulation/BeamEffects/python/BeamEffectsAlgConfig.py | 4 +--- Simulation/Digitization/test/DigitizationConfigNew_test.py | 4 +--- Simulation/Digitization/test/DigitizationPUConfigNew_test.py | 4 +--- .../FastCaloSim/python/AddNoiseCellBuilderToolConfig.py | 2 -- .../FastCaloSim/python/AddNoiseCellBuilderTool_test.py | 2 -- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py index f682ce1383d..94dbd8dbe21 100755 --- a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py +++ b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py @@ -162,7 +162,6 @@ def BeamSpotReweightingAlgCfg(flags, name="BeamSpotReweightingAlg", **kwargs): if __name__ == "__main__": from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG - from AthenaCommon.Configurable import Configurable from AthenaConfiguration.MainServicesConfig import MainServicesCfg from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg @@ -171,9 +170,8 @@ if __name__ == "__main__": from SimulationFlags import ConfigFlagsSimulation ConfigFlags.join(ConfigFlagsSimulation) - # Set up logging and config behaviour + # Set up logging log.setLevel(DEBUG) - Configurable.configurableRun3Behavior = 1 import os inputDir = os.environ.get ("ATLAS_REFERENCE_DATA", diff --git a/Simulation/Digitization/test/DigitizationConfigNew_test.py b/Simulation/Digitization/test/DigitizationConfigNew_test.py index 30a80a39145..7ed6b80ce54 100755 --- a/Simulation/Digitization/test/DigitizationConfigNew_test.py +++ b/Simulation/Digitization/test/DigitizationConfigNew_test.py @@ -6,14 +6,12 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration import sys from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG -from AthenaCommon.Configurable import Configurable from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles from Digitization.DigitizationSteering import DigitizationMainCfg, DigitizationMessageSvcCfg -# Set up logging and new style config +# Set up logging log.setLevel(DEBUG) -Configurable.configurableRun3Behavior = True # Configure ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2 diff --git a/Simulation/Digitization/test/DigitizationPUConfigNew_test.py b/Simulation/Digitization/test/DigitizationPUConfigNew_test.py index e542d61aa9e..1943192d76b 100755 --- a/Simulation/Digitization/test/DigitizationPUConfigNew_test.py +++ b/Simulation/Digitization/test/DigitizationPUConfigNew_test.py @@ -6,15 +6,13 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration import sys from AthenaCommon.Logging import log from AthenaCommon.Constants import DEBUG -from AthenaCommon.Configurable import Configurable from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles from Digitization.DigitizationSteering import DigitizationMainCfg, DigitizationMessageSvcCfg, DigitizationTestingPostInclude from RunDependentSimComps.PileUpUtils import generateBackgroundInputCollections, setupPileUpFlags -# Set up logging and new style config +# Set up logging log.setLevel(DEBUG) -Configurable.configurableRun3Behavior = True ConfigFlags.Exec.MaxEvents = 4 diff --git a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py index 0504de6724b..2d31cc3e5b5 100644 --- a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py +++ b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py @@ -36,8 +36,6 @@ def AddNoiseCellBuilderToolCfg (configFlags): if __name__ == "__main__": - from AthenaCommon.Configurable import Configurable - Configurable.configurableRun3Behavior=1 from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles ConfigFlags.loadAllDynamicFlags() diff --git a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py index 5c802d879a1..f32161a3ba8 100644 --- a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py +++ b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py @@ -170,8 +170,6 @@ def testCfg (configFlags): return result -from AthenaCommon.Configurable import Configurable -Configurable.configurableRun3Behavior=1 from AthenaConfiguration.AllConfigFlags import ConfigFlags from AthenaConfiguration.TestDefaults import defaultTestFiles -- GitLab