Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx

@@ -1070,12 +1070,12 @@ const Trk::TrackingGeometry* Calo::CaloTrackingGeometryBuilder::trackingGeometry
    // the Tile Crack volume (TileGap3, enum 17) inserted here
    // binned material for Crack : steering in binEta
    // TODO turn into 2D binned array
-   std::vector<const Trk::IdentifiedMaterial*> matCrack;
+   std::vector<Trk::IdentifiedMaterial> matCrack;
    // layer material can be adjusted here
    int baseID = Trk::GeometrySignature(Trk::Calo)*1000 + 17;
-   matCrack.push_back(new std::pair<const Trk::Material*,int>(mScint,baseID));
-   matCrack.push_back(new std::pair<const Trk::Material*,int>(m_caloMaterial,-1));
-   matCrack.push_back(new std::pair<const Trk::Material*,int>(mAl,-1));
+   matCrack.emplace_back(mScint,baseID);
+   matCrack.emplace_back(m_caloMaterial,-1);
+   matCrack.emplace_back(mAl,-1);
    //
    Trk::BinUtility* bun = new Trk::BinUtility(3,-1.8,-1.2,Trk::open,Trk::binEta);
    Trk::BinUtility* bup = new Trk::BinUtility(3, 1.2,1.8,Trk::open,Trk::binEta);

Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx

@@ -1080,12 +1080,12 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> Calo::CaloTrackingGeometry
    // the Tile Crack volume (TileGap3, enum 17) inserted here
    // binned material for Crack : steering in binEta
    // TODO turn into 2D binned array
-   std::vector<const Trk::IdentifiedMaterial*> matCrack;
+   std::vector<Trk::IdentifiedMaterial> matCrack;
    // layer material can be adjusted here
    int baseID = Trk::GeometrySignature(Trk::Calo)*1000 + 17;
-   matCrack.push_back(new std::pair<const Trk::Material*,int>(mScint,baseID));
-   matCrack.push_back(new std::pair<const Trk::Material*,int>(m_caloMaterial,-1));
-   matCrack.push_back(new std::pair<const Trk::Material*,int>(mAl,-1));
+   matCrack.emplace_back(mScint,baseID);
+   matCrack.emplace_back(m_caloMaterial,-1);
+   matCrack.emplace_back(mAl,-1);
    //
    Trk::BinUtility* bun = new Trk::BinUtility(3,-1.8,-1.2,Trk::open,Trk::binEta);
    Trk::BinUtility* bup = new Trk::BinUtility(3, 1.2,1.8,Trk::open,Trk::binEta);

Control/AthenaBaseComps/AthenaBaseComps/AthHistogramFilterAlgorithm.h

-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
-  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-/// @class AthHistogramFilterAlgorithm.h 
-/// Header file for AthHistogramAlgorithm
-/// @author: Karsten Koeneke (karsten.koeneke@cern.ch)
-/////////////////////////////////////////////////////////////////// 
-#ifndef ATHENABASECOMPS_ATHHISTOGRAMFILTERALGORITHM_H
-#define ATHENABASECOMPS_ATHHISTOGRAMFILTERALGORITHM_H 1
-
-// STL includes
-#include <string>
-
-// Framework includes
-#include "AthenaBaseComps/AthFilterAlgorithm.h"
-#include "AthenaBaseComps/AthHistogramming.h"
-#include "GaudiKernel/ServiceHandle.h"
-
-
-// Some needed forward declarations
-class ITHistSvc;
-
-
-
-
-class AthHistogramFilterAlgorithm
-  : public ::AthFilterAlgorithm,
-    public ::AthHistogramming
-{ 
-
-  /////////////////////////////////////////////////////////////////// 
-  // Public methods: 
-  /////////////////////////////////////////////////////////////////// 
-public: 
-
-  /// Constructor with parameters: 
-  AthHistogramFilterAlgorithm( const std::string& name, ISvcLocator* pSvcLocator );
-
-  /// Destructor: 
-  virtual ~AthHistogramFilterAlgorithm(); 
-
-  /** Initialization method invoked by the framework. This method is responsible
-   *  for any bookkeeping of initialization required by the framework itself.
-   *  It will in turn invoke the initialize() method of the derived algorithm,
-   *  and of any sub-algorithms which it creates.
-   */
-  virtual StatusCode sysInitialize();
-
-
-
-  /////////////////////////////////////////////////////////////////// 
-  // Const methods: 
-  ///////////////////////////////////////////////////////////////////
-
-  /** @brief The standard @c THistSvc (for writing histograms and TTrees 
-   *  and more to a root file)
-   * Returns (kind of) a pointer to the @c THistSvc
-   */
-  const ServiceHandle<ITHistSvc>& histSvc() const;
-
-
-
-  /////////////////////////////////////////////////////////////////// 
-  // Private methods: 
-  /////////////////////////////////////////////////////////////////// 
-private:
-  /// Default constructor: 
-  ///AthHistogramFilterAlgorithm();
-
-  
-
-  /////////////////////////////////////////////////////////////////// 
-  // Private data: 
-  /////////////////////////////////////////////////////////////////// 
-private: 
-
-  /// a handle on the Hist/TTree registration service
-  ServiceHandle<ITHistSvc> m_histSvc;
-
-
-  /// Name of the ROOT output stream (file)
-  std::string m_prefix;
-
-  /// Name of the ROOT directory
-  std::string m_rootDir;
-
-  /// The prefix for the histogram THx name
-  std::string m_histNamePrefix;
-
-  /// The postfix for the histogram THx name
-  std::string m_histNamePostfix;
-
-  /// The prefix for the histogram THx title
-  std::string m_histTitlePrefix;
-
-  /// The postfix for the histogram THx title
-  std::string m_histTitlePostfix;
-
-
-
-}; 
-
-// I/O operators
-//////////////////////
-
-// For the THistSvc
-inline const ServiceHandle<ITHistSvc>& AthHistogramFilterAlgorithm::histSvc() const 
-{
-  return m_histSvc;
-}
-
-#endif //> !ATHENABASECOMPS_ATHHISTOGRAMFILTERALGORITHM_H

Control/AthenaBaseComps/AthenaBaseComps/AthHistogramTool.h

-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-// AthHistogramTool.h 
-// Header file for class AthHistogramTool
-// Author: Karsten Koeneke
-/////////////////////////////////////////////////////////////////// 
-#ifndef ATHENABASECOMPS_ATHHISTOGRAMTOOL_H
-#define ATHENABASECOMPS_ATHHISTOGRAMTOOL_H 1
-
-// STL includes
-#include <string>
-
-// Framework includes
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "AthenaBaseComps/AthHistogramming.h"
-#include "GaudiKernel/ServiceHandle.h"
-
-
-// Some needed forward declarations
-class ITHistSvc;
-
-
-
-class AthHistogramTool
-  : public ::AthAlgTool,
-    public ::AthHistogramming
-{ 
-
-  /////////////////////////////////////////////////////////////////// 
-  // Public methods: 
-  /////////////////////////////////////////////////////////////////// 
-public: 
-
-  /// Constructor with parameters: 
-  AthHistogramTool( const std::string& type,
-                    const std::string& name, 
-                    const IInterface* parent );
-
-
-  /// Destructor:
-  virtual ~AthHistogramTool();
-
-  /////////////////////////////////////////////////////////////////// 
-  // Const methods: 
-  ///////////////////////////////////////////////////////////////////
-
-  /** @brief The standard @c THistSvc (for writing histograms and TTrees 
-   *  and more to a root file)
-   * Returns (kind of) a pointer to the @c THistSvc
-   */
-  const ServiceHandle<ITHistSvc>& histSvc() const;
-
-
-  /////////////////////////////////////////////////////////////////// 
-  // Non-const methods: 
-  /////////////////////////////////////////////////////////////////// 
-
-  /** Initialization method invoked by the framework. This method is responsible
-   *  for any bookkeeping of initialization required by the framework itself.
-   *  It will in turn invoke the initialize() method of the derived algorithm,
-   *  and of any sub-algorithms which it creates.
-   */
-  virtual StatusCode sysInitialize();
-
-
-
-  /////////////////////////////////////////////////////////////////// 
-  // Private data: 
-  /////////////////////////////////////////////////////////////////// 
-protected:
-  
-  /// Pointer to the THistSvc (event store by default)
-  ServiceHandle<ITHistSvc> m_histSvc;
-
-
-  /// Name of the ROOT output stream (file)
-  std::string m_prefix;
-
-  /// Name of the ROOT directory
-  std::string m_rootDir;
-
-  /// The prefix for the histogram THx name
-  std::string m_histNamePrefix;
-
-  /// The postfix for the histogram THx name
-  std::string m_histNamePostfix;
-
-  /// The prefix for the histogram THx title
-  std::string m_histTitlePrefix;
-
-  /// The postfix for the histogram THx title
-  std::string m_histTitlePostfix;
-
-
-}; 
-
-
-/////////////////////////////////////////////////////////////////// 
-// Inline methods: 
-/////////////////////////////////////////////////////////////////// 
-
-// For the THistSvc
-inline const ServiceHandle<ITHistSvc>& AthHistogramTool::histSvc() const 
-{
-  return m_histSvc;
-}
-
-
-#endif //> !ATHENABASECOMPS_ATHHISTOGRAMTOOL_H

Control/AthenaBaseComps/src/AthFilterAlgorithm.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
 */
 
 // AthFilterAlgorithm.cxx
@@ -74,10 +74,10 @@ AthFilterAlgorithm::sysInitialize()
   if ( Gaudi::StateMachine::INITIALIZED <= FSMState() ) return StatusCode::SUCCESS;
 
   // Set the Algorithm's properties
-  ATH_CHECK(setProperties());
+  bindPropertiesTo( serviceLocator()->getOptsSvc() );
 
   // Bypass the initialization if the algorithm is disabled.
-  // Need to do this after setProperties.
+  // Need to do this after bindPropertiesTo.
   if ( !isEnabled( ) ) return StatusCode::SUCCESS;
 
   // ---- stolen from GaudiKernel/Algorithm::sysInitialize ------- END ---

Control/AthenaBaseComps/src/AthHistogramAlgorithm.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
 */
 
 /// @class AthHistogramAlgorithm.h 
@@ -80,10 +80,10 @@ StatusCode AthHistogramAlgorithm::sysInitialize()
   if ( Gaudi::StateMachine::INITIALIZED <= FSMState() ) return StatusCode::SUCCESS;
 
   // Set the Algorithm's properties
-  ATH_CHECK(setProperties());
+  bindPropertiesTo( serviceLocator()->getOptsSvc() );
 
   // Bypass the initialization if the algorithm is disabled.
-  // Need to do this after setProperties.
+  // Need to do this after bindPropertiesTo.
   if ( !isEnabled( ) ) return StatusCode::SUCCESS;
   
   // ---- stolen from GaudiKernel/Algorithm::sysInitialize ------- END ---

Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx

-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/// @class AthHistogramFilterAlgorithm.h 
-/// Header file for class AthHistogramAlgorithm
-/// @author: Karsten Koeneke (karsten.koeneke@cern.ch)
-/////////////////////////////////////////////////////////////////// 
-
-// This class' header file
-#include "AthenaBaseComps/AthHistogramFilterAlgorithm.h"
-
-// STL includes
-#include <string>
-
-// Framework includes
-#include "Gaudi/Property.h"
-#include "GaudiKernel/ITHistSvc.h"
-
-
-
-/////////////////////////////////////////////////////////////////// 
-// Public methods: 
-/////////////////////////////////////////////////////////////////// 
-
-// Constructors
-////////////////
-AthHistogramFilterAlgorithm::AthHistogramFilterAlgorithm( const std::string& name, 
-                                                          ISvcLocator* pSvcLocator ) : 
-  ::AthFilterAlgorithm( name, pSvcLocator ),
-  ::AthHistogramming( name ),
-  m_histSvc ( "THistSvc/THistSvc", name )
-{
-  //
-  // Property declaration
-  // 
-  // The histogram service
-  declareProperty("THistSvc",
-                  m_histSvc = ServiceHandle<ITHistSvc>("THistSvc/THistSvc", name),
-                  "Handle to a THistSvc instance: it will be used to write "
-                  "ROOT objects to ROOT files" );
-
-  //declareProperty("THistService",      m_histSvc, "The THistSvc" );
-  declareProperty("RootStreamName",    m_prefix  = "/ANALYSIS", "Name of the output ROOT stream (file) that the THistSvc uses");
-  declareProperty("RootDirName",       m_rootDir = "",
-                  "Name of the ROOT directory inside the ROOT file where the histograms will go");
-
-  declareProperty( "HistNamePrefix",   m_histNamePrefix  = "", "The prefix for the histogram THx name" );
-  declareProperty( "HistNamePostfix",  m_histNamePostfix = "", "The postfix for the histogram THx name" );
-
-  declareProperty( "HistTitlePrefix",  m_histTitlePrefix  = "", "The prefix for the histogram THx title" );
-  declareProperty( "HistTitlePostfix", m_histTitlePostfix = "", "The postfix for the histogram THx title" );
-}
-
-
-
-
-// Destructor
-///////////////
-AthHistogramFilterAlgorithm::~AthHistogramFilterAlgorithm()
-{
-  ATH_MSG_DEBUG ("Calling destructor");
-}
-
-
-
-/** Initialization method invoked by the framework. This method is responsible
- *  for any bookkeeping of initialization required by the framework itself.
- *  It will in turn invoke the initialize() method of the derived algorithm,
- *  and of any sub-algorithms which it creates.
- */
-StatusCode AthHistogramFilterAlgorithm::sysInitialize()
-{
-  // ---- stolen from GaudiKernel/Algorithm::sysInitialize -------
-  // Bypass the initialization if the algorithm
-  // has already been initialized.
-  if ( Gaudi::StateMachine::INITIALIZED <= FSMState() ) return StatusCode::SUCCESS;
-
-  // Set the Algorithm's properties
-  ATH_CHECK(setProperties());
-
-  // Bypass the initialization if the algorithm is disabled.
-  // Need to do this after setProperties.
-  if ( !isEnabled( ) ) return StatusCode::SUCCESS;
-  
-  // ---- stolen from GaudiKernel/Algorithm::sysInitialize ------- END ---
-
-
-  // Get the THistSvc
-  ATH_CHECK ( histSvc().retrieve() );
-
-  // Configure the underlying AthHistogramming helper
-  ATH_CHECK ( AthHistogramming::configAthHistogramming( histSvc(),
-                                                        m_prefix,          m_rootDir, 
-                                                        m_histNamePrefix,  m_histNamePostfix,
-                                                        m_histTitlePrefix, m_histTitlePostfix ) );
-  
-  // Print some setup information into the log file
-  ATH_MSG_DEBUG ("Initializing " << name() << "...");
-  ATH_MSG_DEBUG (" using THistService     = " << m_histSvc );
-  ATH_MSG_DEBUG (" using RootStreamName   = " << m_prefix );
-  ATH_MSG_DEBUG (" using RootDirName      = " << m_rootDir );
-  ATH_MSG_DEBUG (" using HistNamePrefix   = " << m_histNamePrefix );
-  ATH_MSG_DEBUG (" using HistNamePostfix  = " << m_histNamePostfix );
-  ATH_MSG_DEBUG (" using HistTitlePrefix  = " << m_histTitlePrefix );
-  ATH_MSG_DEBUG (" using HistTitlePostfix = " << m_histTitlePostfix );
-
-
-  // re-direct to base class...
-  return AthFilterAlgorithm::sysInitialize();
-}
-

Control/AthenaBaseComps/src/AthHistogramTool.cxx

-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// AthHistogramTool.cxx 
-// Implementation file for class AthHistogramTool
-// Author: Karsten Koeneke
-/////////////////////////////////////////////////////////////////// 
-
-// This class' header includes
-#include "AthenaBaseComps/AthHistogramTool.h"
-
-// STL includes
-#include <string>
-
-// Framework includes
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ITHistSvc.h"
-
-
-
-
-/////////////////////////////////////////////////////////////////// 
-// Public methods: 
-/////////////////////////////////////////////////////////////////// 
-
-// Constructors
-////////////////
-AthHistogramTool::AthHistogramTool( const std::string& type, 
-                                    const std::string& name,
-                                    const IInterface* parent ) :
-  ::AthAlgTool( type, name, parent ),
-  ::AthHistogramming( name ),
-  m_histSvc ( "THistSvc/THistSvc", name )
-{
-  // Properties go here
-  declareProperty("THistSvc",
-                  m_histSvc = ServiceHandle<ITHistSvc>("THistSvc/THistSvc", name),
-                  "Handle to a THistSvc instance: it will be used to write "
-                  "ROOT objects to ROOT files" );
-
-  declareProperty("RootStreamName",    m_prefix  = "/ANALYSIS", "Name of the output ROOT stream (file) that the THistSvc uses");
-  declareProperty("RootDirName",       m_rootDir = "",
-                  "Name of the ROOT directory inside the ROOT file where the histograms will go");
-
-  declareProperty( "HistNamePrefix",   m_histNamePrefix  = "", "The prefix for the histogram THx name" );
-  declareProperty( "HistNamePostfix",  m_histNamePostfix = "", "The postfix for the histogram THx name" );
-
-  declareProperty( "HistTitlePrefix",  m_histTitlePrefix  = "", "The prefix for the histogram THx title" );
-  declareProperty( "HistTitlePostfix", m_histTitlePostfix = "", "The postfix for the histogram THx title" );
-}
-
-
-
-
-// Destructor
-///////////////
-AthHistogramTool::~AthHistogramTool()
-{
-  ATH_MSG_DEBUG ("Calling destructor");
-}
-
-
-/////////////////////////////////////////////////////////////////// 
-// Non-const methods: 
-/////////////////////////////////////////////////////////////////// 
-
-
-//=============================================================================
-// Athena initialize method
-//=============================================================================
-StatusCode AthHistogramTool::sysInitialize()
-{
-  /*
-  // ---- stolen from GaudiKernel/Algorithm::sysInitialize -------
-  // Bypass the initialization if the algorithm
-  // has already been initialized.
-  if ( Gaudi::StateMachine::INITIALIZED <= FSMState() ) return StatusCode::SUCCESS;
-
-  // Set the Algorithm's properties
-  ATH_CHECK(setProperties());
-
-  // Bypass the initialization if the algorithm is disabled.
-  // Need to do this after setProperties.
-  if ( !isEnabled( ) ) return StatusCode::SUCCESS;
-  
-  // ---- stolen from GaudiKernel/Algorithm::sysInitialize ------- END ---
-  */
-
-  // Get the THistSvc
-  ATH_CHECK ( histSvc().retrieve() );
-
-  // Configure the underlying AthHistogramming helper
-  ATH_CHECK ( AthHistogramming::configAthHistogramming( histSvc(),
-                                                        m_prefix,          m_rootDir, 
-                                                        m_histNamePrefix,  m_histNamePostfix,
-                                                        m_histTitlePrefix, m_histTitlePostfix ) );
-  
-  // Print some setup information into the log file
-  ATH_MSG_DEBUG ("Initializing " << name() << "...");
-  ATH_MSG_DEBUG (" using THistService     = " << m_histSvc );
-  ATH_MSG_DEBUG (" using RootStreamName   = " << m_prefix );
-  ATH_MSG_DEBUG (" using RootDirName      = " << m_rootDir );
-  ATH_MSG_DEBUG (" using HistNamePrefix   = " << m_histNamePrefix );
-  ATH_MSG_DEBUG (" using HistNamePostfix  = " << m_histNamePostfix );
-  ATH_MSG_DEBUG (" using HistTitlePrefix  = " << m_histTitlePrefix );
-  ATH_MSG_DEBUG (" using HistTitlePostfix = " << m_histTitlePostfix );
-
-
-  // re-direct to base class...
-  return AthAlgTool::sysInitialize();
-}

Control/AthenaBaseComps/test/AthAlgTool_test.cxx

 /*
- * Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
  */
 
-// $Id$
 /**
  * @file AthenaBaseComps/test/AthAlgTool_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -137,7 +136,7 @@ void test1 (ISvcLocator* svcloc)
 
   MyAlg alg ("toolalg", svcloc);  alg.addRef();
   MyAlgTool tool ("MyAlgTool", "tool2", &alg);  tool.addRef();
-  assert (tool.setProperties().isSuccess());
+  tool.bindPropertiesTo(svcloc->getOptsSvc());
   assert (tool.sysInitialize().isSuccess());
 
   assert (tool.rkey.clid() == 293847295);
@@ -210,14 +209,14 @@ void test2 (ISvcLocator* svcLoc)
 
   MyAlg alg ("arralg", svcLoc);  alg.addRef();
   MyArrAlgTool tool ("MyAlgTool", "arrtool", &alg);  tool.addRef();
-  assert (tool.setProperties().isSuccess());
+  tool.bindPropertiesTo(svcLoc->getOptsSvc());
   assert (tool.sysInitialize().isSuccess());
   comphandles (tool.inputHandles(),{"StoreGateSvc+raa", "StoreGateSvc+rbb", "StoreGateSvc+rcc", "StoreGateSvc+rdd", "StoreGateSvc+ree", "StoreGateSvc+rff", "StoreGateSvc+rrr"});
   comphandles (tool.outputHandles(),{"StoreGateSvc+waa", "StoreGateSvc+wbb", "StoreGateSvc+wcc", "StoreGateSvc+wdd", "StoreGateSvc+wee", "StoreGateSvc+wff", "StoreGateSvc+www"});
 
   // Test that circular dependency detection worksd.
   MyArrAlgTool tool2 ("MyArrAlgTool", "arrtool2", &alg);  tool2.addRef();
-  assert (tool2.setProperties().isSuccess());
+  tool2.bindPropertiesTo(svcLoc->getOptsSvc());
   assert (tool2.sysInitialize().isFailure());
 }
 

Control/AthenaBaseComps/test/AthAlgorithm_test.cxx

 /*
- * Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
  */
 
 // $Id$
@@ -117,7 +117,6 @@ void test1 (ISvcLocator* svcLoc)
   std::cout << "test1\n";
 
   MyAlg alg ("ralg", svcLoc);  alg.addRef();
-  //assert (alg.setProperties().isSuccess());
   assert (alg.sysInitialize().isSuccess());
 
   assert (alg.rkey.clid() == 293847295);

Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.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
 */
 
 // $Id$
@@ -114,7 +114,6 @@ void test1 (ISvcLocator* svcLoc)
   std::cout << "test1\n";
 
   MyAlg alg ("ralg", svcLoc);  alg.addRef();
-  //assert (alg.setProperties().isSuccess());
   assert (alg.sysInitialize().isSuccess());
 
   assert (alg.rkey.clid() == 293847295);

Control/AthenaBaseComps/test/propertyHandling_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -218,7 +218,6 @@ void test1 (ISvcLocator* svcLoc)
   std::cout << "test1\n";
 
   MyAthAlgorithm alg ("alg", svcLoc);  alg.addRef();
-  //assert (alg.setProperties().isSuccess());
   assert (alg.sysInitialize().isSuccess());
 
   assert (alg.rkey.clid() == 293847295);
@@ -315,7 +314,7 @@ void test2 (ISvcLocator* svcLoc)
 
   MyAthAlgorithm alg ("alg", svcLoc);  alg.addRef();
   MyAthAlgTool tool ("MyAthAlgTool", "tool", &alg);   tool.addRef();
-  assert (tool.setProperties().isSuccess());
+  tool.bindPropertiesTo(svcLoc->getOptsSvc());
   assert (tool.sysInitialize().isSuccess());
 
   assert (tool.rkey.clid() == 293847295);

Control/AthenaConfiguration/python/AutoConfigFlags.py

@@ -37,20 +37,21 @@ def _initializeGeometryParameters(geoTag):
     dbGeomCursor = AtlasGeoDBInterface(geoTag)
     dbGeomCursor.ConnectAndBrowseGeoDB()
 
-    # FIXME: geometry parameter names need to be unique across systems!
-    params = {}
-    params.update(CommonGeoDB.InitializeGeometryParameters(dbGeomCursor))
-    params.update(PixelGeoDB.InitializeGeometryParameters(dbGeomCursor))
-    params.update(LArGeoDB.InitializeGeometryParameters(dbGeomCursor))
-    params.update(MuonGeoDB.InitializeGeometryParameters(dbGeomCursor))
+    params = { 'Common' : CommonGeoDB.InitializeGeometryParameters(dbGeomCursor),
+               'Pixel' : PixelGeoDB.InitializeGeometryParameters(dbGeomCursor),
+               'LAr' : LArGeoDB.InitializeGeometryParameters(dbGeomCursor),
+               'Muon' : MuonGeoDB.InitializeGeometryParameters(dbGeomCursor) }
 
     return params
 
 
 @lru_cache(maxsize=4)  # maxsize=1 should be enough for most jobs
-def GetDetDescrInfo(geoTag):
-    """Query geometry DB for detector description"""
+def DetDescrInfo(geoTag):
+    """Query geometry DB for detector description. Returns dictionary with
+    detector description. Queries DB for each tag only once.
 
+    geoTag: gemometry tag (e.g. ATLAS-R2-2016-01-00-01)
+    """
     detDescrInfo = _initializeGeometryParameters(geoTag)
     detDescrInfo["geomTag"] = geoTag
     return detDescrInfo

Control/AthenaConfiguration/python/DetectorConfigFlags.py

 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-from __future__ import print_function
-
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
-from AthenaConfiguration.AutoConfigFlags import GetDetDescrInfo
+from AthenaConfiguration.AutoConfigFlags import DetDescrInfo
 # This module is based upon Control/AthenaCommon/python/DetFlags.py
 # Only some flags have been migrated. A full list of what the old
 # DetFlags provided is given for reference below:
@@ -56,13 +54,13 @@ def createDetectorConfigFlags():
 
     dcf.addFlag('Detector.GeometryLAr',   False) # Add separate em HEC and FCAL flags?
     dcf.addFlag('Detector.GeometryTile',  False)
-    dcf.addFlag('Detector.GeometryCalo',  lambda prevFlags : (prevFlags.Detector.GeometryLAr or prevFlags.Detector.GeometryTile))
-    dcf.addFlag('Detector.GeometryCSC',   lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('HasCSC',"True"))
+    dcf.addFlag('Detector.GeometryCalo', lambda prevFlags : (prevFlags.Detector.GeometryLAr or prevFlags.Detector.GeometryTile))
+    dcf.addFlag('Detector.GeometryCSC', lambda prevFlags : DetDescrInfo(prevFlags.GeoModel.AtlasVersion)['Muon']['HasCSC'])
     dcf.addFlag('Detector.GeometryMDT',   False)
     dcf.addFlag('Detector.GeometryRPC',   False)
     dcf.addFlag('Detector.GeometryTGC',   False)
-    dcf.addFlag('Detector.GeometrysTGC',  lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('HasSTGC',"True")) # Set default according to prevFlags.GeoModel.Run?
-    dcf.addFlag('Detector.GeometryMM',    lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('HasMM',"True")) # Set default according to prevFlags.GeoModel.Run?
+    dcf.addFlag('Detector.GeometrysTGC', lambda prevFlags : DetDescrInfo(prevFlags.GeoModel.AtlasVersion)['Muon']['HasSTGC'])
+    dcf.addFlag('Detector.GeometryMM', lambda prevFlags : DetDescrInfo(prevFlags.GeoModel.AtlasVersion)['Muon']['HasMM'])
     dcf.addFlag('Detector.GeometryMuon',  lambda prevFlags : (prevFlags.Detector.GeometryCSC or prevFlags.Detector.GeometryMDT or
                                                               prevFlags.Detector.GeometryRPC or prevFlags.Detector.GeometryTGC or
                                                               prevFlags.Detector.GeometrysTGC or prevFlags.Detector.GeometryMM))

Control/AthenaConfiguration/python/GeoModelConfigFlags.py

 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
-from AthenaConfiguration.AutoConfigFlags import GetFileMD, GetDetDescrInfo
+from AthenaConfiguration.AutoConfigFlags import GetFileMD, DetDescrInfo
 
 def createGeoModelConfigFlags():
     gcf=AthConfigFlags()
+
     gcf.addFlag('GeoModel.Layout', 'atlas') # replaces global.GeoLayout
-    gcf.addFlag("GeoModel.AtlasVersion", lambda prevFlags : (prevFlags.Input.Files and prevFlags.Input.Files != ["_ATHENA_GENERIC_INPUTFILE_NAME_"] and GetFileMD(prevFlags.Input.Files).get("GeoAtlas",None)) or "ATLAS-R2-2016-01-00-01") #
-    gcf.addFlag("GeoModel.Align.Dynamic", lambda prevFlags : (not prevFlags.Detector.Simulate and not prevFlags.Input.isMC))
-    gcf.addFlag("GeoModel.StripGeoType", lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('StripGeoType',"GMX")) # Based on CommonGeometryFlags.StripGeoType
-    gcf.addFlag("GeoModel.Run", lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('Run',"RUN2")) # Based on CommonGeometryFlags.Run (InDetGeometryFlags.isSLHC replaced by GeoModel.Run=="RUN4")
-    gcf.addFlag("GeoModel.Type", lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('GeoType',"UNDEFINED")) # Geometry type in {ITKLoI, ITkLoI-VF, etc...}
-    gcf.addFlag("GeoModel.IBLLayout", lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('IBLlayout',"UNDEFINED")) # IBL layer layout  in {"planar", "3D", "noIBL", "UNDEFINED"}
+
+    gcf.addFlag("GeoModel.AtlasVersion",
+                lambda prevFlags : ((prevFlags.Input.Files and
+                                    prevFlags.Input.Files != ["_ATHENA_GENERIC_INPUTFILE_NAME_"] and
+                                    GetFileMD(prevFlags.Input.Files).get("GeoAtlas",None))
+                                    or "ATLAS-R2-2016-01-00-01"))
+
+    gcf.addFlag("GeoModel.Align.Dynamic",
+                lambda prevFlags : not prevFlags.Detector.Simulate and not prevFlags.Input.isMC)
+
+    gcf.addFlag("GeoModel.StripGeoType",
+                lambda prevFlags : DetDescrInfo(prevFlags.GeoModel.AtlasVersion)['Common']['StripGeoType'])
+
+    gcf.addFlag("GeoModel.Run",
+                lambda prevFlags : DetDescrInfo(prevFlags.GeoModel.AtlasVersion)['Common']['Run'])
+                # Based on CommonGeometryFlags.Run (InDetGeometryFlags.isSLHC replaced by GeoModel.Run=="RUN4")
+
+    gcf.addFlag("GeoModel.Type",
+                lambda prevFlags : DetDescrInfo(prevFlags.GeoModel.AtlasVersion)['Common']['GeoType'])
+                # Geometry type in {ITKLoI, ITkLoI-VF, etc...}
+
+    gcf.addFlag("GeoModel.IBLLayout",
+                lambda prevFlags : DetDescrInfo(prevFlags.GeoModel.AtlasVersion)['Pixel']['IBLlayout'])
+                # IBL layer layout  in {"planar", "3D", "noIBL"}
+
     return gcf

Control/Navigation/Navigation/NavWrapper.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef NAVIGATION_NAVWRAPPER_H
@@ -201,9 +201,9 @@ class NavWrapper<NavigableTerminalNode>
 public:
 
   /*! \brief Default constructor */
-  NavWrapper<NavigableTerminalNode>() { };
+  NavWrapper() { };
   /*! \brief Base class destructor */
-  virtual ~NavWrapper<NavigableTerminalNode>() { };
+  virtual ~NavWrapper() { };
 
   /*!{ \brief Do-nothing visitor */
   virtual void fillToken(INavigationToken& /*rToken*/) const { };

Database/APR/RootStorageSvc/src/RootTreeContainer.cpp

@@ -430,7 +430,7 @@ RootTreeContainer::loadObject(void** obj_p, ShapeH /*shape*/, Token::OID_t& oid)
                ::strcpy(q.c_str, p.c_str);
                break;
             case DbColumn::BLOB:
-               q.blob->adopt((char*)s_char_Blob.m_buffer,s_char_Blob.m_size);
+               p.blob->adopt((char*)s_char_Blob.m_buffer,s_char_Blob.m_size);
                s_char_Blob.release(false);
                break;
             case DbColumn::POINTER:

Database/AthenaPOOL/AthenaPoolUtilities/cmake/AthenaPoolUtilitiesTestConfig.cmake

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 #
-# $Id: AthenaPoolUtilitiesTestConfig.cmake 780067 2016-10-24 14:39:09Z krasznaa $
 # @file AthenaPoolUtilities/share/AthenaPoolUtilitiesTestConfig.make
 # @author sss
 # @date May, 2016
@@ -20,19 +19,20 @@ function( run_tpcnv_legacy_test testName refName )
    atlas_get_package_name( pkgName )
 
    # Find the test runner script:
-   find_file( _testSkel run_tpcnv_legacy_test.sh.in
-      PATH_SUFFIXES share scripts
-      PATHS ${AthenaPoolUtilitiesTest_DIR}/..
-      ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}/cmake/modules
+   find_file( ATLAS_TPCNV_LEGACY_TEST_RUNNER "run_tpcnv_legacy_test.sh.in"
+      PATH_SUFFIXES "share" "scripts"
+      PATHS "${AthenaPoolUtilitiesTest_DIR}/.."
+      "${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}/cmake/modules"
       ${CMAKE_MODULE_PATH} )
-   if( NOT _testSkel )
+   if( NOT ATLAS_TPCNV_LEGACY_TEST_RUNNER )
       message( WARNING "Couldn't find run_tpcnv_legacy_test.sh.in" )
       return()
    endif()
+   mark_as_advanced( ATLAS_TPCNV_LEGACY_TEST_RUNNER )
 
    # Create the script that will be run:
-   configure_file( ${_testSkel}
-      ${CMAKE_CURRENT_BINARY_DIR}/tpcnv_legacy_${testName}.sh
+   configure_file( "${ATLAS_TPCNV_LEGACY_TEST_RUNNER}"
+      "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/tpcnv_legacy_${testName}.sh"
       @ONLY )
 
     set( _env )
@@ -42,7 +42,8 @@ function( run_tpcnv_legacy_test testName refName )
 
    # Create a test with it:
    atlas_add_test( ${testName}
-      SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/tpcnv_legacy_${testName}.sh
+      SCRIPT
+      "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/tpcnv_legacy_${testName}.sh"
       PROPERTIES TIMEOUT 600
       POST_EXEC_SCRIPT "post_tpcnvtest.sh ${testName}" ${_env} )
 
@@ -56,19 +57,20 @@ function( run_tpcnv_test testName refName )
    atlas_get_package_name( pkgName )
 
    # Find the test runner script:
-   find_file( _testSkel run_tpcnv_test.sh.in
-      PATH_SUFFIXES share scripts
-      PATHS ${AthenaPoolUtilitiesTest_DIR}/..
-      ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}/cmake/modules
+   find_file( ATLAS_TPCNV_TEST_RUNNER "run_tpcnv_test.sh.in"
+      PATH_SUFFIXES "share" "scripts"
+      PATHS "${AthenaPoolUtilitiesTest_DIR}/.."
+      "${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}/cmake/modules"
       ${CMAKE_MODULE_PATH} )
-   if( NOT _testSkel )
+   if( NOT ATLAS_TPCNV_TEST_RUNNER )
       message( WARNING "Couldn't find run_tpcnv_test.sh.in" )
       return()
    endif()
+   mark_as_advanced( ATLAS_TPCNV_TEST_RUNNER )
 
    # Create the script that will be run:
-   configure_file( ${_testSkel}
-      ${CMAKE_CURRENT_BINARY_DIR}/tpcnv_${testName}.sh
+   configure_file( "${ATLAS_TPCNV_TEST_RUNNER}"
+      "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/tpcnv_${testName}.sh"
       @ONLY )
 
     set( _env )
@@ -78,7 +80,8 @@ function( run_tpcnv_test testName refName )
 
    # Create a test with it:
    atlas_add_test( ${testName}
-      SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/tpcnv_${testName}.sh
+      SCRIPT
+      "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/tpcnv_${testName}.sh"
       PROPERTIES TIMEOUT 600
       POST_EXEC_SCRIPT "post_tpcnvtest.sh ${testName}" ${_env} )
 

DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h

@@ -27,24 +27,24 @@ class GeoModelSvc : public AthService, virtual public IGeoModelSvc,
 {
 public:
 
-    virtual StatusCode initialize();
-    virtual StatusCode finalize();
+    virtual StatusCode initialize() override;
+    virtual StatusCode finalize() override;
 
     // Query the interfaces.
     //   Input: riid, Requested interface ID
     //          ppvInterface, Pointer to requested interface
     //   Return: StatusCode indicating SUCCESS or FAILURE.
     // N.B. Don't forget to release the interface after use!!!
-    virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface );
+    virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
 
     /// Callback from TagInfoMgr on TagInfo change
     virtual void       tagInfoUpdated() override final;
 
     StatusCode compareTags();
 
-    virtual const IGeoModelTool* getTool(std::string toolName) const;
+    virtual const IGeoModelTool* getTool(std::string toolName) const override;
 
-    virtual StatusCode clear();
+    virtual StatusCode clear() override;
 
     friend class SvcFactory<GeoModelSvc>;
 
@@ -98,32 +98,32 @@ private:
     int           m_supportedGeometry;            // Supported geometry flag is set in jobOpt and is equal to major release version
     bool          m_ignoreTagSupport;             // If true then don't check SUPPORT flag for ATLAS tag
 
-    const std::string & atlasVersion()         const {return m_AtlasVersion; }
-    const std::string & inDetVersionOverride() const {return m_InDetVersionOverride ;}
-    const std::string & pixelVersionOverride() const {return m_PixelVersionOverride ;}
-    const std::string & SCT_VersionOverride()  const {return m_SCT_VersionOverride  ;}
-    const std::string & TRT_VersionOverride()  const {return m_TRT_VersionOverride  ;}
-    const std::string & LAr_VersionOverride()  const {return m_LAr_VersionOverride  ;}
-    const std::string & tileVersionOverride()  const {return m_TileVersionOverride  ;}
-    const std::string & muonVersionOverride()  const {return m_MuonVersionOverride  ;}
-    const std::string & caloVersionOverride()  const {return m_CaloVersionOverride  ;}
-    const std::string & magFieldVersionOverride()     const {return m_MagFieldVersionOverride  ;}
-    const std::string & cavernInfraVersionOverride()  const {return m_CavernInfraVersionOverride  ;}
-    const std::string & forwardDetectorsVersionOverride()  const {return m_ForwardDetectorsVersionOverride  ;}
-
-    const std::string & inDetVersion()         const {return m_geoDbTagSvc->inDetVersion(); }
-    const std::string & pixelVersion()         const {return m_geoDbTagSvc->pixelVersion(); }
-    const std::string & SCT_Version()          const {return m_geoDbTagSvc->SCT_Version(); }
-    const std::string & TRT_Version()          const {return m_geoDbTagSvc->TRT_Version(); }
-    const std::string & LAr_Version()          const {return m_geoDbTagSvc->LAr_Version(); }
-    const std::string & tileVersion()          const {return m_geoDbTagSvc->tileVersion(); }
-    const std::string & muonVersion()          const {return m_geoDbTagSvc->muonVersion(); }
-    const std::string & caloVersion()          const {return m_geoDbTagSvc->caloVersion(); }
-    const std::string & magFieldVersion()      const {return m_geoDbTagSvc->magFieldVersion(); }
-    const std::string & cavernInfraVersion()   const {return m_geoDbTagSvc->cavernInfraVersion(); }
-    const std::string & forwardDetectorsVersion()   const {return m_geoDbTagSvc->forwardDetectorsVersion(); }
-
-    GeoModel::GeoConfig geoConfig() const {return m_geoDbTagSvc->geoConfig();}
+    virtual const std::string & atlasVersion()         const override {return m_AtlasVersion; }
+    virtual const std::string & inDetVersionOverride() const override {return m_InDetVersionOverride ;}
+    virtual const std::string & pixelVersionOverride() const override {return m_PixelVersionOverride ;}
+    virtual const std::string & SCT_VersionOverride()  const override {return m_SCT_VersionOverride  ;}
+    virtual const std::string & TRT_VersionOverride()  const override {return m_TRT_VersionOverride  ;}
+    virtual const std::string & LAr_VersionOverride()  const override {return m_LAr_VersionOverride  ;}
+    virtual const std::string & tileVersionOverride()  const override {return m_TileVersionOverride  ;}
+    virtual const std::string & muonVersionOverride()  const override {return m_MuonVersionOverride  ;}
+    virtual const std::string & caloVersionOverride()  const override {return m_CaloVersionOverride  ;}
+    virtual const std::string & magFieldVersionOverride()     const override {return m_MagFieldVersionOverride  ;}
+    virtual const std::string & cavernInfraVersionOverride()  const override {return m_CavernInfraVersionOverride  ;}
+    virtual const std::string & forwardDetectorsVersionOverride()  const override {return m_ForwardDetectorsVersionOverride  ;}
+
+    virtual const std::string & inDetVersion()         const override {return m_geoDbTagSvc->inDetVersion(); }
+    virtual const std::string & pixelVersion()         const override {return m_geoDbTagSvc->pixelVersion(); }
+    virtual const std::string & SCT_Version()          const override {return m_geoDbTagSvc->SCT_Version(); }
+    virtual const std::string & TRT_Version()          const override {return m_geoDbTagSvc->TRT_Version(); }
+    virtual const std::string & LAr_Version()          const override {return m_geoDbTagSvc->LAr_Version(); }
+    virtual const std::string & tileVersion()          const override {return m_geoDbTagSvc->tileVersion(); }
+    virtual const std::string & muonVersion()          const override {return m_geoDbTagSvc->muonVersion(); }
+    virtual const std::string & caloVersion()          const override {return m_geoDbTagSvc->caloVersion(); }
+    virtual const std::string & magFieldVersion()      const override {return m_geoDbTagSvc->magFieldVersion(); }
+    virtual const std::string & cavernInfraVersion()   const override {return m_geoDbTagSvc->cavernInfraVersion(); }
+    virtual const std::string & forwardDetectorsVersion()   const override {return m_geoDbTagSvc->forwardDetectorsVersion(); }
+
+    virtual GeoModel::GeoConfig geoConfig() const override {return m_geoDbTagSvc->geoConfig();}
 
     StatusCode geoInit ();
     StatusCode fillTagInfo() const;