Calorimeter/CaloExample/CaloAnaEx/share/CaloAnaExTB.py

@@ -765,5 +765,3 @@ theApp.AuditAlgorithms=True
 #theApp.AuditServices=True
 #theApp.AuditTools=True # FIXME crash on finalisation 
 MessageSvc.Format = "% F%40W%S%7W%R%T %0W%M"
-from __main__ import AtlasTrackingGeometrySvc
-AtlasTrackingGeometrySvc.AssignMaterialFromCOOL = False

Calorimeter/CaloExample/CaloAnaEx/share/CaloAnaEx_AOD2CBNT.py

@@ -36,6 +36,3 @@ class DummyServiceMgr  :
 ServiceMgr=DummyServiceMgr()
 
 #hack ends here
-
-from __main__ import AtlasTrackingGeometrySvc
-AtlasTrackingGeometrySvc.AssignMaterialFromCOOL = False

Calorimeter/CaloExample/CaloRecEx/share/CaloRecEx_RTT_calib0_csc11_007062_singlepart_gamma_E50.py

@@ -78,5 +78,3 @@ print 'BEGIN_RTTINFO = Photons_calib0_csc11_007062_singlepart_gamma_E50'
 import os
 com="echo \"BEGIN_RTTINFO = Photons_calib0_csc11_007062_singlepart_gamma_E50\">&MYRTTINFOS.txt"
 os.system(com)
-#from __main__ import AtlasTrackingGeometrySvc
-#AtlasTrackingGeometrySvc.AssignMaterialFromCOOL = False

Calorimeter/CaloExample/CaloRecEx/share/CaloRecEx_topOptions.py

@@ -77,6 +77,3 @@ MessageSvc.Format = "% F%40W%S%7W%R%T %0W%M"
 print "RTTINFO = 1002_H_2e2mu_q02dig_1004"
 
 
-#from __main__ import AtlasTrackingGeometrySvc
-#AtlasTrackingGeometrySvc.AssignMaterialFromCOOL = False
-

Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CaloTests/AnalysisCal.h"
@@ -103,7 +103,7 @@ namespace MyAnalysisCal {
 
   double etot_cal=0;
   nhit_tot=0;
-  for (const SG::ReadHandleKey<CaloCalibrationHitContainer> k : m_calibHitContainerNames)
+  for (const SG::ReadHandleKey<CaloCalibrationHitContainer>& k : m_calibHitContainerNames)
   {
     SG::ReadHandle<CaloCalibrationHitContainer> calocalibrationhit_container (k, ctx);
     for (const CaloCalibrationHit* calibhit : *calocalibrationhit_container) {

Calorimeter/CaloLocalHadCalib/src/GetLCSinglePionsPerf.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 //-----------------------------------------------------------------------
@@ -975,13 +975,13 @@ int GetLCSinglePionsPerf::fill_moments (const xAOD::CaloClusterContainer& clusCo
   reading calibration containers
   ******************************************** */
   std::vector<const CaloCalibrationHitContainer *> v_cchc;
-  for (const SG::ReadHandleKey<CaloCalibrationHitContainer> k : m_CalibrationHitContainerNames) {
+  for (const SG::ReadHandleKey<CaloCalibrationHitContainer>& k : m_CalibrationHitContainerNames) {
     SG::ReadHandle<CaloCalibrationHitContainer> cchc (k, ctx);
     v_cchc.push_back(cchc.cptr());
   }
 
   std::vector<const CaloCalibrationHitContainer *> v_dmcchc;
-  for (const SG::ReadHandleKey<CaloCalibrationHitContainer> k : m_DMCalibrationHitContainerNames) {
+  for (const SG::ReadHandleKey<CaloCalibrationHitContainer>& k : m_DMCalibrationHitContainerNames) {
     SG::ReadHandle<CaloCalibrationHitContainer> cchc (k, ctx);
     v_dmcchc.push_back(cchc.cptr());
   }
@@ -1202,13 +1202,13 @@ int GetLCSinglePionsPerf::fill_calibhits (const xAOD::CaloClusterContainer& clus
   reading calibration containers
   ******************************************** */
   std::vector<const CaloCalibrationHitContainer *> v_cchc;
-  for (const SG::ReadHandleKey<CaloCalibrationHitContainer> k : m_CalibrationHitContainerNames) {
+  for (const SG::ReadHandleKey<CaloCalibrationHitContainer>& k : m_CalibrationHitContainerNames) {
     SG::ReadHandle<CaloCalibrationHitContainer> cchc (k, ctx);
     v_cchc.push_back(cchc.cptr());
   }
 
   std::vector<const CaloCalibrationHitContainer *> v_dmcchc;
-  for (const SG::ReadHandleKey<CaloCalibrationHitContainer> k : m_DMCalibrationHitContainerNames) {
+  for (const SG::ReadHandleKey<CaloCalibrationHitContainer>& k : m_DMCalibrationHitContainerNames) {
     SG::ReadHandle<CaloCalibrationHitContainer> cchc (k, ctx);
     v_dmcchc.push_back(cchc.cptr());
   }

Calorimeter/CaloLocalHadCalib/src/GetLCWeights.cxx

@@ -359,7 +359,7 @@ StatusCode GetLCWeights::execute()
   SG::ReadHandle<xAOD::CaloClusterContainer> cc (m_clusterCollName, ctx);
 
   std::vector<const CaloCalibrationHitContainer *> v_cchc;
-  for (const SG::ReadHandleKey<CaloCalibrationHitContainer> k : m_CalibrationHitContainerNames) {
+  for (const SG::ReadHandleKey<CaloCalibrationHitContainer>& k : m_CalibrationHitContainerNames) {
     SG::ReadHandle<CaloCalibrationHitContainer> cchc (k, ctx);
     v_cchc.push_back(cchc.cptr());
   }

Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py

 #
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
 #
 # File: CaloRec/python/CaloThinCellsByClusterAlg_test.py
 # Author: scott snyder
@@ -134,6 +134,11 @@ def testCfg (configFlags):
     return result
 
 
+# Work around issue with cling in root 6.20.06 getting confused
+# by forward declarations.
+ROOT.xAOD.CaloClusterContainer_v1
+
+
 from AthenaCommon.Configurable import Configurable
 Configurable.configurableRun3Behavior=1
 from AthenaConfiguration.AllConfigFlags import ConfigFlags

Control/AthenaBaseComps/CMakeLists.txt

-# $Id: CMakeLists.txt 739578 2016-04-12 07:34:46Z krasznaa $
-################################################################################
-# Package: AthenaBaseComps
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AthenaBaseComps )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthenaKernel
-   Control/CxxUtils
-   Control/StoreGate
-   Event/xAOD/xAODEventInfo
-   GaudiKernel
-   PRIVATE
-   AtlasTest/TestTools )
-
 # External dependencies:
+find_package( Boost COMPONENTS thread )
 find_package( ROOT COMPONENTS Hist Tree Core )
 
 # Component(s) in the package:
 atlas_add_library( AthenaBaseComps
    AthenaBaseComps/*.h src/*.cxx
    PUBLIC_HEADERS AthenaBaseComps
-   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel CxxUtils xAODEventInfo GaudiKernel
-   StoreGateLib )
+   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+   LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils xAODEventInfo GaudiKernel StoreGateLib )
 
 # Test(s) in the package:
 atlas_add_test( propertyHandling_test

Control/AthenaConfiguration/CMakeLists.txt

@@ -13,8 +13,6 @@ atlas_install_python_modules( python/*.py python/iconfTool
                               POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_scripts( share/confTool.py python/iconfTool/iconfTool python/CARunner.py)
 
-atlas_install_data( share/*.ref )
-
 atlas_add_test( ComponentAccumulatorTest
    SCRIPT python -m unittest -v AthenaConfiguration.ComponentAccumulatorTest
    POST_EXEC_SCRIPT nopost.sh )

Control/AthenaConfiguration/python/AtlasSemantics.py

@@ -2,7 +2,7 @@
 
 from past.builtins import basestring
 import GaudiConfig2.semantics
-from GaudiKernel.GaudiHandles import PrivateToolHandleArray
+from GaudiKernel.GaudiHandles import PrivateToolHandleArray, PublicToolHandle, ServiceHandle
 import re
 import collections
 import copy
@@ -142,13 +142,17 @@ class PublicHandleArraySemantics(GaudiConfig2.semantics.PropertySemantics):
                                     format(value.__component_type__,v, self.name))
                 else:
                     newValue.append("{}/{}".format(v.__cpp_type__,v.name))
+
+            elif isinstance(v,(PublicToolHandle,ServiceHandle)):
+                newValue.append("{}/{}".format(v.getType(),v.getName()))
+
             elif isinstance(v,basestring):
                 #Check if componet is known ...
                 newValue.append(v)
                 pass
             else:
                 raise TypeError('Configurable expected, got {!r} in assignment to {}'.\
-                                format(value,self.name))
+                                format(v,self.name))
         return newValue
             
     def default(self, value):

Control/AthenaConfiguration/python/ComponentAccumulator.py

@@ -827,6 +827,9 @@ def __setProperties( destConfigurableInstance, sourceConf2Instance, indent="" ):
                 pass
             if pvalue is not None:
                 setattr( destConfigurableInstance, pname, conf2toConfigurable( pvalue, indent=__indent( indent ) ) )
+            else:
+                setattr( destConfigurableInstance, pname, pvalue )
+
         else: # plain data
             if isinstance(pvalue,(GaudiConfig2.semantics._ListHelper,GaudiConfig2.semantics._DictHelper)):
                 pvalue=pvalue.data

Control/AthenaMonitoringKernel/CMakeLists.txt

@@ -31,7 +31,6 @@ atlas_add_component(
 # Install files from the package:
 atlas_install_python_modules( python/*.py 
                               POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
 
 # Decide whether to use Valgrind in the unit tests.
 set( _extra_includes )

Control/DataModelTest/DataModelRunTests/share/ByteStreamTestWrite.ref

-Tue Oct  9 18:19:58 CEST 2018
+Thu Jul 16 19:15:01 CEST 2020
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.1] [x86_64-slc6-gcc8-dbg] [atlas-work3/eea13fb904b] -- built on [2018-10-09T1607]
+Py:Athena            INFO using release [WorkDir-22.0.16] [x86_64-centos7-gcc8-opt] [atlas-work3/e277cdc296a] -- built on [2020-07-16T1652]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "DataModelRunTests/ByteStreamTestWrite_jo.py"
 Py:Athena            INFO including file "DataModelRunTests/loadWriteDicts.py"
-Py:ConfigurableDb    INFO Read module info for 5504 configurables from 72 genConfDb files
-Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+Py:Athena            INFO including file "DataModelRunTests/commonTrailer.py"
+Py:Athena            INFO including file "DataModelRunTests/setCatalog.py"
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-[?1034hApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
+Py:ConfigurableDb    INFO Read module info for 5551 configurables from 77 genConfDb files
+Py:ConfigurableDb WARNING Found 1 duplicates among the 77 genConfDb files :
+Py:ConfigurableDb WARNING --------------------------------------------------
+Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
+Py:ConfigurableDb WARNING --------------------------------------------------
+Py:ConfigurableDb WARNING   -TrigInDetAccelerationTool: TrigInDetAccelerationTool.TrigInDetAccelerationToolConf - ['TrigFastTrackFinder.TrigFastTrackFinderConf']
+Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r3)
-                                          running on lxplus028.cern.ch on Tue Oct  9 18:20:25 2018
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
+                                          running on lxplus708.cern.ch on Thu Jul 16 19:15:12 2020
 ====================================================================================================================================
-ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 2946 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
 CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc           INFO  getRegistryEntries: read 7787 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 705 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1734 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 6320 CLIDRegistry entries for module ALL
+xAODMaker::Even...   INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
+xAODMaker::Even...   INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
+xAODMaker::Even...WARNING Beam conditions service not available
+xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
+ClassIDSvc           INFO  getRegistryEntries: read 423 CLIDRegistry entries for module ALL
 PyComponentMgr       INFO Initializing PyComponentMgr...
 LoadWriteDicts       INFO Initializing LoadWriteDicts...
-ClassIDSvc           INFO  getRegistryEntries: read 1879 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 3020 CLIDRegistry entries for module ALL
 TrigSerializeCn...   INFO initialize()
-ClassIDSvc           INFO  getRegistryEntries: read 108 CLIDRegistry entries for module ALL
-TClass::Init:0: RuntimeWarning: no dictionary for class CosmicMuonCollection_tlp1 is available
-TClass::Init:0: RuntimeWarning: no dictionary for class MdtTrackSegmentCollection_tlp1 is available
-TClass::Init:0: RuntimeWarning: no dictionary for class CosmicMuonCollection_p1 is available
-TClass::Init:0: RuntimeWarning: no dictionary for class CosmicMuon_p1 is available
-TClass::Init:0: RuntimeWarning: no dictionary for class MdtTrackSegmentCollection_p1 is available
-TClass::Init:0: RuntimeWarning: no dictionary for class MdtTrackSegment_p1 is available
-TClass::Init:0: RuntimeWarning: no dictionary for class MdtTrackSegmentCollection_p2 is available
+ClassIDSvc           INFO  getRegistryEntries: read 109 CLIDRegistry entries for module ALL
+Warning in <TClass::Init>: no dictionary for class CosmicMuonCollection_tlp1 is available
+Warning in <TClass::Init>: no dictionary for class MdtTrackSegmentCollection_tlp1 is available
+Warning in <TClass::Init>: no dictionary for class CosmicMuonCollection_p1 is available
+Warning in <TClass::Init>: no dictionary for class CosmicMuon_p1 is available
+Warning in <TClass::Init>: no dictionary for class MdtTrackSegmentCollection_p1 is available
+Warning in <TClass::Init>: no dictionary for class MdtTrackSegment_p1 is available
+Warning in <TClass::Init>: no dictionary for class MdtTrackSegmentCollection_p2 is available
+Warning in <TClass::Init>: no dictionary for class PanTauDetails_p1 is available
 ToolSvc.TrigSer...   INFO Initializing - Package version: TrigSerializeTP-00-00-00
-ClassIDSvc           INFO  getRegistryEntries: read 14715 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 17975 CLIDRegistry entries for module ALL
 DecisionSvc          INFO Inserting stream: StreamBSFileOutput with no Algs
 OutputStreamSeq...   INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
-MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
+StreamBSFileOut...   INFO Initializing StreamBSFileOutput.DefaultNameTool - package version AthenaServices-00-00-00
 AthenaPoolCnvSvc     INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
 PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
-DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-10-08T2213/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-dbg/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-07-15T2139/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus708.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
 DbSession            INFO     Open     DbSession    
 Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
-StreamBSFileOut...   INFO Initializing StreamBSFileOutput.DefaultNameTool - package version AthenaServices-00-00-00
 ByteStreamEvent...   INFO Initializing ByteStreamEventStorageOutputSvc - package version ByteStreamCnvSvc-00-00-00
 ByteStreamEvent...   INFO eformat version to use: "current"
 ByteStreamEvent...   INFO event storage (BS) version to use: "current"
@@ -66,7 +77,6 @@ ByteStreamEvent...   INFO Reinitialization...
 StreamBSFileOutput   INFO Found HelperTools = PrivateToolHandleArray([])
 StreamBSFileOutput   INFO Data output: ByteStreamEventStorageOutputSvc
 StreamBSFileOutput   INFO I/O reinitialization...
-HistogramPersis...WARNING Histograms saving not required.
 EventSelector        INFO  Enter McEventSelector Initialization 
 AthenaEventLoopMgr   INFO Setup EventSelector service EventSelector
 ApplicationMgr       INFO Application Manager Initialized successfully
@@ -74,17 +84,19 @@ ApplicationMgr       INFO Application Manager Started successfully
 EventPersistenc...   INFO Added successfully Conversion service:McCnvSvc
 AthenaEventLoopMgr   INFO   ===>>>  start of run 0    <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #0, run #0 0 events processed so far  <<<===
-ClassIDSvc           INFO  getRegistryEntries: read 1470 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1379 CLIDRegistry entries for module ALL
+MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
+MetaDataSvc          INFO Found MetaDataTools = PublicToolHandleArray([])
 ROBDataProviderSvc   INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
 ROBDataProviderSvc   INFO  ---> Filter out empty ROB fragments                               =  'filterEmptyROB':False
 ROBDataProviderSvc   INFO  ---> Filter out specific ROBs by Status Code: # ROBs = 0
 ROBDataProviderSvc   INFO  ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
+InputMetaDataStoreWARNING retrieve(const): No valid proxy for object ByteStreamMetadata  of type ByteStreamMetadataContainer(CLID 1076128893)
 DetectorStore     WARNING retrieve(default): No valid proxy for default object 
  of type TagInfo(CLID 61780915)
-ClassIDSvc           INFO  getRegistryEntries: read 219 CLIDRegistry entries for module ALL
-2018-Oct-09 18:21:14,992 DEBUG_0 [Adler32MT::Adler32MT(...) at /afs/cern.ch/atlas/project/tdaq/cmake/projects/tdaq-common/tdaq-common-02-09-00/EventStorage/src/Adler32MT.cpp:20] adler32mt instantiated: nb_threads= 1, threshold= 30000
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #0, run #0 1 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #0 1 events processed so far  <<<===
+ClassIDSvc           INFO  getRegistryEntries: read 328 CLIDRegistry entries for module ALL
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #0 2 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #0 2 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #0 3 events processed so far  <<<===
@@ -128,7 +140,6 @@ IncidentProcAlg1     INFO Finalize
 LoadWriteDicts       INFO Finalizing LoadWriteDicts...
 IncidentProcAlg2     INFO Finalize
 EventSelector        INFO finalize
-2018-Oct-09 18:21:16,716 DEBUG_0 [Adler32MT::~Adler32MT(...) at /afs/cern.ch/atlas/project/tdaq/cmake/projects/tdaq-common/tdaq-common-02-09-00/EventStorage/src/Adler32MT.cpp:29] nb_requests= 20 nb_mt= 0 totalsize= 77428 mtsize= 0 avg_nb_chunks= 0
 ByteStreamEvent...   INFO number of events written: 20
 DecisionSvc          INFO Finalized successfully.
 PyComponentMgr       INFO Finalizing PyComponentMgr...

Control/IOVSvc/CMakeLists.txt

-################################################################################
-# Package: IOVSvc
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( IOVSvc )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/SGTools
-                          Control/StoreGate
-                          GaudiKernel
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Control/AthContainersInterfaces
-                          Database/PersistentDataModel
-                          Event/xAOD/xAODEventInfo )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
 find_package( ROOT COMPONENTS Core )
 
 # Component(s) in the package:
@@ -28,30 +13,27 @@ atlas_add_library( IOVSvcLib
                    PUBLIC_HEADERS IOVSvc
                    INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel SGTools GaudiKernel StoreGateLib SGtests xAODEventInfo PersistentDataModel
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools )
+                   LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel SGTools
+                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} PersistentDataModel StoreGateLib xAODEventInfo )
 
 atlas_add_component( IOVSvc
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} IOVSvcLib )
+                     LINK_LIBRARIES IOVSvcLib )
+
+# Install files from the package:
+atlas_install_joboptions( share/IOVSvc.txt share/IOVSvc.py )
 
+# Tests in the package:
 atlas_add_test( IOVSvcTool_test
                 SOURCES
                 test/IOVSvcTool_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                LINK_LIBRARIES IOVSvcLib
+                LINK_LIBRARIES IOVSvcLib StoreGateLib TestTools
                 LOG_IGNORE_PATTERN "^HistogramPersis.* INFO|^IOVSvc +DEBUG|^IOVSvcTool +DEBUG" 
                 ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
 
 atlas_add_test( IOVSvc_test
                 SOURCES
                 test/IOVSvc_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                LINK_LIBRARIES IOVSvcLib
+                LINK_LIBRARIES IOVSvcLib TestTools
                 LOG_IGNORE_PATTERN "^HistogramPersis.* INFO|^IOVSvc +DEBUG|^IOVSvcTool +DEBUG" 
                 ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
-
-# Install files from the package:
-atlas_install_joboptions( share/IOVSvc.txt share/IOVSvc.py )
-

Control/IOVSvc/src/CondInputLoader.cxx

 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // CondInputLoader.cxx 
@@ -74,11 +74,6 @@ CondInputLoader::CondInputLoader( const std::string& name,
   }
 }
 
-// Destructor
-///////////////
-CondInputLoader::~CondInputLoader()
-{}
-
 //-----------------------------------------------------------------------------
 
 // Athena Algorithm's Hooks
@@ -344,8 +339,14 @@ CondInputLoader::execute()
     }
   }
 
-  if (m_dumpEvt) {
-    ATH_MSG_DEBUG(m_condStore->dump()); 
+  if (m_dumpCondStore) {
+    ATH_MSG_DEBUG(m_condStore->dump());
+  }
+
+  if (m_dumpCondSvc) {
+    std::ostringstream ost;
+    m_condSvc->dump(ost);
+    ATH_MSG_DEBUG(ost.str());
   }
   
   return sc;

Control/IOVSvc/src/CondInputLoader.h

 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // CondInputLoader.h 
@@ -10,10 +10,6 @@
 #ifndef IOVSVC_CONDINPUTLOADER_H
 #define IOVSVC_CONDINPUTLOADER_H 1
 
-// STL includes
-#include <string>
-
-
 #include "GaudiKernel/DataObjID.h"
 #include "GaudiKernel/ICondSvc.h"
 #include "GaudiKernel/ServiceHandle.h"
@@ -31,57 +27,34 @@ class CondInputLoader
   : public ::AthAlgorithm
 { 
 
-  /////////////////////////////////////////////////////////////////// 
-  // Public methods: 
-  /////////////////////////////////////////////////////////////////// 
- public: 
+ public:
 
-  // Copy constructor: 
-
-  /// Constructor with parameters: 
+  /// Constructor with parameters:
   CondInputLoader( const std::string& name, ISvcLocator* pSvcLocator );
 
-  /// Destructor: 
-  virtual ~CondInputLoader(); 
-
-  // Assignment operator: 
-  //CondInputLoader &operator=(const CondInputLoader &alg); 
-
   // Athena algorithm's Hooks
-  virtual StatusCode  initialize();
-  virtual StatusCode  start();
-  virtual StatusCode  execute();
-  virtual StatusCode  finalize();
-
-  /////////////////////////////////////////////////////////////////// 
-  // Const methods: 
-  ///////////////////////////////////////////////////////////////////
+  virtual StatusCode  initialize() override;
+  virtual StatusCode  start() override;
+  virtual StatusCode  execute() override;
+  virtual StatusCode  finalize() override;
 
-  /////////////////////////////////////////////////////////////////// 
-  // Non-const methods: 
-  /////////////////////////////////////////////////////////////////// 
 
-  /////////////////////////////////////////////////////////////////// 
-  // Private data: 
-  /////////////////////////////////////////////////////////////////// 
- private: 
-
-  /// Default constructor: 
-  //  CondInputLoader();
+ private:
 
   // need to override the ExtraInputs/Outputs property handler
   // from AthAlgorithm
   void extraDeps_update_handler(Property&);
 
-  //  void loader(Property&);
-
   /// Containers
-  Gaudi::Property<DataObjIDColl> m_load{this,"Load",{},"List of objects to be loaded","OrderedSet<std::vector<std::string> >"};
+  Gaudi::Property<DataObjIDColl> m_load{this,"Load",{},
+                                        "List of objects to be loaded","OrderedSet<std::vector<std::string> >"};
   DataObjIDColl  m_handlesToCreate;
   std::vector< SG::VarHandleKey > m_vhk;
 
-  Gaudi::Property<bool> m_dumpEvt{ this, "DumpCondStore", false, 
+  Gaudi::Property<bool> m_dumpCondStore{ this, "DumpCondStore", false,
       "dump the ConditionStore at the end execute"};
+  Gaudi::Property<bool> m_dumpCondSvc{ this, "DumpCondSvc", false,
+      "dump the CondSvc at the end execute"};
   Gaudi::Property<bool> m_abort {this, "AbortIfInitFails", true, 
       "Abort execution if unable to create the CondCont<T> in first event"};
 
@@ -96,4 +69,4 @@ class CondInputLoader
 }; 
 
 
-#endif //> !SGCOMPS_SGINPUTLOADER_H
+#endif

Control/PileUpComps/CMakeLists.txt

@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( PileUpComps )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Control/StoreGate
-                          Event/EventInfo
-                          Event/EventInfoUtils
-                          Event/xAOD/xAODEventInfo
-                          Event/xAOD/xAODCnvInterfaces
-                          GaudiKernel )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )

Control/PileUpTools/CMakeLists.txt

@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( PileUpTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/AthLinks
-                          Control/SGTools
-                          Control/StoreGate
-                          Event/EventInfo
-                          Event/xAOD/xAODEventInfo
-                          Event/xAOD/xAODCnvInterfaces
-                          GaudiKernel )
-
 # Component(s) in the package:
 atlas_add_library( PileUpToolsLib
                    src/*.cxx
@@ -24,7 +12,7 @@ atlas_add_library( PileUpToolsLib
                    LINK_LIBRARIES AthenaBaseComps AthenaKernel
                    AthLinks SGTools
                    EventInfo xAODEventInfo xAODCnvInterfaces
-                   GaudiKernel StoreGateLib SGtests ) 
+                   GaudiKernel StoreGateLib SGtests )
 
 atlas_add_component( PileUpTools
                      src/components/*.cxx

DataQuality/DataQualityInterfaces/src/HanConfig.cxx

@@ -491,7 +491,7 @@ GetAlgorithmConfiguration( HanConfigAssessor* dqpar, const std::string& algID,
 	}
 	std::string newRefId;
 	std::string absAlgRefName("");	
-	for (const auto thisRefID : refIDVec) {
+	for (const auto& thisRefID : refIDVec) {
 	  std::string algRefName( m_refConfig.GetStringAttribute(thisRefID,"name") );
 	  std::string algRefPath( m_refConfig.GetStringAttribute(thisRefID,"path") );
 	  std::string algRefInfo( m_refConfig.GetStringAttribute(thisRefID,"info") );