Merge remote-tracking branch 'upstream/22.0' into master-sweepfrom22_07_06

Control/AthenaMonitoringKernel/python/GenericMonitoringTool.py

@@ -452,7 +452,8 @@ def defineHistogram(varname, type='TH1F', path=None,
     settings.update(_options(opt))
 
     # some things need merging
-    if (settings['kAddBinsDynamically'] or settings['kRebinAxes'] or settings['kCanRebin']) and not _isOnline():
+    if ((settings['kAddBinsDynamically'] or settings['kRebinAxes'] or settings['kCanRebin'])
+        and (not _isOnline() and 'OFFLINE' in settings['convention'])):
         if merge is None:
             log.warning(f'Merge method for {alias} is not specified but needs to be "merge" due to histogram definition; overriding for your convenience')
             merge = 'merge'

Database/AthenaPOOL/AthenaPoolUtilities/python/TPCnvTestConfig.py

 # Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 import os
-from AthenaCommon.Configurable import Configurable
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.ComponentFactory import CompFactory
 from AthenaConfiguration.Enums import LHCPeriod
@@ -9,8 +8,6 @@ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AthenaPoolUtilities.DumperConfig import Dumper, find_file
 from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg
-#from AtlasGeoModel.ForDetGeoModelConfig import ForDetGeometryCfg
-Configurable.configurableRun3Behavior = True
 
 def TPCnvTest(infile, keys, useGeoModelSvc=False, useIOVDbSvc=False, doPixel=False, doSCT=False, doTRT=False, doLAr=False, doTile=False, doMuon=False, doTracks=False, configOnly=False, adjustMessageSvc=True):
 

Database/AthenaPOOL/AthenaPoolUtilities/share/post_tpcnvtest.sh

@@ -76,7 +76,6 @@ PP="$PP"'|^ +[a-zA-Z0-9]+ : +(--|ON)'
 PP="$PP"'|DeprecationWarning.* takes no parameters'
 PP="$PP"'|^ *newobj = object.__new__'
 PP="$PP"'|INFO MVFVxContainerCnv'
-PP="$PP"'|Private AlgTool InDet::InDetTestBLayerTool/InDetTestBLayer'
 PP="$PP"'|^ +BSOLREAD. reading file'
 PP="$PP"'|^\|( \|)*-.* = '
 PP="$PP"'|file found at'
@@ -112,9 +111,6 @@ PP="$PP"'|/TrigSteering/TrigSteeringConfig.py'
 PP="$PP"'|Unable to locate catalogue|^ PoolSvc.* WARNING'
 
 
-# Remove this once InDetTestBLayer is fixed.
-PP="$PP"'|could not get pixel module design|^ ToolSvc.InDetRecTestBLayerTool.*WARNING'
-
 # These warnings went away as of InDetTruthAlgs-00-08-04.
 PP="$PP"'|No valid proxy for object TrackTruthCollection|^ StoreGateSvc.* WARNING'
 

Database/AthenaPOOL/EventSelectorAthenaPool/python/CondProxyProviderConfig.py

@@ -4,8 +4,6 @@
 # Created: Jun 2020, sss
 # Purpose: Configure CondProxyProvider.
 
-from __future__ import print_function
-
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
 
@@ -28,8 +26,6 @@ def CondProxyProviderCfg (flags, poolFiles):
     
 
 if __name__ == "__main__":
-    from AthenaCommon.Configurable import Configurable
-    Configurable.configurableRun3Behavior=1
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.Enums import LHCPeriod
     ConfigFlags.Input.Files = []

Database/CoolLumiUtilities/python/BunchGroupCondAlgConfig.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
 #
 # File: CoolLumiUtilities/python/BunchGroupCondAlgConfig.py
 # Created: May 2019, sss
@@ -6,11 +6,8 @@
 #
 
 
-from __future__ import print_function
-from AthenaConfiguration.ComponentFactory import CompFactory
-
-
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
 from IOVDbSvc.IOVDbSvcConfig import addFolders
 
 
@@ -36,8 +33,6 @@ def BunchGroupCondAlgCfg (configFlags):
 
 
 if __name__ == "__main__":
-    from AthenaCommon.Configurable import Configurable
-    Configurable.configurableRun3Behavior=1
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 

Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.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
 #
 # File: CoolLumiUtilities/python/BunchLumisCondAlgConfig.py
 # Created: May 2019, sss
 # Purpose: Configure BunchLumisCondAlg.
 #
 
-
-from __future__ import print_function
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
 from AthenaConfiguration.Enums import ProductionStep
-
-
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from IOVDbSvc.IOVDbSvcConfig import addFolders
 
 
@@ -47,8 +43,6 @@ def BunchLumisCondAlgCfg (configFlags):
 
 
 if __name__ == "__main__":
-    from AthenaCommon.Configurable import Configurable
-    Configurable.configurableRun3Behavior=1
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     ConfigFlags.loadAllDynamicFlags()

Database/CoolLumiUtilities/python/FillParamsCondAlgConfig.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
 #
 # File: CoolLumiUtilities/python/FillParamsCondAlgConfig.py
 # Created: May 2019, sss
 # Purpose: Configure FillParamsCondAlg.
 #
 
-
-from __future__ import print_function
 from AthenaConfiguration.ComponentFactory import CompFactory
-
-
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from IOVDbSvc.IOVDbSvcConfig import addFolders
 
@@ -36,8 +32,6 @@ def FillParamsCondAlgCfg (configFlags):
 
 
 if __name__ == "__main__":
-    from AthenaCommon.Configurable import Configurable
-    Configurable.configurableRun3Behavior=1
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 

Database/CoolLumiUtilities/python/OnlineLumiCalibrationCondAlgConfig.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
 #
 # File: CoolLumiUtilities/python/OnlineLumiCalibrationCondAlgConfig.py
 # Created: May 2019, sss
 # Purpose: Configure OnlineLumiCalibrationCondAlg.
 #
 
-
-from __future__ import print_function
 from AthenaConfiguration.ComponentFactory import CompFactory
-
-
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from IOVDbSvc.IOVDbSvcConfig import addFolders
 
@@ -36,8 +32,6 @@ def OnlineLumiCalibrationCondAlgCfg (configFlags):
 
 
 if __name__ == "__main__":
-    from AthenaCommon.Configurable import Configurable
-    Configurable.configurableRun3Behavior=1
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 

Database/IOVDbSvc/python/IOVDbSvcConfig.py

@@ -263,8 +263,6 @@ def _extractFolder(folderstr):
     
         
 if __name__ == "__main__":
-    from AthenaCommon.Configurable import Configurable
-    Configurable.configurableRun3Behavior=1
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 

DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py

@@ -3,7 +3,6 @@
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
 from AthenaConfiguration.Enums import ProductionStep
-from AthenaCommon.Configurable import Configurable
 from AthenaCommon import Logging
 
 def GeoModelCfg(configFlags):
@@ -39,7 +38,6 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
     ConfigFlags.Input.Files = []
-    Configurable.configurableRun3Behavior=1
 
     acc = GeoModelCfg( ConfigFlags )
     acc.store( open( "test.pkl", "wb" ) )

DetectorDescription/GeoModel/AtlasGeoModel/test/AtlasGeometryConfig_AOD_test.py

 #!/usr/bin/env python
 """Run a test on Atlas Geometry configuration using a HITS file as input
 
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 if __name__ == "__main__":
     from AthenaCommon.Logging import log
     from AthenaCommon.Constants import DEBUG
-    from AthenaCommon.Configurable import Configurable
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
     from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
     from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg
-    # Set up logging and new style config
+    # Set up logging
     log.setLevel(DEBUG)
-    Configurable.configurableRun3Behavior = True
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     # Provide MC input
     ConfigFlags.Input.Files = defaultTestFiles.AOD

DetectorDescription/GeoModel/AtlasGeoModel/test/AtlasGeometryConfig_EVNT_test.py

 #!/usr/bin/env python
 """Run a test on Atlas Geometry configuration using a EVNT file as input
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 if __name__ == "__main__":
     from AthenaCommon.Logging import log
     from AthenaCommon.Constants import DEBUG
-    from AthenaCommon.Configurable import Configurable
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.Enums import ProductionStep
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
     from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
     from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg
-    # Set up logging and new style config
+    # Set up logging
     log.setLevel(DEBUG)
-    Configurable.configurableRun3Behavior = True
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     # Provide MC input
     ConfigFlags.Common.ProductionStep = ProductionStep.Simulation

DetectorDescription/GeoModel/AtlasGeoModel/test/AtlasGeometryConfig_HITS_test.py

@@ -6,14 +6,12 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 if __name__ == "__main__":
     from AthenaCommon.Logging import log
     from AthenaCommon.Constants import DEBUG
-    from AthenaCommon.Configurable import Configurable
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
     from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
     from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg
-    # Set up logging and new style config
+    # Set up logging
     log.setLevel(DEBUG)
-    Configurable.configurableRun3Behavior = True
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     # Provide MC input
     ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2

Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py

@@ -41,16 +41,13 @@ if __name__ == "__main__":
     print('Running DumpEventDataToJSON on {} and outputting to {}. Prepend calib event is {}'.format(
         args.input, args.output, args.prependCalib))
 
-    from AthenaCommon.Configurable import Configurable
     from AthenaCommon.Logging import log
-    # from AthenaCommon.Constants import DEBUG
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
     from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 
-    Configurable.configurableRun3Behavior = 1
-
     # Uncomment for debugging
+    # from AthenaCommon.Constants import DEBUG
     # log.setLevel(DEBUG)
 
     # To run on MC do e.g.

Event/EventBookkeeperTools/test/test_BookkeeperDumperTool.py

 #!/usr/bin/env python
 """Dump CutBookkeepers
 
-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 argparse import ArgumentParser
 
-from AthenaCommon.Configurable import Configurable
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
@@ -20,9 +19,6 @@ parser.add_argument('input', type=str, nargs='?',
                     help='Specify the input file')
 args = parser.parse_args()
 
-# Setup configuration
-Configurable.configurableRun3Behavior = True
-
 if args.input:
     ConfigFlags.Input.Files = [args.input]
 else:

Event/EventBookkeeperTools/test/test_CutFlowSvc.py

 #!/usr/bin/env python
 """Test CutFlowSvc
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 from argparse import ArgumentParser
 
-from AthenaCommon.Configurable import Configurable
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.ComponentFactory import CompFactory
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg
@@ -24,8 +23,6 @@ parser.add_argument('-t', '--threads', default=2, type=int,
                     help='The number of concurrent threads to run. 0 uses serial Athena.')
 args = parser.parse_args()
 
-# Setup configuration
-Configurable.configurableRun3Behavior = True
 if args.input:
     ConfigFlags.Input.Files = [args.input]
 else:

Event/EventInfoMgt/python/TagInfoMgrConfig.py

@@ -23,9 +23,6 @@ def TagInfoMgrCfg(configFlags,tagValuePairs={}):
 
 
 if __name__ == "__main__":
-    from AthenaCommon.Configurable import Configurable
-    Configurable.configurableRun3Behavior=True
-
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 

Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py

@@ -8,7 +8,6 @@ import sys
 from AthenaCommon.Logging import log
 from AthenaCommon.Constants import DEBUG
 from AthenaCommon.Debugging import DbgStage
-from AthenaCommon.Configurable import Configurable
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
@@ -16,9 +15,8 @@ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
 from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoCnvAlgCfg
 
-# Set up logging and new style config
+# Set up logging
 log.setLevel(DEBUG)
-Configurable.configurableRun3Behavior = True
 
 # Argument parsing
 from argparse import ArgumentParser