AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/DummyLumirangeTool.h

@@ -19,7 +19,7 @@
 //<<<<<< INCLUDES                                                       >>>>>>
 
 #include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "StoreGate/WriteHandleKey.h"
 #include "DBDataModel/CollectionMetadata.h"

AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.cxx

@@ -12,7 +12,7 @@
 #include "EventTagReader.h"
 
 #include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
 #include "GaudiKernel/ISvcLocator.h"
 
 #include "CoralBase/AttributeListSpecification.h"

AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt

@@ -36,7 +36,7 @@ function (athenapooltest_run_test testName jo pattern)
                   @ONLY )
   atlas_add_test( ${testName}
                   SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/athenapooltest_${testName}.sh
-                  ENVIRONMENT "ATLAS_REFERENCE_TAG=AthenaPoolTest/AthenaPoolTest-01-00-08"
+                  ENVIRONMENT "ATLAS_REFERENCE_TAG=AthenaPoolTest/AthenaPoolTest-01-00-09"
                   POST_EXEC_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/test/post_check_with_select.sh ${testName} ${pattern}"
                   PROPERTIES TIMEOUT 900
                    )
@@ -49,7 +49,7 @@ endfunction (athenapooltest_run_test)
 
 # Write/read out some simple objects:
 athenapooltest_run_test( AthenaPoolTestWrite AthenaPoolTestWrite
-                         "^..AthenaPoolTestD" )
+                         "^AthenaPoolTestD" )
 athenapooltest_run_test( AthenaPoolTestRead AthenaPoolTestRead
                          "AthenaPoolTestD"
                          DEPENDS AthenaPoolTestWrite )

AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoRead.py

@@ -93,9 +93,6 @@ AthenaEventLoopMgr.OutputLevel = INFO
 
 EventInfoReader.OutputLevel   = DEBUG
 svcMgr.TagInfoMgr.OutputLevel = DEBUG
-svcMgr.IOVDbSvc.OutputLevel   = DEBUG
-svcMgr.IOVSvc.OutputLevel   = DEBUG
-#svcMgr.DetectorStore.Dump = TRUE
 
 
 # No stats printout

AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep3.py

@@ -121,7 +121,7 @@ svcMgr.TagInfoMgr.OutputLevel = DEBUG
 #--------------------------------------------------------------
 from IOVDbMetaDataTools.IOVDbMetaDataToolsConf import IOVDbMetaDataTool
 ToolSvc += IOVDbMetaDataTool( "IOVDbMetaDataTool" )
-IOVDbMetaDataTool.OutputLevel      = DEBUG
+IOVDbMetaDataTool.OutputLevel      = INFO
 
 # No stats printout
 include( "AthenaPoolTest/NoStats_jobOptions.py" )

AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TestGaudiProperty.h

@@ -8,7 +8,7 @@
 #define ATLASHISTORY_TESTGAUDIPROPERTY_H
 
 //#include "GaudiKernel/HistoryObj.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
 
 #include <string>
 #include <vector>
@@ -27,17 +27,17 @@ class TestGaudiProperty {
 
 public:
 
-  //typedef std::vector< std::pair<std::string,const Property*> > PropertyList;
-  //typedef std::vector< const Property* > PropertyList;
-  //typedef const Property* PropertyList;
+  //typedef std::vector< std::pair<std::string,const Gaudi::Details::PropertyBase*> > PropertyList;
+  //typedef std::vector< const Gaudi::Details::PropertyBase* > PropertyList;
+  //typedef const Gaudi::Details::PropertyBase* PropertyList;
 
 private:  // data
 
   //PropertyList m_props;
   //Property     m_p1;
-  Property*    m_pptr;
-  const Property*  m_cptr;
-  std::vector<Property*> m_ncprops;
+  Gaudi::Details::PropertyBase*    m_pptr;
+  const Gaudi::Details::PropertyBase*  m_cptr;
+  std::vector<Gaudi::Details::PropertyBase*> m_ncprops;
 
 public:  // functions
 
@@ -47,11 +47,11 @@ public:  // functions
   // Destructor.
   ~TestGaudiProperty();
 
-  //void addProperty( const std::string&, const Property* );
-  //void addProperty( const Property* );
+  //void addProperty( const std::string&, const Gaudi::Details::PropertyBase* );
+  //void addProperty( const Gaudi::Details::PropertyBase* );
 
   //const PropertyList& properties() const { return m_props; }
-  const Property* property() const { return m_cptr; }
+  const Gaudi::Details::PropertyBase* property() const { return m_cptr; }
 
 private:
 

AtlasTest/DatabaseTest/AthenaPoolTestData/src/TestGaudiProperty.cxx

@@ -17,7 +17,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 #include "GaudiKernel/System.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
 #include "AthenaPoolTestData/TestGaudiProperty.h"
 
 #include <cstdlib>
@@ -47,11 +47,11 @@ TestGaudiProperty::~TestGaudiProperty() {
 }
 /*
 void
-//TestGaudiProperty::addProperty(const std::string& client, const Property* prop) {
-TestGaudiProperty::addProperty(const Property* prop) {
+//TestGaudiProperty::addProperty(const std::string& client, const Gaudi::Details::PropertyBase* prop) {
+TestGaudiProperty::addProperty(const Gaudi::Details::PropertyBase* prop) {
 //  if (m_props.find(prop) == m_props.end()) {
     //m_props.push_back( prop);
-    //m_ncprops.push_back( const_cast<Property*>(prop));
+    //m_ncprops.push_back( const_cast<Gaudi::Details::PropertyBase*>(prop));
     //m_p1 = *prop;
     //m_pptr = m_ncprops[0];
     m_cptr = prop;

AtlasTest/TestTools/share/post.sh

@@ -316,10 +316,10 @@ else
            process $joblog $jobdiff
            process $reflog $refdiff
 
-           diff -a -b -E -B -u $jobdiff $refdiff
+           diff -a -b -E -B -u $refdiff $jobdiff
            diffStatus=$?
            if [ $diffStatus != 0 ] ; then
-               echo "$RED post.sh> ERROR: $joblog and $reflog differ $RESET"
+               echo "$RED post.sh> ERROR: $reflog and $joblog differ $RESET"
                # Return with failure in this case:
                exit 1
            fi

Calorimeter/CaloCalibHitRec/CaloCalibHitRec/ATLAS_CHECK_THREAD_SAFETY

+Calorimeter/CaloCalibHitRec

Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker2.cxx

@@ -820,7 +820,6 @@ Calculation of energy fraction caused by particles of different types
 void CaloCalibClusterMomentsMaker2::get_calib_frac(const std::map<unsigned int,int>& truthBarcodeToPdgCodeMap,
                                                    const MyClusInfo& clusInfo, std::vector<double> &engFrac) const
 {
-  static unsigned int nWarnings = 0;
   engFrac.assign(kCalibFracMax, 0.0);
   if(clusInfo.engCalibIn.engTot <= 0.0) return;
   // each MyClusInfo has a map of particle's barcode and particle calibration deposits in given cluster
@@ -829,10 +828,7 @@ void CaloCalibClusterMomentsMaker2::get_calib_frac(const std::map<unsigned int,i
     int pdg_id = 0;
     try { pdg_id = truthBarcodeToPdgCodeMap.at(barcode); }
     catch (const std::out_of_range& e){
-      if (nWarnings < 10 ){
-	ATH_MSG_WARNING("truthBarcodeToPdgCodeMap cannot find an entry with barcode " << barcode);
-	nWarnings++;
-      }
+      ATH_MSG_WARNING("truthBarcodeToPdgCodeMap cannot find an entry with barcode " << barcode);
       continue;
     }
 

Calorimeter/CaloClusterCorrection/src/CaloRunClusterCorrections.cxx

@@ -22,7 +22,7 @@
 #include "AthenaKernel/errorcheck.h"
 #include "CxxUtils/Array.h"
 #include "AthenaKernel/getMessageSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/IToolSvc.h"
@@ -771,10 +771,10 @@ CaloRunClusterCorrections::orderCorrections ATLAS_NOT_THREAD_SAFE (bool allowMis
       // Tool is being initialized from JO.  Find the order property from JOS.
       tool.order = -1;
       std::string fullname = this->name() + "." + tool.name;
-      const std::vector<const Property*>* props =
+      const std::vector<const Gaudi::Details::PropertyBase*>* props =
         m_jos->getProperties (fullname);
       for (size_t iprop = 0; iprop < props->size(); iprop++) {
-        const Property& prop = *(*props)[iprop];
+        const Gaudi::Details::PropertyBase& prop = *(*props)[iprop];
         if (prop.name() == "order") {
           tool.order = std::atoi (prop.toString().c_str());
           break;

Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx

@@ -41,6 +41,8 @@
 
 #include "TileDetDescr/TileDetDescrManager.h"
 
+#include <GaudiKernel/ThreadLocalContext.h>
+
 long int CaloMgrDetDescrCnv::repSvcType() const
 {
   return storageType();
@@ -71,7 +73,12 @@ StatusCode CaloMgrDetDescrCnv::finalize()
 
 StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj) 
 {
-  MsgStream log(msgSvc(), "CaloMgrDetDescrCnv");
+  // Ensure that this object is created inside the event loop
+  auto ctx = Gaudi::Hive::currentContext();
+  MsgStream log( msgSvc(), "CaloMgrDetDescrCnv" );
+  if ( !ctx.valid() ) {
+    log << MSG::WARNING << "Attempting to create a Calo Detector Manager object outside of the event loop. Geometry may not be aligned." << endmsg;
+  }
   log << MSG::INFO << "in createObj: creating a Calo Detector Manager object in the detector store" << endmsg;
 
   bool debug = log.level()<=MSG::DEBUG; 

Calorimeter/CaloConditions/CaloConditions/CaloBadChannel.h

@@ -16,14 +16,9 @@ class CaloBadChannel {
   CaloBadChannel( BitWord rawStatus) : m_word(rawStatus) {}
   CaloBadChannel() : m_word(0) {}
 
-  CaloBadChannel(const CaloBadChannel& rBad) {m_word=rBad.m_word;}
+  CaloBadChannel(const CaloBadChannel& rBad) = default;
   CaloBadChannel(const CaloBadChannel* pBad) {m_word=pBad->m_word;}
-  CaloBadChannel& operator= (const CaloBadChannel& rBad) {
-    if (this != &rBad) {
-      m_word = rBad.m_word;
-    }
-    return *this;
-  }
+  CaloBadChannel& operator= (const CaloBadChannel& rBad) = default;
 
   bool statusOK( ProblemType pb) const {
     BitWord mask = 1 << (PosType) pb;

Calorimeter/CaloConditions/CaloConditions/CaloLocalHadCoeff.h

@@ -82,9 +82,13 @@ class CaloLocalHadCoeff {
         /**
          * @brief Copy constructor
          */
-        LocalHadDimension(const LocalHadDimension &other);
-        LocalHadDimension& operator= (const LocalHadDimension &other);
-
+        LocalHadDimension(const LocalHadDimension &other) = default;
+        LocalHadDimension& operator= (const LocalHadDimension &other) = default;
+        /**
+         * @brief Move constructor
+         */
+        LocalHadDimension( LocalHadDimension &&) noexcept = default;
+        LocalHadDimension& operator= ( LocalHadDimension &&)  noexcept = default;
         // access methods
 
         /// return dimension type
@@ -157,8 +161,10 @@ class CaloLocalHadCoeff {
         /**
          * @brief Copy constructor
          */
-        LocalHadArea(const LocalHadArea &other);
-        LocalHadArea& operator= (const LocalHadArea &other);
+        LocalHadArea(const LocalHadArea &other) = default;
+        LocalHadArea& operator= (const LocalHadArea &other) = default;
+        LocalHadArea( LocalHadArea &&other) noexcept = default;
+        LocalHadArea& operator= ( LocalHadArea &&other) noexcept = default;
 
         /// return area type
         inline unsigned int getType() const { return m_type; }
@@ -220,8 +226,11 @@ class CaloLocalHadCoeff {
     /**
      * @brief Copy constructor.
      */
-    CaloLocalHadCoeff(const CaloLocalHadCoeff &other);
-    CaloLocalHadCoeff& operator= (const CaloLocalHadCoeff &other);
+    CaloLocalHadCoeff(const CaloLocalHadCoeff &other) = default;
+    CaloLocalHadCoeff& operator= (const CaloLocalHadCoeff &other) = default;
+    //Move operators
+    CaloLocalHadCoeff(CaloLocalHadCoeff &&) noexcept = default;
+    CaloLocalHadCoeff& operator= (CaloLocalHadCoeff &&) noexcept = default;
 
     //
     // general access methods

Calorimeter/CaloConditions/src/CaloLocalHadCoeff.cxx

@@ -21,32 +21,6 @@
 LocalHadDimension ->
 *************************************************************************** */
 
-// copy constructor
-CaloLocalHadCoeff::LocalHadDimension::LocalHadDimension(const CaloLocalHadCoeff::LocalHadDimension &other)
-  : m_title (other.m_title),
-    m_type (other.m_type),
-    m_nbins (other.m_nbins),
-    m_xmin (other.m_xmin),
-    m_xmax (other.m_xmax),
-    m_dx (other.m_dx),
-    m_xbins (other.m_xbins)
-{
-}
-
-CaloLocalHadCoeff::LocalHadDimension&
-CaloLocalHadCoeff::LocalHadDimension::operator= (const CaloLocalHadCoeff::LocalHadDimension &other)
-{
-  if (this != &other) {
-    m_title = other.m_title;
-    m_type = other.m_type;
-    m_nbins = other.m_nbins;
-    m_xmin = other.m_xmin;
-    m_xmax = other.m_xmax;
-    m_dx = other.m_dx;
-    m_xbins = other.m_xbins;
-  }
-  return *this;
-}
 
 // return bin number for cluster variable
 int CaloLocalHadCoeff::LocalHadDimension::getBin(float &x) const
@@ -157,32 +131,6 @@ bool CaloLocalHadCoeff::isFilled(const int bin) const
 /* ***************************************************************************
 LocalHadArea ->
 *************************************************************************** */
-// copy constructor
-CaloLocalHadCoeff::LocalHadArea::LocalHadArea(const CaloLocalHadCoeff::LocalHadArea &other)
-  : m_title (other.m_title),
-    m_type (other.m_type),
-    m_npars (other.m_npars),
-    m_offset (other.m_offset),
-    m_length (other.m_length),
-    m_dims (other.m_dims),
-    m_dims_loc (other.m_dims_loc)
-{
-}
-
-CaloLocalHadCoeff::LocalHadArea&
-CaloLocalHadCoeff::LocalHadArea::operator=(const CaloLocalHadCoeff::LocalHadArea &other)
-{
-  if (this != &other) {
-    m_title = other.m_title;
-    m_type = other.m_type;
-    m_npars = other.m_npars;
-    m_offset = other.m_offset;
-    m_length = other.m_length;
-    m_dims = other.m_dims;
-    m_dims_loc = other.m_dims_loc;
-  }
-  return *this;
-}
 
 // add new dimension to the area
 void CaloLocalHadCoeff::LocalHadArea::addDimension(CaloLocalHadCoeff::LocalHadDimension &dim)
@@ -214,27 +162,9 @@ CaloLocalHadCoeff
 // default constructor
 CaloLocalHadCoeff::CaloLocalHadCoeff()
 {
-
-}
-
-// copy constructor
-CaloLocalHadCoeff::CaloLocalHadCoeff(const CaloLocalHadCoeff &other)
-  : m_title (other.m_title),
-    m_CoeffSet (other.m_CoeffSet),
-    m_AreaSet (other.m_AreaSet)
-{
-}
-
-
-
-CaloLocalHadCoeff& CaloLocalHadCoeff::operator=(const CaloLocalHadCoeff &other)
-{
-  if (this != &other) {
-    m_AreaSet = other.m_AreaSet;
-    m_CoeffSet = other.m_CoeffSet;
-    m_title = other.m_title;
-  }
-  return *this;
+   static_assert(std::is_nothrow_move_constructible<CaloLocalHadCoeff>::value);
+   static_assert(std::is_nothrow_move_constructible<LocalHadArea>::value);
+   static_assert(std::is_nothrow_move_constructible<LocalHadDimension>::value);
 }
 
 

Calorimeter/CaloExample/CaloTests/src/CreateHits.cxx.test

 #include "MyAnalysis/CreateHits.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/NTuple.h"
 

Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx

@@ -3,7 +3,7 @@
 */
 
 #include "CaloTests/Analysis.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/NTuple.h"
 

Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx

@@ -3,7 +3,7 @@
 */
 
 #include "CaloTests/AnalysisCal.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/NTuple.h"
 

Calorimeter/CaloG4Sim/python/CaloG4SimConfigNew.py

+"""
+ComponentAccumulator configuration for CalibrationDefaultProcessingTool
+
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+
+def CalibrationDefaultProcessingToolCfg(flags, name="G4UA::CaloG4::CalibrationDefaultProcessing", **kwargs):
+    acc = ComponentAccumulator()
+    # this SD name is for ATLAS, H8
+    kwargs.setdefault("SDName", "Default::Dead::Uninstrumented::Calibration::Region")
+    acc.setPrivateTools(CompFactory.G4UA.CaloG4.CalibrationDefaultProcessingTool(name, **kwargs))
+    return acc