AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt

-################################################################################
-# Package: BeamPipeGeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( BeamPipeGeoModel )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          PRIVATE
-                          Control/SGTools
-                          Control/StoreGate
-                          Control/AthenaKernel
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
 find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_library( BeamPipeGeoModelLib
                    src/*.cxx
                    PUBLIC_HEADERS BeamPipeGeoModel
-                   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} 
-                   LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoModelUtilities StoreGateLib 
-                   PRIVATE_LINK_LIBRARIES SGTools AthenaKernel GaudiKernel RDBAccessSvcLib )
+                   LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities
+                   PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelInterfaces RDBAccessSvcLib SGTools StoreGateLib )
 
 atlas_add_component( BeamPipeGeoModel
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoModelUtilities SGTools StoreGateLib GaudiKernel BeamPipeGeoModelLib )
+                     LINK_LIBRARIES BeamPipeGeoModelLib )
 
+# Test(s) in the package:
 atlas_add_test( BeamPipeGMConfig_test
                 SCRIPT test/BeamPipeGMConfig_test.py
                 PROPERTIES TIMEOUT 300 )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_scripts( test/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.cxx

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "BeamPipeDetectorFactory.h"
 
-#include "GeoModelInterfaces/AbsMaterialManager.h"
+#include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelKernel/GeoMaterial.h"  
 #include "GeoModelKernel/GeoPcon.h"  
 #include "GeoModelKernel/GeoTube.h"  
@@ -18,8 +18,6 @@
 
 #include "StoreGate/StoreGateSvc.h"
 
-#include "GeoModelInterfaces/StoredMaterialManager.h"
-
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
@@ -33,7 +31,7 @@
 
 
 BeamPipeDetectorFactory::BeamPipeDetectorFactory(StoreGateSvc *detStore,
-				       IRDBAccessSvc *pAccess)
+						 IRDBAccessSvc *pAccess)
   :m_detectorManager(0),
    m_materialManager(0),
    m_detectorStore(detStore),
@@ -49,11 +47,9 @@ void BeamPipeDetectorFactory::create(GeoPhysVol *world)
 {
   m_detectorManager=new BeamPipeDetectorManager();
 
-  const StoredMaterialManager * materialManagerTmp = 0;
-  if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManagerTmp, std::string("MATERIALS"))) {
+  if (StatusCode::SUCCESS != m_detectorStore->retrieve(m_materialManager, std::string("MATERIALS"))) {
     return; 
   } 
-  m_materialManager = materialManagerTmp;
   
   IRDBRecordset_ptr atlasMother = m_access->getRecordsetPtr("AtlasMother",m_versionTag,m_versionNode);
   IRDBRecordset_ptr bpipeGeneral = m_access->getRecordsetPtr("BPipeGeneral",m_versionTag,m_versionNode);

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.h

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef BeamPipeDetectorFactory_h
-#define BeamPipeDetectorFactory_h 1
+#ifndef BEAMPIPEGEOMODEL_BEAMPIPEDETECTORFACTORY_H
+#define BEAMPIPEGEOMODEL_BEAMPIPEDETECTORFACTORY_H
 
 #include "GeoModelKernel/GeoVDetectorFactory.h"
 #include "BeamPipeGeoModel/BeamPipeDetectorManager.h"
@@ -11,10 +11,10 @@
 #include <string>
 
 class StoreGateSvc;
-class AbsMaterialManager;
+class StoredMaterialManager;
 class GeoShape;
 
-class BeamPipeDetectorFactory : public GeoVDetectorFactory  
+class BeamPipeDetectorFactory final : public GeoVDetectorFactory  
 {
  public:
   
@@ -26,10 +26,10 @@ class BeamPipeDetectorFactory : public GeoVDetectorFactory
   ~BeamPipeDetectorFactory();
   
   // Creation of geometry:
-  virtual void create(GeoPhysVol *world);
+  virtual void create(GeoPhysVol *world) override;
   
   // Access to the results:
-  virtual const BeamPipeDetectorManager * getDetectorManager() const;
+  virtual const BeamPipeDetectorManager * getDetectorManager() const override;
   
   // Set version Tag and Node
   void setTagNode(std::string tag, std::string node);
@@ -69,7 +69,7 @@ class BeamPipeDetectorFactory : public GeoVDetectorFactory
   // The manager:
   BeamPipeDetectorManager     * m_detectorManager;
    
-  const AbsMaterialManager * m_materialManager;
+  const StoredMaterialManager * m_materialManager;
 
   StoreGateSvc             * m_detectorStore;
   IRDBAccessSvc            * m_access;

AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py

 #!/usr/bin/env python
 """Run tests on BeamPipeGeoModel configuration
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 """
 if __name__ == "__main__":
     from AthenaCommon.Configurable import Configurable
@@ -16,7 +16,6 @@ if __name__ == "__main__":
     ConfigFlags.GeoModel.Align.Dynamic    = False
     ConfigFlags.lock()
 
-    from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
     from BeamPipeGeoModel.BeamPipeGMConfig import BeamPipeGeometryCfg
     acc = BeamPipeGeometryCfg(ConfigFlags)
     f=open('BeamPipeGeometryCfg.pkl','wb')

AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt

-################################################################################
-# Package: CavernInfraGeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( CavernInfraGeoModel )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( Eigen )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
 find_package( GeoModelCore )
 
 # Component(s) in the package:
+atlas_add_library( CavernInfraGeoModelLib
+                   CavernInfraGeoModel/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS CavernInfraGeoModel
+                   INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel )
+
 atlas_add_component( CavernInfraGeoModel
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} 
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoModelUtilities StoreGateLib SGtests GaudiKernel RDBAccessSvcLib )
-
-# Install files from the package:
-atlas_install_headers( CavernInfraGeoModel )
-
+                     LINK_LIBRARIES CavernInfraGeoModelLib GaudiKernel GeoModelInterfaces GeoModelUtilities RDBAccessSvcLib StoreGateLib )

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.cxx

@@ -4,7 +4,6 @@
 
 #include "CavernInfraDetectorFactory.h"
 
-#include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 
 #include "GeoModelKernel/GeoMaterial.h"  

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.cxx

@@ -5,7 +5,6 @@
 #include "CavernInfraDetectorFactory01.h"
 
 
-#include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelKernel/GeoMaterial.h"  
 #include "GeoModelKernel/GeoPcon.h"  
 #include "GeoModelKernel/GeoTube.h"  

AtlasGeometryCommon/GeoModelEnvelopes/CMakeLists.txt

-################################################################################
-# Package: GeoModelEnvelopes
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( GeoModelEnvelopes )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          PRIVATE
-                          Control/SGTools
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel )
-
+# External dependencies:
 find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_component( GeoModelEnvelopes
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} GeoModelUtilities SGTools StoreGateLib GaudiKernel )
-
-# Install files from the package:
-atlas_install_headers( GeoModelEnvelopes )
-
+                     LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GaudiKernel GeoModelInterfaces GeoModelUtilities SGTools StoreGateLib )

AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeFactory.cxx

@@ -4,7 +4,7 @@
 
 #include "ForDetEnvelopeFactory.h"
 
-#include "GeoModelInterfaces/AbsMaterialManager.h"
+#include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelKernel/GeoMaterial.h"  
 #include "GeoModelKernel/GeoTube.h"  
 #include "GeoModelKernel/GeoLogVol.h"  
@@ -16,8 +16,6 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/SystemOfUnits.h"
 
-#include "GeoModelInterfaces/StoredMaterialManager.h"
-
 #include <vector>
 
 
@@ -34,11 +32,9 @@ ForDetEnvelopeFactory::~ForDetEnvelopeFactory()
 
 void ForDetEnvelopeFactory::create(GeoPhysVol *world)
 {
-  const StoredMaterialManager * materialManagerTmp = 0;
-  if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManagerTmp, std::string("MATERIALS"))) {
+  if (StatusCode::SUCCESS != m_detectorStore->retrieve(m_materialManager, std::string("MATERIALS"))) {
     return; 
   } 
-  m_materialManager = materialManagerTmp;
   
   // Get the materials  
   const GeoMaterial* air = m_materialManager->getMaterial("std::Air");

AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeFactory.h

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef ForDetEnvelopeFactory_h
-#define ForDetEnvelopeFactory_h 1
+#ifndef GEOMODELENVELOPES_FORDETENVELOPEFACTORY_H
+#define GEOMODELENVELOPES_FORDETENVELOPEFACTORY_H
 
 #include "GeoModelKernel/GeoVDetectorFactory.h"
 #include "GeoModelEnvelopes/ForDetEnvelopeManager.h"
 
 class StoreGateSvc;
-class AbsMaterialManager;
+class StoredMaterialManager;
 class GeoShape;
 
-class ForDetEnvelopeFactory : public GeoVDetectorFactory  
+class ForDetEnvelopeFactory final : public GeoVDetectorFactory  
 {
  public:
   
@@ -23,10 +23,10 @@ class ForDetEnvelopeFactory : public GeoVDetectorFactory
   ~ForDetEnvelopeFactory();
   
   // Creation of geometry:
-  virtual void create(GeoPhysVol *world);
+  virtual void create(GeoPhysVol *world) override;
   
   // Access to the results:
-  virtual const ForDetEnvelopeManager * getDetectorManager() const;
+  virtual const ForDetEnvelopeManager * getDetectorManager() const override;
   
  private:  
 
@@ -37,7 +37,7 @@ class ForDetEnvelopeFactory : public GeoVDetectorFactory
   // The manager:
   ForDetEnvelopeManager*   m_detectorManager;
    
-  const AbsMaterialManager* m_materialManager;
+  const StoredMaterialManager* m_materialManager;
   StoreGateSvc*             m_detectorStore;
 };
 

AtlasGeometryCommon/Interpreters/CMakeLists.txt

-################################################################################
-# Package: Interpreters
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Interpreters )
 
 # Install files from the package:
 atlas_install_scripts( share/physh share/totalphysh share/athenash.py )
-

AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt

-################################################################################
-# Package: SubDetectorEnvelopes
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SubDetectorEnvelopes )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/AtlasDetDescr
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
 
+# Component(s) in the package:
 atlas_add_library( SubDetectorEnvelopesLib
                    INTERFACE
                    PUBLIC_HEADERS SubDetectorEnvelopes
                    LINK_LIBRARIES GaudiKernel AtlasDetDescr )
 
-# Component(s) in the package:
 atlas_add_component( SubDetectorEnvelopes
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AtlasDetDescr GaudiKernel AthenaBaseComps RDBAccessSvcLib GeoModelInterfaces )
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GeoModelInterfaces RDBAccessSvcLib SubDetectorEnvelopesLib )
 
 # Install files from the package:
-atlas_install_headers( SubDetectorEnvelopes )
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 """
 SubDetectorEnvelopes configurations for AtlasGeometryCommon
 Elmar Ritsch, 27/09/2013
 """
 
-from AthenaCommon.CfgGetter import getPrivateTool,getPrivateToolClone,getPublicTool,getPublicToolClone,\
-        getService,getServiceClone,getAlgorithm,getAlgorithmClone
-
-from AthenaCommon.Constants import *  # FATAL,ERROR etc.
-from AthenaCommon.SystemOfUnits import *
-from AthenaCommon.DetFlags import DetFlags
-
 def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
     kwargs.setdefault("DBInDetNode"       , 'InDetEnvelope'    )
     kwargs.setdefault("DBBeamPipeNode"    , 'BeamPipeEnvelope' )
@@ -273,7 +266,6 @@ def EnvelopeDefSvc(flags,  **kwargs):
     Cavern.addRZ(     0.0 , 26046.0 ) #
 
     # the outer dimesions differ between collision and cosmics jobs
-    from AthenaCommon.BeamFlags import jobproperties
     if flags.Beam.Type != 'cosmics':
       #  -> for collision jobs the 'cavern' envelope is much smaller
       Cavern.addRZ(      0.0 , 500000.0 ) # z= +500m

AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigDb.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 """
 Configuration database for SubDetectorEnvelopes
 Elmar Ritsch, 27/09/2013
 """
 
-from AthenaCommon.CfgGetter import addTool, addToolClone, addService, addAlgorithm, \
-     addTypesToExcludeIfDefaultValue, addNamesToExcludeIfDefaultValue, addFullNamesToExcludeIfDefaultValue, \
-     addPropertiesToExcludeIfDefault, \
-     addTypesToSkipIfNotAvailable, addNamesToSkipIfNotAvailable, addFullNamesToSkipIfNotAvailable, \
-     addTypesOnlyToSkip
-
-from AthenaCommon.Constants import *  # FATAL,ERROR etc.
-import AthenaCommon.SystemOfUnits as Units
+from AthenaCommon.CfgGetter import addService
 
 # Common tools, services and algorithms used by jobs:
 addService("SubDetectorEnvelopes.SubDetectorEnvelopesConfig.getEnvelopeDefSvc", "AtlasGeometry_EnvelopeDefSvc")

AtlasTest/ControlTest/CMakeLists.txt

-################################################################################
-# Package: ControlTest
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ControlTest )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   AtlasTest/TestTools
-   Control/AthenaExamples/AthExFortranAlgorithm
-   Control/AthenaExamples/AthExStoreGateExample
-   Control/AthenaPython
-   PRIVATE
-   Control/AthContainers
-   Control/AthLinks
-   Control/AthenaExamples/ToyConversion
-   Control/AthenaKernel
-   Control/SGTools
-   Control/StoreGate
-   GaudiKernel )
-
 # Helper variable(s):
 set( _jobOPath
    "${CMAKE_CURRENT_SOURCE_DIR}/share:${CMAKE_JOBOPT_OUTPUT_DIRECTORY}" )

AtlasTest/ControlTest/share/FortranAlgorithm.ref

@@ -21,7 +21,6 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
 ClassIDSvc           INFO  getRegistryEntries: read 7027 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
 FortranAlgorithm     INFO calling initialize_()

AtlasTest/ControlTest/share/HelloWorld.ref

@@ -7,7 +7,7 @@ JobOptionsSvc        INFO
 //==============================================================
 
 //no EventSelector
-ApplicationMgr.DLLs   += { "AthenaServices" };
+ApplicationMgr.Dlls   += { "AthenaServices" };
 ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
 //--------------------------------------------------------------
 // StoreGate services configuration
@@ -15,7 +15,7 @@ ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
 // --> Including file StoreGate/StoreGate_jobOptions.txt
 
 
-ApplicationMgr.DLLs   += { "StoreGate", "CLIDSvc" };
+ApplicationMgr.Dlls   += { "StoreGate", "CLIDSvc" };
 ApplicationMgr.ExtSvc += { "ClassIDSvc" };
 ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore" };
 ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
@@ -30,7 +30,7 @@ ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
 // Load the Interval of Validity Service
 //
 //------------------------------------------------------------------------
-ApplicationMgr.DLLs += { "IOVSvc" };
+ApplicationMgr.Dlls += { "IOVSvc" };
 ApplicationMgr.ExtSvc += { "IOVSvc" };
 
 
@@ -50,7 +50,7 @@ ApplicationMgr.ExtSvc += { "EvtPersistencySvc/EventPersistencySvc",
 //--------------------------------------------------------------
 
 //load relevant libraries
-ApplicationMgr.DLLs += { "AthExHelloWorld" };
+ApplicationMgr.Dlls += { "AthExHelloWorld" };
 
 //top algorithms to be run
 ApplicationMgr.TopAlg = { "HelloWorld" };

AtlasTest/ControlTest/share/HistNtup.ref

@@ -36,7 +36,7 @@ ApplicationMgr.ExtSvc += { "IncidentSvc/IncidentSvc",
 			   "ChronoStatSvc/ChronoStatSvc"
 			 };	
 
-ApplicationMgr.DLLs   += { "AthenaServices" };
+ApplicationMgr.Dlls   += { "AthenaServices" };
 ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
 ApplicationMgr.OutStreamType = "AthenaOutputStream";
 AthenaEventLoopMgr.OutStreamType = "AthenaOutputStream";
@@ -47,7 +47,7 @@ AthenaEventLoopMgr.OutStreamType = "AthenaOutputStream";
 // --> Including file StoreGate/StoreGate_jobOptions.txt
 
 
-ApplicationMgr.DLLs   += { "StoreGate", "CLIDSvc" };
+ApplicationMgr.Dlls   += { "StoreGate", "CLIDSvc" };
 ApplicationMgr.ExtSvc += { "ClassIDSvc" };
 ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore" };
 ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
@@ -62,7 +62,7 @@ ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
 // Load the Interval of Validity Service
 //
 //------------------------------------------------------------------------
-ApplicationMgr.DLLs += { "IOVSvc" };
+ApplicationMgr.Dlls += { "IOVSvc" };
 ApplicationMgr.ExtSvc += { "IOVSvc" };
 
 
@@ -84,7 +84,7 @@ ApplicationMgr.ExtSvc += { "IOVSvc" };
 //
 
 // DLLs 
-ApplicationMgr.DLLs += { "DetDescrCnvSvc" };
+ApplicationMgr.Dlls += { "DetDescrCnvSvc" };
 
 // Add in services
 //  (NOTE: the following does not yet work for the detector store)
@@ -111,7 +111,7 @@ DetDescrCnvSvc.IdDictName = "IdDictParser/ATLAS_IDS.xml";
 //
 
 // DLLs 
-ApplicationMgr.DLLs += { "IdDictDetDescrCnv" };
+ApplicationMgr.Dlls += { "IdDictDetDescrCnv" };
 
 
 // <-- End of including file IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.txt
@@ -136,7 +136,7 @@ ApplicationMgr.DLLs += { "IdDictDetDescrCnv" };
 // General Application Configuration options
 //--------------------------------------------------------------
 
-ApplicationMgr.DLLs   += { "ZebraTDRCnv" , "HbookCnv"};
+ApplicationMgr.Dlls   += { "ZebraTDRCnv" , "HbookCnv"};
 ApplicationMgr.ExtSvc += { "ZebraTDRCnvSvc", 
                           "ZebraTDREventSelector/EventSelector" };
 ApplicationMgr.EvtSel = "EventSelector";
@@ -171,7 +171,7 @@ JobOptionsSvc        INFO // <-- End of including file IdDictDetDescrCnv/IdDictD
 //
 
 // DLLs 
-ApplicationMgr.DLLs += { "InDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "InDetMgrDetDescrCnv" };
 
 // Add InDet to list of DetectorManagers to be loaded at startup
 DetDescrCnvSvc.DetectorManagers += { "InDetMgr" };
@@ -186,7 +186,7 @@ DetDescrCnvSvc.DetectorManagers += { "InDetMgr" };
 //
 
 // DLLs 
-ApplicationMgr.DLLs += { "LArDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "LArDetMgrDetDescrCnv" };
 
 // Add InDet to list of DetectorManagers to be loaded at startup
 DetDescrCnvSvc.DetectorManagers += { "LArMgr" };
@@ -199,7 +199,7 @@ DetDescrCnvSvc.DetectorManagers += { "LArMgr" };
 //
 
 // DLLs 
-ApplicationMgr.DLLs += { "CaloDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "CaloDetMgrDetDescrCnv" };
 
 // Add InDet to list of DetectorManagers to be loaded at startup
 DetDescrCnvSvc.DetectorManagers += { "CaloMgr" };
@@ -218,7 +218,7 @@ DetDescrCnvSvc.DetectorManagers += { "CaloMgr" };
 //
 
 // DLLs 
-ApplicationMgr.DLLs += { "MuonDetMgrDetDescrCnv" };
+ApplicationMgr.Dlls += { "MuonDetMgrDetDescrCnv" };
 
 // Add InDet to list of DetectorManagers to be loaded at startup
 DetDescrCnvSvc.DetectorManagers += { "MuonMgr" };
@@ -233,11 +233,11 @@ DetDescrCnvSvc.DecodeIdDict = true;
 // Private Application Configuration options
 //--------------------------------------------------------------
 //load relevant libraries
-ApplicationMgr.DLLs += { "AthExHistNtup" };      
+ApplicationMgr.Dlls += { "AthExHistNtup" };      
 
 // Select the appropriate shared library
-ApplicationMgr.DLLs += { "HbookCnv" };
-////ApplicationMgr.DLLs += { "RootHistCnv" };
+ApplicationMgr.Dlls += { "HbookCnv" };
+////ApplicationMgr.Dlls += { "RootHistCnv" };
 
 // Select HBOOK or ROOT persistency (HBOOK is default)
 ApplicationMgr.HistogramPersistency = "HBOOK";

AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref

 
 
-Initializing Gaudi ApplicationMgr using job opts ../share/ProxyProviderSvc_test.txt
-JobOptionsSvc        INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ControlTest/StoreGateTestCommon.txt
+Initializing Gaudi ApplicationMgr using job opts /build/GMR/577.3/athena/AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt
+JobOptionsSvc        INFO # =======> /build/GMR/577.3/build/build/Athena/x86_64-centos7-gcc8-opt/jobOptions/ControlTest/StoreGateTestCommon.txt
 JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionStore"]
 JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
 JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
 JobOptionsSvc        INFO # (8,1): StoreGateSvc.ActivateHistory = 0
 JobOptionsSvc        INFO # (9,1): CLIDSvc.OutputLevel = 2
 JobOptionsSvc        INFO # (10,1): MessageSvc.useColors = 1
-JobOptionsSvc        INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ToyConversion/ToyConversionOpts.txt
+JobOptionsSvc        INFO # =======> /build/GMR/577.3/build/build/Athena/x86_64-centos7-gcc8-opt/jobOptions/ToyConversion/ToyConversionOpts.txt
 JobOptionsSvc        INFO # (5,1): EventPersistencySvc.CnvServices += ["ToyConversionSvc"]
-JobOptionsSvc        INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/ProxyProviderSvc_test.txt
+JobOptionsSvc        INFO # =======> /build/GMR/577.3/athena/AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt
 JobOptionsSvc        INFO # (7,1): ProxyProviderSvc.OutputLevel = 1
 JobOptionsSvc        INFO # (9,1): ClassIDSvc.OutputLevel = 2
 JobOptionsSvc        INFO # (10,1): MessageSvc.setVerbose = ["DataProxy", "EventPersistencySvc", "ToyConversionSvc", "StoreGateSvc", "EventDataSvc", "HistogramDataSvc", "ServiceManager", "HistogramPersistencySvc", "HistoryStore", "DetectorStore", "ApplicationMgr", "ProxyProviderSvc"]
 JobOptionsSvc        INFO # (11,1): MessageSvc.setDebug = ["ClassIDSvc"]
-JobOptionsSvc        INFO Job options successfully read in from ../share/ProxyProviderSvc_test.txt
+JobOptionsSvc        INFO Job options successfully read in from /build/GMR/577.3/athena/AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt
 ApplicationMgr      DEBUG Getting my own properties
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
-                                          running on karma on Tue Jul 17 15:42:25 2018
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
+                                          running on zeus on Tue Jul 28 09:01:40 2020
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
 ServiceManager      DEBUG Initializing service DetectorStore
 DetectorStore       DEBUG Service base class initialized successfully
 DetectorStore     VERBOSE Initializing DetectorStore - package version StoreGate-00-00-00
 DetectorStore       DEBUG trying to create store SGImplSvc/DetectorStore_Impl
+DetectorStore_Impl  DEBUG Property update for OutputLevel : new value = 1
+DetectorStore_ImplVERBOSE Initializing DetectorStore_Impl - package version StoreGate-00-00-00
+DetectorStore_Impl  DEBUG Service base class initialized successfully
 EventPersistenc...  DEBUG  'CnvServices':[ 'ToyConversionSvc' ]
 EventPersistenc...  DEBUG Service base class initialized successfully
+DetectorStore_ImplVERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 ClassIDSvc          DEBUG Service base class initialized successfully
-ClassIDSvc           INFO  getRegistryEntries: read 2468 CLIDRegistry entries for module ALL
-ClassIDSvc          DEBUG processCLIDDB: read 702 entries from CLIDDB file: /home/sss/atlas/dvtest/build/share/clid.db
+ClassIDSvc           INFO  getRegistryEntries: read 808 CLIDRegistry entries for module ALL
+ClassIDSvc          DEBUG processCLIDDB: read 1747 entries from CLIDDB file: /build/GMR/577.3/build/build/Athena/x86_64-centos7-gcc8-opt/share/clid.db
+DetectorStore_ImplVERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
 ProxyProviderSvc  VERBOSE Initializing ProxyProviderSvc - package version SGComps-00-00-00
 ProxyProviderSvc  VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
+ProxyProviderSvc    DEBUG Service base class initialized successfully
 ServiceManager      DEBUG Initializing service HistoryStore
 HistoryStore        DEBUG Service base class initialized successfully
 HistoryStore      VERBOSE Initializing HistoryStore - package version StoreGate-00-00-00
 HistoryStore        DEBUG trying to create store SGImplSvc/HistoryStore_Impl
+HistoryStore_Impl   DEBUG Property update for OutputLevel : new value = 1
+HistoryStore_Impl VERBOSE Initializing HistoryStore_Impl - package version StoreGate-00-00-00
+HistoryStore_Impl   DEBUG Service base class initialized successfully
+HistoryStore_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
+HistoryStore_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
 ServiceManager      DEBUG Initializing service ConditionStore
 ServiceManager      DEBUG Initializing service AppMgrRunable
 ServiceManager      DEBUG Initializing service EventLoopMgr
@@ -48,7 +59,7 @@ EventDataSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentS
 HistogramDataSvc    DEBUG Service base class initialized successfully
 HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 HistogramPersis...  DEBUG Service base class initialized successfully
-HistogramPersis...WARNING Histograms saving not required.
+HistogramPersis...  DEBUG Histograms saving not required.
 HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
@@ -60,15 +71,15 @@ StoreGateSvc_Impl VERBOSE Initializing StoreGateSvc_Impl - package version Store
 StoreGateSvc_Impl   DEBUG Service base class initialized successfully
 StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-StoreGateSvc_Impl   DEBUG  Bound handle 0x7ffc9a030060 to proxy 0x955930
+ClassIDSvc           INFO  getRegistryEntries: read 1019 CLIDRegistry entries for module ALL
 ToyConversionSvc    DEBUG Service base class initialized successfully
 EventPersistenc...VERBOSE ServiceLocatorHelper::service: found service ToyConversionSvc
 EventPersistenc...   INFO Added successfully Conversion service:ToyConversionSvc
-ClassIDSvc           INFO  getRegistryEntries: read 374 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2 CLIDRegistry entries for module ALL
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc_Impl)::dump():
 Found 1 proxy for ClassID 8107 (Bar): 
- flags: (  valid,   locked,  reset) --- data:   0x957570 --- key: aBar
+ flags: (  valid,   locked,  reset) --- data:  0x4bb7d50 --- key: aBar
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 StoreGateSvc        DEBUG Retrieved const pointer to object aFoo  of type Foo(CLID 8101)
@@ -77,18 +88,15 @@ Now we expect to see an error message:
 ToyConversionSvc     INFO No converter for object   CLID= 8109
 DataProxy         WARNING accessData: conversion failed for data object 8109/aFooBar
  Returning NULL DataObject pointer  
-SG::DataProxy_castWARNING this proxy 0x967500 has a NULL data object ptr
+SG::DataProxy_castWARNING this proxy 0x512fb80 has a NULL data object ptr
 <<---Error Message Ends-------
 *** ProxyProviderSvc_test OK ***
 *** ProxyProviderSvc_test RecordBeforeRead BEGINS ***
 StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  reset object aBar CLID 8107 address 0x957570
-DataProxy         VERBOSE requestRelease():  reset object aFoo CLID 8101 address 0x963fd0
-DataProxy         VERBOSE requestRelease():  reset object aFooBar CLID 8109 address 0
 StoreGateSvc_Impl WARNING record_impl: you are recording an object with key existingFoo, type Foo (CLID 8101)
  There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated.
-StoreGateSvc        DEBUG Recorded object @0x955c10 with key existingFoo of type Foo(CLID 8101)
- in DataObject @0x963fd0
+StoreGateSvc        DEBUG Recorded object @0x4e61ac0 with key existingFoo of type Foo(CLID 8101)
+ in DataObject @0x4f560f0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved const pointer to object existingFoo  of type Foo(CLID 8101)
 6.28
@@ -103,15 +111,15 @@ Now we expect to see an error message:
 <<---Error Message Ends-------
 StoreGateSvc_Impl WARNING record_impl: you are recording an object with key privFoo, type Foo (CLID 8101)
  There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated.
-StoreGateSvc        DEBUG Recorded object @0x971af0 with key privFoo of type Foo(CLID 8101)
- in DataObject @0x96fe90
+StoreGateSvc        DEBUG Recorded object @0x4da0030 with key privFoo of type Foo(CLID 8101)
+ in DataObject @0x4ed9a00
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x971ab0 with key privFoo of type Foo(CLID 8101)
- in DataObject @0x967d80
+StoreGateSvc        DEBUG overwrite: Recorded object @0x4dbd370 with key privFoo of type Foo(CLID 8101)
+ in DataObject @0x4ff46e0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const pointer to object privFoo  of type Foo(CLID 8101)
-StoreGateSvc        DEBUG Recorded object @0x971ad0 with key silly33 of type Foo(CLID 8101)
- in DataObject @0x969e00
+StoreGateSvc        DEBUG Recorded object @0x1d4f000 with key silly33 of type Foo(CLID 8101)
+ in DataObject @0x509ef70
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const pointer to object silly33  of type Foo(CLID 8101)
 Now we expect to see an error message:
@@ -130,18 +138,7 @@ Now we expect to see an error message:
 
 *** ProxyProviderSvc_test HLTAutoKeyReset BEGINS ***
 StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=1
-DataProxy         VERBOSE requestRelease():  release  object aBar CLID 8107 address 0
-DataProxy         VERBOSE requestRelease():  release  object silly33 CLID 8101 address 0
-DataProxy         VERBOSE requestRelease():  release  object privFoo CLID 8101 address 0x967d80
-DataProxy         VERBOSE requestRelease():  release  object diskFoo CLID 8101 address 0
-DataProxy         VERBOSE requestRelease():  release  object existingFoo CLID 8101 address 0x963fd0
-DataProxy         VERBOSE requestRelease():  release  object aFooBar CLID 8109 address 0
-DataProxy         VERBOSE requestRelease():  release  object aFoo CLID 8101 address 0
 StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_1 CLID 8101 address 0
-DataProxy         VERBOSE requestRelease():  reset object NOT_HLTAutoKey_3 CLID 8101 address 0
-DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_2 CLID 8101 address 0
-DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_3 CLID 8101 address 0
 *** ProxyProviderSvc_test HLTAutoKeyReset OK ***
 
 
@@ -149,31 +146,26 @@ DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_3 CLID 8
 
 
 StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=1
-DataProxy         VERBOSE requestRelease():  release  object NOT_HLTAutoKey_3 CLID 8101 address 0
-DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_1 CLID 8101 address 0
 =============Event #0 starts
-StoreGateSvc        DEBUG overwrite: Recorded object @0x971ad0 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x965c10
+StoreGateSvc        DEBUG overwrite: Recorded object @0x4dfc8d0 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x4f0e360
  object modifiable when retrieved
 Overwritten FooBar i=0
 StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x965c10
 FooBar i=0 deleted
 =============Event #1 starts
-StoreGateSvc        DEBUG overwrite: Recorded object @0x949920 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x965c10
+StoreGateSvc        DEBUG overwrite: Recorded object @0x4ea01f0 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x4f0e360
  object modifiable when retrieved
 Overwritten FooBar i=1
 StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x965c10
 FooBar i=1 deleted
 =============Event #2 starts
-StoreGateSvc        DEBUG overwrite: Recorded object @0x96fd00 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x965c10
+StoreGateSvc        DEBUG overwrite: Recorded object @0x4ee38b0 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x4f0e360
  object modifiable when retrieved
 Overwritten FooBar i=2
 StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x965c10
 FooBar i=2 deleted
 *** ProxyProviderSvc_test Overwrite OK ***