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/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/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/SubDetectorEnvelopes/SubDetectorEnvelopes/ATLAS_CHECK_THREAD_SAFETY

+AtlasGeometryCommon/SubDetectorEnvelopes

AtlasTest/DatabaseTest/AthenaPoolTest/test/TestDicts.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-import PyLCGDict
-PyLCGDict.loadDict('SealDictDict')
-PyLCGDict.loadDict('AthenaPoolTestDataDict')
-PyLCGDict.loadDict('EventInfoDict')
-PyLCGDict.loadDict('GaudiKernelDict')
-PyLCGDict.loadDict('SGToolsDict')
-PyLCGDict.loadDict('StoreGateDict')
-
-#PyLCGDict.loadDict('AthExStoreGateExampleDict')
-#PyLCGDict.loadDict('AthenaPoolExampleDataDict')
-#PyLCGDict.loadDict('AthenaPoolTestDataDict')
-#PyLCGDict.loadDict('AtlfastEventDict')
-#PyLCGDict.loadDict('CaloEventDict')
-#PyLCGDict.loadDict('CaloSimEventDict')
-#PyLCGDict.loadDict('DetDescrConditionsDict')
-#PyLCGDict.loadDict('DetDescrDict')
-#PyLCGDict.loadDict('EventInfoDict')
-#PyLCGDict.loadDict('EventKernelDict')
-#PyLCGDict.loadDict('FourMomDict')
-#PyLCGDict.loadDict('GeneratorObjectsDict')
-#PyLCGDict.loadDict('IOVDbTestConditionsDict')
-#PyLCGDict.loadDict('IdDict')
-#PyLCGDict.loadDict('IdDictDetDescr')
-#PyLCGDict.loadDict('IdDictDetDescrCnv')
-#PyLCGDict.loadDict('IdDictParser')
-#PyLCGDict.loadDict('IdDictTest')
-#PyLCGDict.loadDict('InDetPriVxDict')
-#PyLCGDict.loadDict('InDetRawDataDict')
-#PyLCGDict.loadDict('InDetSimDataDict')
-#PyLCGDict.loadDict('InDetSimEventDict')
-#PyLCGDict.loadDict('JetEventDict')
-#PyLCGDict.loadDict('LArCondDataDict')
-#PyLCGDict.loadDict('LArRawEventDict')
-#PyLCGDict.loadDict('LArRecEventDict')
-#PyLCGDict.loadDict('LArSimEventDict')
-#PyLCGDict.loadDict('MCTruthDict')
-#PyLCGDict.loadDict('MissingETEventDict')
-#PyLCGDict.loadDict('MooTrackContainerDict')
-#PyLCGDict.loadDict('MuonDigitContainerDict')
-#PyLCGDict.loadDict('MuonRDODict')
-#PyLCGDict.loadDict('MuonSimDataDict')
-#PyLCGDict.loadDict('MuonSimEventDict')
-#PyLCGDict.loadDict('MuonTBConditionsDict')
-#PyLCGDict.loadDict('NavFourMomDict')
-#PyLCGDict.loadDict('NavigationDict')
-##PyLCGDict.loadDict('NovaBlobDict')
-#PyLCGDict.loadDict('ParticleEventDict')
-#PyLCGDict.loadDict('SGToolsDict')
-#PyLCGDict.loadDict('SimpleBTagDict')
-#PyLCGDict.loadDict('SimpleTrackDict')
-#PyLCGDict.loadDict('StoreGateDict')
-#PyLCGDict.loadDict('TileEventDict')
-#PyLCGDict.loadDict('TileSimEventDict')
-#PyLCGDict.loadDict('TrackParticleDict')
-#PyLCGDict.loadDict('TrigT1ResultDict')
-#PyLCGDict.loadDict('TrkEventUtilsDict')
-#PyLCGDict.loadDict('TrkParametersDict')
-#PyLCGDict.loadDict('TrkPrepRawDataDict')
-#PyLCGDict.loadDict('TrkRIO_OnTrackDict')
-#PyLCGDict.loadDict('TrkSurfacesDict')
-#PyLCGDict.loadDict('TrkTrackDict')
-#PyLCGDict.loadDict('TrkTrackSummaryDict')
-#PyLCGDict.loadDict('VxVertexDict')
-#PyLCGDict.loadDict('egammaEventDict')
-#PyLCGDict.loadDict('iPatTrackContainerDict')
-#
-
-gbl = PyLCGDict.makeNamespace('')
-for c in gbl.seal.reflect.Class.forNames() : print c.name()
-
-

AtlasTest/GoogleTestTools/CMakeLists.txt

@@ -4,7 +4,7 @@
 atlas_subdir( GoogleTestTools )
 
 # External package dependencies:
-find_package( GMock )
+find_package( GTest )
 
 # In standalone mode we just use the headers from the package. While in
 # offline mode we build a proper library.
@@ -17,13 +17,11 @@ else()
   atlas_add_library( GoogleTestTools
     GoogleTestTools/*.h src/*.cxx
     PUBLIC_HEADERS GoogleTestTools
-    INCLUDE_DIRS ${GMOCK_INCLUDE_DIRS}
-    LINK_LIBRARIES ${GMOCK_LIBRARIES}
-    PRIVATE_LINK_LIBRARIES GaudiKernel )
+    INCLUDE_DIRS ${GTEST_INCLUDE_DIRS}
+    LINK_LIBRARIES ${GTEST_LIBRARIES} GaudiKernel )
 endif()
 
 # Unit tests for InitGaudiGoogleTest:
 atlas_add_test( GoogleTestToolsTests
   SOURCES test/gt_GoogleTestTools.cxx
-  INCLUDE_DIRS ${GMOCK_INCLUDE_DIRS} 
-  LINK_LIBRARIES ${GMOCK_LIBRARIES} GaudiKernel GoogleTestTools )
+  LINK_LIBRARIES GoogleTestTools )

AtlasTest/GoogleTestTools/share/GoogleTestToolsTests.ref

-[==========] Running 1 test from 1 test case.
+[==========] Running 1 test from 1 test suite.
 [----------] Global test environment set-up.
 [----------] 1 test from InitGaudiGoogleTestTest
 [ RUN      ] InitGaudiGoogleTestTest.basictest
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
-                                          running on karma on Wed Jul  4 10:48:30 2018
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+                                          running on 36d5a1e47246 on Sat Sep 12 19:51:31 2020
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 EventLoopMgr         INFO Histograms converted successfully according to request.
 ToolSvc              INFO Removing all tools created by ToolSvc
 ApplicationMgr       INFO Application Manager Finalized successfully
 ApplicationMgr       INFO Application Manager Terminated successfully
-[       OK ] InitGaudiGoogleTestTest.basictest (44 ms)
-[----------] 1 test from InitGaudiGoogleTestTest (44 ms total)
+[       OK ] InitGaudiGoogleTestTest.basictest (382 ms)
+[----------] 1 test from InitGaudiGoogleTestTest (382 ms total)
 
 [----------] Global test environment tear-down
-[==========] 1 test from 1 test case ran. (44 ms total)
+[==========] 1 test from 1 test suite ran. (382 ms total)
 [  PASSED  ] 1 test.

Calorimeter/CaloCalibHitRec/CaloCalibHitRec/CalibHitIDCheck.h

@@ -29,7 +29,7 @@ class CalibHitIDCheck : public AthAlgorithm {
 
  public:
 
-  CalibHitIDCheck(std::string name, ISvcLocator* pSvcLocator);
+  CalibHitIDCheck(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~CalibHitIDCheck();
 
   StatusCode initialize();

Calorimeter/CaloCalibHitRec/CaloCalibHitRec/CalibHitToCaloCell.h

@@ -34,7 +34,7 @@ class CaloDetDescrManager;
 class CalibHitToCaloCell : public AthAlgorithm {
 public:
 
-    CalibHitToCaloCell(std::string name, ISvcLocator* pSvcLocator);
+    CalibHitToCaloCell(const std::string& name, ISvcLocator* pSvcLocator);
 
     virtual ~CalibHitToCaloCell();                         
     

Calorimeter/CaloCalibHitRec/CaloCalibHitRec/CaloDmNeighbours.h

@@ -50,7 +50,7 @@ class CaloDmNeighbours {
     int getNeighbours_CaloCellsForDmHit(const IdentifierHash &dmHashID,  std::vector<IdentifierHash>& neighbourList) const;
 
   private:
-    StatusCode load_neighbours(std::string DmNeighboursFileName);
+    StatusCode load_neighbours(const std::string& DmNeighboursFileName);
     StatusCode unfold_neighbours(std::string &MyDm, std::string &MyCalo);
     int get_indexes(ExpandedIdentifier &idExp, int &indxSide, int &indxEta, int &indxPhi);
     int get_id(ExpandedIdentifier &idExp, Identifier &id, IdentifierHash &hash_id);

Calorimeter/CaloCalibHitRec/src/CalibHitIDCheck.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
 */
 
 //*************************************************************************************
@@ -30,19 +30,19 @@
 
 
 // Constructor & destructor
-CalibHitIDCheck::CalibHitIDCheck(std::string name, ISvcLocator* pSvcLocator)
+CalibHitIDCheck::CalibHitIDCheck(const std::string& name, ISvcLocator* pSvcLocator)
   :AthAlgorithm(name, pSvcLocator), 
    m_Merge(false),
-   m_LArDMHitCnt(0),
-   m_ActiveHitCnt(0),
-   m_InactiveHitCnt(0),
-   m_TileActiveHitCnt(0),
-   m_TileInactiveHitCnt(0),
-   m_TileDMHitCnt(0),
+   m_LArDMHitCnt(nullptr),
+   m_ActiveHitCnt(nullptr),
+   m_InactiveHitCnt(nullptr),
+   m_TileActiveHitCnt(nullptr),
+   m_TileInactiveHitCnt(nullptr),
+   m_TileDMHitCnt(nullptr),
    m_Check(true), 
    m_ShowAll(false), 
    m_CheckAll(false),
-   m_id_helper(0)
+   m_id_helper(nullptr)
 {
   m_larInactiveHitContainer  = "LArCalibrationHitInactive";
   m_larActiveHitContainer    = "LArCalibrationHitActive";

Calorimeter/CaloCalibHitRec/src/CalibHitToCaloCell.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
 */
 
 //*****************************************************************************
@@ -39,7 +39,7 @@
 #include "LArRecEvent/LArCell.h"
 
 
-CalibHitToCaloCell::CalibHitToCaloCell(std::string name, ISvcLocator* pSvcLocator)
+CalibHitToCaloCell::CalibHitToCaloCell(const std::string& name, ISvcLocator* pSvcLocator)
    : AthAlgorithm(name, pSvcLocator),
      m_store_Tot(false),
      m_store_Vis(false),
@@ -48,8 +48,8 @@ CalibHitToCaloCell::CalibHitToCaloCell(std::string name, ISvcLocator* pSvcLocato
      m_storeUnknown(false),
      m_caloCell_Tot("TotalCalibCell"), m_caloCell_Vis("VisCalibCell"), 
      m_caloCell_Em(""), m_caloCell_NonEm(""),
-     m_caloCell_ID(0),
-     m_caloDM_ID(0),
+     m_caloCell_ID(nullptr),
+     m_caloDM_ID(nullptr),
      //m_tile_ID(0),
      //m_larEm_ID(0),
      //m_larHec_ID(0),
@@ -91,10 +91,10 @@ StatusCode CalibHitToCaloCell::initialize()
   ATH_CHECK(  detStore()->retrieve(m_caloCell_ID) );
   ATH_CHECK(  detStore()->retrieve(m_caloDM_ID) );
 
-  if(m_caloCell_Tot   != "")    m_store_Tot   = true;   else m_store_Tot   = false;
-  if(m_caloCell_Vis   != "")	m_store_Vis   = true;   else m_store_Vis   = false;
-  if(m_caloCell_Em    != "")	m_store_Em    = true;   else m_store_Em    = false;
-  if(m_caloCell_NonEm != "")	m_store_NonEm = true;   else m_store_NonEm = false;
+  m_store_Tot = !m_caloCell_Tot.empty();
+  m_store_Vis = !m_caloCell_Vis.empty();
+  m_store_Em = !m_caloCell_Em.empty();
+  m_store_NonEm = !m_caloCell_NonEm.empty();
 
   ATH_MSG_INFO("initialisation completed" );
   return StatusCode::SUCCESS;
@@ -108,10 +108,10 @@ StatusCode CalibHitToCaloCell::execute()
     ATH_CHECK(  detStore()->retrieve(caloDDMgr, "CaloMgr") );
 
     // OUTPUT CONTAINERS
-    CaloCellContainer* cnt   = 0;
-    CaloCellContainer* cnt_1 = 0; 
-    CaloCellContainer* cnt_2 = 0;
-    CaloCellContainer* cnt_3 = 0;
+    CaloCellContainer* cnt   = nullptr;
+    CaloCellContainer* cnt_1 = nullptr; 
+    CaloCellContainer* cnt_2 = nullptr;
+    CaloCellContainer* cnt_3 = nullptr;
     if(m_store_Tot)    cnt   = new CaloCellContainer();
     if(m_store_Vis)    cnt_1 = new CaloCellContainer(); 
     if(m_store_Em)     cnt_2 = new CaloCellContainer();
@@ -356,7 +356,7 @@ StatusCode CalibHitToCaloCell::execute()
 
     //Now, put LArCells in the containers keeping
     //the order. First goes EM, then HEC and so on
-    if(m_Cells_Tot.size()!=0)
+    if(!m_Cells_Tot.empty())
     {
 	for(int itr=0; itr!=m_nchan; itr++)
 	{

Calorimeter/CaloCalibHitRec/src/CalibHitToCaloCellTool.cxx

@@ -28,9 +28,9 @@ CalibHitToCaloCellTool::CalibHitToCaloCellTool(const std::string& t, const std::
     m_caloGain((int)CaloGain::LARLOWGAIN),
     m_caloCell_Tot("TotalCalibCell"), m_caloCell_Vis("VisCalibCell"), 
     m_caloCell_Em(""), m_caloCell_NonEm(""),
-    m_caloCell_ID(0),
-    m_caloDM_ID(0),
-    m_caloDDMgr(0)
+    m_caloCell_ID(nullptr),
+    m_caloDM_ID(nullptr),
+    m_caloDDMgr(nullptr)
 {
   declareInterface<CalibHitToCaloCellTool>(this);
 
@@ -106,7 +106,7 @@ StatusCode CalibHitToCaloCellTool::processCalibHitsFromParticle(int barcode) con
   
   // retrieve calibration hit containers
   const unsigned int nCont = m_calibHitContainerNames.size();
-  std::vector<const CaloCalibrationHitContainer*> calibHitContainers(nCont,0);
+  std::vector<const CaloCalibrationHitContainer*> calibHitContainers(nCont,nullptr);
   for (unsigned int i=0; i<nCont; i++) {
     ATH_MSG_DEBUG("Retrieving " << m_calibHitContainerNames[i]);
     ATH_CHECK( evtStore()->retrieve(calibHitContainers[i], m_calibHitContainerNames[i].c_str()) );
@@ -262,7 +262,7 @@ StatusCode CalibHitToCaloCellTool::processCalibHitsFromParticle(int barcode) con
   ///..........................................................
 
   ATH_MSG_DEBUG("making truth cluster");
-  xAOD::CaloCluster* truthCluster[3] = {0,0,0};
+  xAOD::CaloCluster* truthCluster[3] = {nullptr,nullptr,nullptr};
   for (int i=0;i<CalibHitUtils::nEnergyTypes;i++) {
     truthCluster[i] = CaloClusterStoreHelper::makeCluster(truthClusters[i],truthCells[i]);
     if (!truthCluster[i]) {

Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker.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
 */
 
 //-----------------------------------------------------------------------
@@ -41,10 +41,10 @@
 #include "StoreGate/ReadHandle.h" 
 #include "CLHEP/Units/SystemOfUnits.h"
 
-#include <math.h>
+#include <CLHEP/Geometry/Vector3D.h>
 #include <CLHEP/Units/SystemOfUnits.h>
 #include <CLHEP/Vector/LorentzVector.h>
-#include <CLHEP/Geometry/Vector3D.h>
+#include <cmath>
 
 
 using CLHEP::HepLorentzVector;
@@ -58,9 +58,9 @@ CaloCalibClusterMomentsMaker::CaloCalibClusterMomentsMaker(const std::string& ty
 							   const std::string& name,
 							   const IInterface* parent)
   : AthAlgTool(type, name, parent), 
-    m_calo_id(0),
-    m_caloDM_ID(0),
-    m_caloDmDescrManager(0),
+    m_calo_id(nullptr),
+    m_caloDM_ID(nullptr),
+    m_caloDmDescrManager(nullptr),
     m_energyMin(200*MeV),
     m_energyMinCalib(20*MeV),
     m_apars_alpha(0.5),
@@ -92,25 +92,25 @@ CaloCalibClusterMomentsMaker::CaloCalibClusterMomentsMaker(const std::string& ty
   m_validNames.push_back(moment_name_pair(std::string("ENG_CALIB_DEAD_UNCLASS"),xAOD::CaloCluster::ENG_CALIB_DEAD_UNCLASS));
 
   // Name(s) of Moments which can be stored on the AOD - all others go to ESD
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_TOT"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_OUT_L"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_OUT_M"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_OUT_T"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_L"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_M"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_T"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_EMB0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_EME0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_TILEG3"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_TOT"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_EMB0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_TILE0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_TILEG3"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_EME0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_HEC0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_FCAL"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_LEAKAGE"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_UNCLASS"));
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_TOT");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_OUT_L");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_OUT_M");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_OUT_T");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_L");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_M");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_T");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_EMB0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_EME0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_TILEG3");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_TOT");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_EMB0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_TILE0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_TILEG3");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_EME0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_HEC0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_FCAL");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_LEAKAGE");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_UNCLASS");
 
   declareProperty("AODMomentsNames",m_momentsNamesAOD);
   declareProperty("CalibrationHitContainerNames",m_CalibrationHitContainerNames);
@@ -332,7 +332,7 @@ CaloCalibClusterMomentsMaker::execute(const EventContext& ctx,
       IdentifierHash myHashMin,myHashMax;
       m_calo_id->calo_cell_hash_range (ic,myHashMin,myHashMax);
       maxHashSize = myHashMax-myHashMin;
-      cellVector[ic].resize(maxHashSize,0);
+      cellVector[ic].resize(maxHashSize,nullptr);
     }
 
     xAOD::CaloClusterContainer::iterator clusIter = theClusColl->begin();
@@ -353,7 +353,7 @@ CaloCalibClusterMomentsMaker::execute(const EventContext& ctx,
 	ClusWeight * myClus = new ClusWeight();
 	myClus->iClus = iClus;
 	myClus->weight = cellIter.weight();
-	myClus->next = 0;
+	myClus->next = nullptr;
 	ClusWeight * theList = cellVector[otherSubDet][(unsigned int)myHashId];
 	if ( theList ) {
 	  while ( theList->next ) 
@@ -495,7 +495,7 @@ CaloCalibClusterMomentsMaker::execute(const EventContext& ctx,
 		    jpO -=  2*m_n_phi_out;
 		  // HepVector3D hitPos(myCDDE->x(),myCDDE->y(),myCDDE->z());
 		  for (unsigned int ii=0;ii<3;ii++) {
-		    std::vector<std::vector <int > > *pClusList=0;
+		    std::vector<std::vector <int > > *pClusList=nullptr;
   
 		    if ( ii == 0 && m_doOutOfClusterL ) 
 		      pClusList = &clusListL;
@@ -541,7 +541,7 @@ CaloCalibClusterMomentsMaker::execute(const EventContext& ctx,
 	for(;chIter!=chIterE;chIter++)  {
 	  Identifier myId = (*chIter)->cellID();
 	  if (m_calo_id->is_lar_dm(myId) || m_calo_id->is_tile_dm(myId)) {
-	    CaloDmDescrElement* myCDDE(0);
+	    CaloDmDescrElement* myCDDE(nullptr);
 	    myCDDE = m_caloDmDescrManager->get_element(myId);
 	    if ( myCDDE ) {
 	      int jeO = (int)floor(m_n_eta_out*(myCDDE->eta()/m_out_eta_max));
@@ -552,7 +552,7 @@ CaloCalibClusterMomentsMaker::execute(const EventContext& ctx,
 		if ( jpO >=  m_n_phi_out ) 
 		  jpO -=  2*m_n_phi_out;
 		for (unsigned int ii=0;ii<3;ii++) {
-		  std::vector<std::vector <int > > *pClusList=0;
+		  std::vector<std::vector <int > > *pClusList=nullptr;
 		  if ( ii == 0 && m_doDeadL ) 
 		    pClusList = &clusListL;
 		  else if ( ii == 1 && m_doDeadM ) 
@@ -602,7 +602,7 @@ CaloCalibClusterMomentsMaker::execute(const EventContext& ctx,
     // + energy is shared among clusters within certain area
     // + distance to clusters and energy in specific samplings are used as sharing criteria
     // + calculations are done separately for different dead material areas
-    std::vector<std::vector <int > > *pClusList=0;
+    std::vector<std::vector <int > > *pClusList=nullptr;
     if ( m_MatchDmType == kMatchDmLoose ) {
       pClusList = &clusListL;
     } else if ( m_MatchDmType == kMatchDmMedium ) {
@@ -619,7 +619,7 @@ CaloCalibClusterMomentsMaker::execute(const EventContext& ctx,
         for(;chIter!=chIterE;chIter++)  {
           Identifier myId = (*chIter)->cellID();
           if (m_calo_id->is_lar_dm(myId) || m_calo_id->is_tile_dm(myId)) {
-            CaloDmDescrElement* myCDDE(0);
+            CaloDmDescrElement* myCDDE(nullptr);
             myCDDE = m_caloDmDescrManager->get_element(myId);
             if ( myCDDE ) {
 
@@ -736,7 +736,7 @@ CaloCalibClusterMomentsMaker::execute(const EventContext& ctx,
             - eng_calib_dead_tileg3 - eng_calib_dead_eme0 - eng_calib_dead_hec0 - eng_calib_dead_fcal
             - eng_calib_dead_leakage;
 
-      if ( m_momentsNames.size() > 0 ) {
+      if ( !m_momentsNames.empty() ) {
 	std::vector<double> myMoments(m_validMoments.size(),0);
 	
 	// assign moments 
@@ -817,7 +817,7 @@ CaloCalibClusterMomentsMaker::execute(const EventContext& ctx,
     for(unsigned int ic=0;ic<CaloCell_ID::NSUBCALO; ic++) {
       for (unsigned int ii = 0;ii<cellVector[ic].size();ii++ ) {
 	ClusWeight * theList = cellVector[ic][ii];
-	ClusWeight * prev = 0;
+	ClusWeight * prev = nullptr;
 	while ( theList) {
 	  while ( theList->next ) {
 	    prev = theList;
@@ -825,11 +825,11 @@ CaloCalibClusterMomentsMaker::execute(const EventContext& ctx,
 	  }
 	  delete theList;
 	  if ( prev ) 
-	    prev->next = 0;
+	    prev->next = nullptr;
 	  else 
-	    cellVector[ic][ii] = 0;
+	    cellVector[ic][ii] = nullptr;
 	  theList = cellVector[ic][ii];
-	  prev = 0;
+	  prev = nullptr;
 	}
       }
     }

Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker2.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
 */
 
 //-----------------------------------------------------------------------
@@ -42,8 +42,8 @@
 
 #include "CLHEP/Units/SystemOfUnits.h"
 
-#include <math.h>
 #include <CLHEP/Vector/LorentzVector.h>
+#include <cmath>
 
 
 using CLHEP::HepLorentzVector;
@@ -57,9 +57,9 @@ CaloCalibClusterMomentsMaker2::CaloCalibClusterMomentsMaker2(const std::string&
 							   const std::string& name,
 							   const IInterface* parent)
   : AthAlgTool(type, name, parent), 
-    m_calo_id(0),
-    m_caloDM_ID(0),
-    m_caloDmDescrManager(0),
+    m_calo_id(nullptr),
+    m_caloDM_ID(nullptr),
+    m_caloDmDescrManager(nullptr),
     m_useParticleID(true),
     m_energyMin(200*MeV),
     m_energyMinCalib(20*MeV),
@@ -91,25 +91,25 @@ CaloCalibClusterMomentsMaker2::CaloCalibClusterMomentsMaker2(const std::string&
   m_validNames.push_back(moment_name_pair(std::string("ENG_CALIB_FRAC_REST"),xAOD::CaloCluster::ENG_CALIB_FRAC_REST));
 
   // Name(s) of Moments which can be stored on the AOD - all others go to ESD
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_TOT"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_OUT_L"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_OUT_M"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_OUT_T"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_EMB0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_EME0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_TILEG3"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_TOT"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_EMB0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_TILE0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_TILEG3"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_EME0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_HEC0"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_FCAL"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_LEAKAGE"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_DEAD_UNCLASS"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_FRAC_EM"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_FRAC_HAD"));
-  m_momentsNamesAOD.push_back(std::string("ENG_CALIB_FRAC_REST"));
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_TOT");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_OUT_L");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_OUT_M");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_OUT_T");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_EMB0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_EME0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_TILEG3");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_TOT");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_EMB0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_TILE0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_TILEG3");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_EME0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_HEC0");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_FCAL");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_LEAKAGE");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_DEAD_UNCLASS");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_FRAC_EM");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_FRAC_HAD");
+  m_momentsNamesAOD.emplace_back("ENG_CALIB_FRAC_REST");
 
   declareProperty("AODMomentsNames",m_momentsNamesAOD);
   declareProperty("CalibrationHitContainerNames",m_CalibrationHitContainerNames);
@@ -501,7 +501,7 @@ CaloCalibClusterMomentsMaker2::execute(const EventContext& ctx,
                 if ( jpO < -m_n_phi_out ) jpO +=  2*m_n_phi_out;
                 if ( jpO >=  m_n_phi_out ) jpO -=  2*m_n_phi_out;
                 for (unsigned int ii=0;ii<3;ii++) {
-                  std::vector<std::vector <int > > *pClusList=0;
+                  std::vector<std::vector <int > > *pClusList=nullptr;
                   if ( ii == 0 && m_doOutOfClusterL ) 
                     pClusList = &clusListL;
                   else if ( ii == 1 && m_doOutOfClusterM ) 
@@ -550,7 +550,7 @@ CaloCalibClusterMomentsMaker2::execute(const EventContext& ctx,
   // + energy is shared among clusters within certain area
   // + distance to clusters and energy in specific samplings are used as sharing criteria
   // + calculations are done separately for different dead material areas
-  std::vector<std::vector <int > > *pClusList=0;
+  std::vector<std::vector <int > > *pClusList=nullptr;
   if ( m_MatchDmType == kMatchDmLoose ) {
     pClusList = &clusListL;
   } else if ( m_MatchDmType == kMatchDmMedium ) {
@@ -567,7 +567,7 @@ CaloCalibClusterMomentsMaker2::execute(const EventContext& ctx,
       for(;chIter!=chIterE;chIter++)  {
         Identifier myId = (*chIter)->cellID();
         if (m_calo_id->is_lar_dm(myId) || m_calo_id->is_tile_dm(myId)) {
-          CaloDmDescrElement* myCDDE(0);
+          CaloDmDescrElement* myCDDE(nullptr);
           myCDDE = m_caloDmDescrManager->get_element(myId);
           if ( myCDDE ) {
             int pid(0);
@@ -713,7 +713,7 @@ CaloCalibClusterMomentsMaker2::execute(const EventContext& ctx,
       get_calib_frac(truthBarcodeToPdgCodeMap, clusInfo, engCalibFrac);
     }
 
-    if ( m_momentsNames.size() > 0 ) {
+    if ( !m_momentsNames.empty() ) {
       std::vector<double> myMoments(m_validMoments.size(),0);
       // assign moments 
       moment_name_set::const_iterator vMomentsIter = m_validMoments.begin(); 

Calorimeter/CaloCalibHitRec/src/CaloCalibClusterTruthAttributerTool.cxx

 /*
-   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CaloCalibHitRec/CaloCalibClusterTruthAttributerTool.h"
@@ -49,7 +49,7 @@ StatusCode CaloCalibClusterTruthAttributerTool::calculateTruthEnergies(const xAO
 
   std::vector<std::pair<unsigned int, double > > barcodeTruePtPairs;
 
-  for (const auto& thisEntry : barcodeTruePtMap) barcodeTruePtPairs.push_back(thisEntry);
+  for (const auto& thisEntry : barcodeTruePtMap) barcodeTruePtPairs.emplace_back(thisEntry);
 
   std::sort(barcodeTruePtPairs.begin(),barcodeTruePtPairs.end(),[]( std::pair<unsigned int, double> a, std::pair<unsigned int, double> b) -> bool {return a.second > b.second;} );
 

Calorimeter/CaloCalibHitRec/src/CaloDmEnergy.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
 */
 
 /* ****************************************************************************
@@ -89,14 +89,14 @@ CaloDmEnergy::CaloDmEnergy(const CaloDmDescrManager *dmMgr):
   m_max_dmhit(1000000),
   m_max_cluster(10000), m_apars_alpha(0.5), m_apars_r0(0.2),
   m_apars_clust_min_ener(200.0),m_apars_clust_min_ecalib(10.0), m_apars_cone_cut(0.5),
-  m_caloDmNeighbours(0),
-  m_caloDM_ID(0),
-  m_caloCell_ID(0),
-  m_id_helper(0)
+  m_caloDmNeighbours(nullptr),
+  m_caloDM_ID(nullptr),
+  m_caloCell_ID(nullptr),
+  m_id_helper(nullptr)
 {
   m_caloDmDescrManager = dmMgr;
-  m_CalibrationContainerNamesDM.push_back("LArCalibrationHitDeadMaterial");
-  m_CalibrationContainerNamesDM.push_back("TileCalibrationDMHitCnt");
+  m_CalibrationContainerNamesDM.emplace_back("LArCalibrationHitDeadMaterial");
+  m_CalibrationContainerNamesDM.emplace_back("TileCalibrationDMHitCnt");
   m_nclusters = 0;
   initialize().ignore();
 }
@@ -218,7 +218,7 @@ int CaloDmEnergy::assign2clusters(std::vector<const CaloCalibrationHitContainer
     m_dmcls_area_etotal[i_cls].resize(DMA_MAX,0.0);
   }
 
-  if( m_nclusters == 0 || m_CaloDmCellVector.size() == 0) {
+  if( m_nclusters == 0 || m_CaloDmCellVector.empty()) {
     log << MSG::WARNING << " No data to process. Number of clusters: " << m_nclusters 
         << " m_CaloDmCellVector.size(): " << m_CaloDmCellVector.size()
         << std::endl;
@@ -296,7 +296,7 @@ int CaloDmEnergy::assign2clusters(std::vector<const CaloCalibrationHitContainer
   ****************************************************** */
   for(std::vector<CaloDmCell *>::iterator it=m_CaloDmCellVector.begin(); it!= m_CaloDmCellVector.end(); it++){
     CaloDmCell *dmCell = (*it);
-    if( !dmCell->m_cls_index.size() ){ // DM cells assigned to clusters by previous procedure will be skipped
+    if( dmCell->m_cls_index.empty() ){ // DM cells assigned to clusters by previous procedure will be skipped
        xAOD::CaloClusterContainer::const_iterator ic;
       nc=0;
       for(ic=theClusters->begin(); ic != theClusters->end(); ic++){
@@ -327,7 +327,7 @@ int CaloDmEnergy::assign2clusters(std::vector<const CaloCalibrationHitContainer
   ****************************************************** */
   for(std::vector<CaloDmCell *>::iterator it=m_CaloDmCellVector.begin(); it!= m_CaloDmCellVector.end(); it++){
     CaloDmCell *dmCell = (*it);
-    if(dmCell->m_cls_index.size()) m_dmcls_sum_etotal += dmCell->energyTotal();
+    if(!dmCell->m_cls_index.empty()) m_dmcls_sum_etotal += dmCell->energyTotal();
     for(unsigned int i_cls=0; i_cls<dmCell->m_cls_index.size(); i_cls++){
       int cls_indx = dmCell->m_cls_index[i_cls];
       // Since one DM cell could belong to many clusters, weight for given cluster are calculated
@@ -418,7 +418,7 @@ int CaloDmEnergy::make_dmcell_vector(std::vector<const CaloCalibrationHitContain
   }
   m_CaloDmCellVector.clear();
   m_CaloDmCellContainer.clear();
-  m_CaloDmCellContainer.resize(m_caloDM_ID->lar_zone_hash_max() + m_caloDM_ID->tile_zone_hash_max(), 0);
+  m_CaloDmCellContainer.resize(m_caloDM_ID->lar_zone_hash_max() + m_caloDM_ID->tile_zone_hash_max(), nullptr);
 
   int dmhit_n = 0;
   int dmhit_ntotal = 0;