Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloFillRectangularCluster.h

@@ -41,6 +41,8 @@
 #include "CaloInterface/ISetCaloCellContainerName.h"
 #include <string>
 #include "AthenaKernel/IOVSvcDefs.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 
 // Helper object used for the per-sampling calculations.
 namespace CaloClusterCorr {
@@ -49,6 +51,7 @@ class SamplingHelper;
 //class StoreGateSvc;
 //class CaloCluster;
 class CaloCell;
+class CaloCellContainer;
 
 
 class CaloFillRectangularCluster
@@ -71,7 +74,7 @@ public:
    *
    * Derived classes can extend this to change the sampling window sizes.
    */
-  virtual StatusCode initialize();
+  virtual StatusCode initialize() override;
 
   /** Callback added to handle Data-driven GeoModel initialization
    */
@@ -79,11 +82,19 @@ public:
   
   /**
    * @brief CaloClusterCorrection virtual method
+   * @param ctx     The event context.
    * @param cluster The cluster on which to operate.
    */
-  virtual void makeCorrection(xAOD::CaloCluster* cluster);
+  virtual void makeCorrection(const EventContext& ctx,
+                              xAOD::CaloCluster* cluster) const override;
 
 
+  // Temp workaround to keep IsolationTools happy.
+  void makeCorrection(xAOD::CaloCluster* cluster) const
+  {
+    return makeCorrection (Gaudi::Hive::currentContext(), cluster);
+  }
+
   /*
    * @brief Return the seed position of a cluster.
    * @param cluster The cluster on which to operate.
@@ -97,7 +108,7 @@ public:
    */
   virtual void get_seed (const xAOD::CaloCluster* cluster,
                          const CaloCell* max_et_cell,
-                         double& eta, double& phi);
+                         double& eta, double& phi) const;
 
 
   /**
@@ -110,27 +121,31 @@ public:
 private:
 
   /// This isn't allowed.
-  CaloFillRectangularCluster();
+  CaloFillRectangularCluster() = delete;
 
 
   /*
    * @brief Actually make the correction for one region (barrel or endcap).
+   * @param ctx     The event context.
    * @param helper Sampling calculation helper object.
    * @param eta The @f$\eta$@f seed of the cluster.
    * @param phi The @f$\phi$@f seed of the cluster.
    * @param samplings List of samplings for this region.
    */
-  void makeCorrection1 (CaloClusterCorr::SamplingHelper& helper,
+  void makeCorrection1 (const EventContext& ctx,
+                        CaloClusterCorr::SamplingHelper& helper,
                         double eta,
                         double phi,
-                        const CaloSampling::CaloSample samplings[4]);
+                        const CaloSampling::CaloSample samplings[4]) const;
 
 
   /*
    * @brief Execute the correction, given a helper object.
+   * @param ctx     The event context.
    * @param helper Sampling calculation helper object.
    */
-  void makeCorrection2 (CaloClusterCorr::SamplingHelper& helper);
+  void makeCorrection2 (const EventContext& ctx,
+                        CaloClusterCorr::SamplingHelper& helper) const;
 
 
 protected:
@@ -158,7 +173,7 @@ protected:
 private:
   /// The StoreGate key for the container of our input cells.
   /// This is a property.
-  std::string  m_cellsName;
+  SG::ReadHandleKey<CaloCellContainer> m_cellsName;
 };
 
 #endif // not CALOCLUSTERCORRECTION_CALOFILLRECTANGULARCLUSTER_H

Calorimeter/CaloClusterCorrection/cmt/requirements

@@ -22,13 +22,13 @@ use CaloCondBlobObjs    CaloCondBlobObjs-*      Calorimeter
 use AthenaPoolUtilities AthenaPoolUtilities-*   Database/AthenaPOOL
 use CaloIdentifier      CaloIdentifier-*        Calorimeter
 use LArIdentifier       LArIdentifier-*         LArCalorimeter
-use LArTools            LArTools-*              LArCalorimeter
+use LArCabling          LArCabling-*            LArCalorimeter
 
 private
 use CaloGeoHelpers	CaloGeoHelpers-*	Calorimeter
 use AtlasCLHEP		AtlasCLHEP-*		External
 use AtlasROOT    	AtlasROOT-*        	External
-use DataModel           DataModel-*             Control
+use AthContainers       AthContainers-*         Control
 use EventKernel         EventKernel-*           Event
 use PathResolver        PathResolver-*	        Tools
 use GeoModelInterfaces  GeoModelInterfaces-*    DetectorDescription/GeoModel

Calorimeter/CaloClusterCorrection/src/CaloClusterBadChannelList.cxx

@@ -13,7 +13,7 @@ PURPOSE: Fill bad channels in cluster
 
 ********************************************************************/
 // include header files
-#include "CaloClusterCorrection/CaloClusterBadChannelList.h"
+#include "CaloClusterBadChannelList.h"
 
 #include "AthenaKernel/errorcheck.h"
 #include "CaloEvent/CaloClusterBadChannelData.h"
@@ -39,8 +39,9 @@ StatusCode CaloClusterBadChannelList::initialize()
 }
 
 
-void CaloClusterBadChannelList::makeCorrection(CaloCluster* cluster) {
-
+void CaloClusterBadChannelList::makeCorrection(const EventContext& /*ctx*/,
+                                               CaloCluster* cluster) const
+{
   xAOD::CaloClusterBadChannelList badChanList;
 
   CaloCluster::cell_iterator cellIter    = cluster->cell_begin();

Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloClusterBadChannelList.h → Calorimeter/CaloClusterCorrection/src/CaloClusterBadChannelList.h

@@ -32,13 +32,14 @@ class CaloClusterBadChannelList : public CaloClusterCorrection
 		   const std::string& name,
 		   const IInterface* parent);
   // destructor 
-  ~CaloClusterBadChannelList();
+  virtual ~CaloClusterBadChannelList() override;
   
   // Standard initialize method.
-  virtual StatusCode initialize();
+  virtual StatusCode initialize() override;
 
   // virtual method in CaloClusterCorrection
-  virtual void makeCorrection(xAOD::CaloCluster* cluster);
+  virtual void makeCorrection(const EventContext& ctx,
+                              xAOD::CaloCluster* cluster) const override;
 
  private:
 

Calorimeter/CaloClusterCorrection/src/CaloClusterCellWeightCalib.cxx

@@ -16,15 +16,15 @@
 #include "CaloEvent/CaloRecoStatus.h"
 #include "CaloEvent/CaloCluster.h"
 
-#include "CaloClusterCorrection/CaloClusterCellWeightCalib.h"
+#include "CaloClusterCellWeightCalib.h"
 
 #include <cstdlib>
 
-std::string CaloClusterCellWeightCalib::m_posName = "Signal";
-std::string CaloClusterCellWeightCalib::m_absName = "AbsSignal";
-std::string CaloClusterCellWeightCalib::m_rawName = "RawSignal"; 
+std::string const CaloClusterCellWeightCalib::m_posName = "Signal";
+std::string const CaloClusterCellWeightCalib::m_absName = "AbsSignal";
+std::string const CaloClusterCellWeightCalib::m_rawName = "RawSignal"; 
 
-std::string CaloClusterCellWeightCalib::m_defName = m_absName;
+std::string const CaloClusterCellWeightCalib::m_defName = m_absName;
 
 //////////////////////////////
 // Constructor & Destructor //
@@ -291,7 +291,6 @@ StatusCode CaloClusterCellWeightCalib::f_dirRawNW(xAOD::CaloCluster* pClus)
 // -- direction from signals above threshold, use geo weights
 StatusCode CaloClusterCellWeightCalib::f_dirPos(xAOD::CaloCluster* pClus)
 {
-  static CaloPhiRange range;
   // loop cells in clusters
   double eCal(0.);
   double eRef(0.);
@@ -312,7 +311,7 @@ StatusCode CaloClusterCellWeightCalib::f_dirPos(xAOD::CaloCluster* pClus)
 	{
 	  double phiCell(proxim(cell->phi(),phiRef)); 
 	  etaRef += cell->eta() * eWght;
-	  phiRef  = range.fix((phiCell * eWght + eRef * phiRef)/(eRef+eWght));
+	  phiRef  = CaloPhiRange::fix((phiCell * eWght + eRef * phiRef)/(eRef+eWght));
 	  eRef   += eWght;
 	}
     }
@@ -329,7 +328,6 @@ StatusCode CaloClusterCellWeightCalib::f_dirPos(xAOD::CaloCluster* pClus)
 // -- direction from signals above threshold, ignore geo weights
 StatusCode CaloClusterCellWeightCalib::f_dirPosNW(xAOD::CaloCluster* pClus)
 {
-  static CaloPhiRange range;
   // loop cells in clusters
   double eCal(0.);
   double eRef(0.);
@@ -346,7 +344,7 @@ StatusCode CaloClusterCellWeightCalib::f_dirPosNW(xAOD::CaloCluster* pClus)
 	{
 	  double phiCell(proxim(cell->phi(),phiRef)); 
 	  etaRef += cell->eta() * eWght;
-	  phiRef  = range.fix((phiCell * eWght + eRef * phiRef)/(eRef+eWght));
+	  phiRef  = CaloPhiRange::fix((phiCell * eWght + eRef * phiRef)/(eRef+eWght));
 	  eRef   += eWght;
 	}
     }
@@ -363,7 +361,6 @@ StatusCode CaloClusterCellWeightCalib::f_dirPosNW(xAOD::CaloCluster* pClus)
 
 StatusCode CaloClusterCellWeightCalib::f_dirAbs(xAOD::CaloCluster* pClus)
 {
-  static CaloPhiRange range;
   // loop cells in clusters
   double eCal(0.);
   double eRef(0.);
@@ -383,7 +380,7 @@ StatusCode CaloClusterCellWeightCalib::f_dirAbs(xAOD::CaloCluster* pClus)
       eCal   += eWght;
       eWght   = fabs(eWght);
       etaRef += cell->eta() * eWght;
-      phiRef  =	range.fix((phiCell * eWght + eRef * phiRef)/(eRef+eWght));
+      phiRef  =	CaloPhiRange::fix((phiCell * eWght + eRef * phiRef)/(eRef+eWght));
       eRef   += eWght;
     }
   // set cluster kinematics
@@ -399,7 +396,6 @@ StatusCode CaloClusterCellWeightCalib::f_dirAbs(xAOD::CaloCluster* pClus)
 
 StatusCode CaloClusterCellWeightCalib::f_dirAbsNW(xAOD::CaloCluster* pClus)
 {
-  static CaloPhiRange range;
   // loop cells in clusters
   double eCal(0.);
   double eRef(0.);
@@ -414,7 +410,7 @@ StatusCode CaloClusterCellWeightCalib::f_dirAbsNW(xAOD::CaloCluster* pClus)
       eCal   += eWght;
       eWght   = fabs(eWght);
       etaRef += cell->eta() * eWght;
-      phiRef  = range.fix((phiCell * eWght + eRef * phiRef)/(eRef+eWght));
+      phiRef  = CaloPhiRange::fix((phiCell * eWght + eRef * phiRef)/(eRef+eWght));
       eRef   += eWght;
     }
   // set cluster kinematics

Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloClusterCellWeightCalib.h → Calorimeter/CaloClusterCorrection/src/CaloClusterCellWeightCalib.h

@@ -88,13 +88,13 @@ protected:
 protected:
 
   /*! @brief Negative signal handling:  default tag */
-  static std::string m_defName;
+  static const std::string m_defName;
   /*! @brief Negative signal handling: positive signal tag */
-  static std::string m_posName;
+  static const std::string m_posName;
   /*! @brief Negative signal handling: absolute signal tag */
-  static std::string m_absName;
+  static const std::string m_absName;
   /*! @brief Negative signal handling: raw signal tag */
-  static std::string m_rawName; 
+  static const std::string m_rawName; 
 
 
 protected:

Calorimeter/CaloClusterCorrection/src/CaloClusterCorrection.cxx

@@ -40,6 +40,7 @@ Updated:  February, 2006 (DLelas)
 #include "CaloClusterCorrection/CaloClusterCorrection.h"
 #include "AthenaKernel/errorcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 
 using xAOD::CaloCluster;
 
@@ -113,7 +114,7 @@ CaloClusterCorrection::setProperty (const Property& p)
 
 StatusCode CaloClusterCorrection::execute(CaloCluster *cluster)
 {
-  this->makeCorrection(cluster);
+  this->makeCorrection(Gaudi::Hive::currentContext(), cluster);
 
 #if 0
   ATH_MSG_DEBUG( " ...... e, et " << cluster->e() << " " << cluster->et() << endreq);
@@ -135,7 +136,7 @@ void CaloClusterCorrection::setsample(CaloCluster* cluster,
 				      CaloCluster::CaloSample sampling,
 				      float em, float etam, float phim, 
 				      float emax, float etamax, float phimax, 
-				      float etas, float phis)
+				      float etas, float phis) const
 {
   cluster->setEnergy(sampling, em);
   cluster->setEta(sampling, etam);

Calorimeter/CaloClusterCorrection/src/CaloClusterCorrectionCommon.cxx

@@ -17,10 +17,12 @@
 #include "CaloDetDescr/CaloDetectorElements.h"
 #include "CaloGeoHelpers/CaloPhiRange.h"
 #include "CaloIdentifier/CaloCell_ID.h"
+#include "CxxUtils/make_unique.h"
 #include <cmath>
 #include <cassert>
 
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 
 using xAOD::CaloCluster;
 using CaloClusterCorr::interpolate;
@@ -136,6 +138,62 @@ const CaloDetDescrElement* find_dd_elt1 (int region,
 }
 
 
+/**
+ * @brief Construct dummy DDEs used to work around innermost strip problem
+ *        (see below).
+ * @param dd_man Detector descriptor manager.
+ */
+std::vector<std::unique_ptr<const CaloDetDescrElement> >
+dd_make_dummy_elts (const CaloDetDescrManager* dd_man)
+{
+  std::vector<std::unique_ptr<const CaloDetDescrElement> > elts;
+  const CaloDetDescriptor* descr = dd_man->get_descriptor (CaloCell_ID::LAREM,
+                                                           1, true, 0.05, 0);
+  if (descr) {
+    int nphi = descr->n_phi();
+    elts.resize (nphi*2);
+    for (int etasgn = 1; etasgn >= -1; etasgn -= 2) {
+      for (int iphi = 0; iphi < nphi; iphi++) {
+        // Make a new dummy cell.
+        // First, try to find the adjacent strip.  Punt if we can't
+        // find _that_!
+        const CaloCell_ID* cellid_mgr = dd_man->getCaloCell_ID();
+        Identifier cellId2 = cellid_mgr->cell_id (descr->identify(),
+                                                  1, iphi);
+        IdentifierHash cellIdHash2 = cellid_mgr->calo_cell_hash (cellId2);
+        // Verify that we don't have another nonexistent cell!
+        if (cellid_mgr->cell_id (cellIdHash2) != cellId2)
+          continue;
+        const CaloDetDescrElement* elt2 = dd_man->get_element (cellIdHash2);
+        if (!elt2) continue;
+
+        auto elt = CxxUtils::make_unique<DummyDetDescrElement>
+          (descr->subcalo_hash(),
+           0,
+           0,
+           descr);
+
+        // Copy geometry from the adjacent cell, shifting eta.
+        elt->set_cylindric_size (elt2->deta(),
+                                 elt2->dphi(),
+                                 elt2->dr());
+        elt->set_cylindric (elt2->eta() - etasgn * elt2->deta(),
+                            elt2->phi(),
+                            elt2->r());
+        elt->set_cylindric_raw (elt2->eta_raw() - etasgn * elt2->deta(),
+                                elt2->phi_raw(),
+                                elt2->r_raw());
+
+        int index = iphi;
+        if (etasgn < 0) index += nphi;
+        elts[index] = std::move(elt);
+      }
+    }
+  }
+  return elts;
+}
+
+
 /**
  * @brief Work around innermost strip problem.
  * @param region A region code, as defined in the header.
@@ -158,7 +216,7 @@ dd_inner_strip_fixup (int region,
                       const CaloDetDescrManager* dd_man,
                       float eta,
                       float phi,
-                      std::vector<CaloDetDescrElement*>& dummy_elts)
+                      const std::vector<std::unique_ptr<const CaloDetDescrElement> >& dummy_elts)
 {
   if (region == CaloClusterCorrectionCommon::EMB1 && fabs(eta) < 0.1) {
     const CaloDetDescriptor* descr = dd_man->get_descriptor (CaloCell_ID::LAREM,
@@ -173,41 +231,8 @@ dd_inner_strip_fixup (int region,
       if (eta < 0)
         index += descr->n_phi();
       if (dummy_elts.size() <= index)
-        dummy_elts.resize (index+1);
-      if (!dummy_elts[index]) {
-        // Make a new dummy cell.
-        // First, try to find the adjacent strip.  Punt if we can't
-        // find _that_!
-        const CaloCell_ID* cellid_mgr = dd_man->getCaloCell_ID();
-        Identifier cellId2 = cellid_mgr->cell_id (descr->identify(),
-                                                  ieta+1, iphi);
-        IdentifierHash cellIdHash2 = cellid_mgr->calo_cell_hash (cellId2);
-        // Verify that we don't have another nonexistent cell!
-        if (cellid_mgr->cell_id (cellIdHash2) != cellId2)
-          return 0;
-        const CaloDetDescrElement* elt2 = dd_man->get_element (cellIdHash2);
-        if (!elt2) return 0;
-
-        DummyDetDescrElement* elt =
-          new DummyDetDescrElement (descr->subcalo_hash(),
-				    0,
-				    0,
-				    descr);
-
-        // Copy geometry from the adjacent cell, shifting eta.
-        elt->set_cylindric_size (elt2->deta(),
-                                 elt2->dphi(),
-                                 elt2->dr());
-        int sign = (eta >= 0) ? 1 : -1;
-        elt->set_cylindric (elt2->eta() - sign * elt2->deta(),
-                            elt2->phi(),
-                            elt2->r());
-        elt->set_cylindric_raw (elt2->eta_raw() - sign * elt2->deta(),
-                                elt2->phi_raw(),
-                                elt2->r_raw());
-        dummy_elts[index] = elt;
-      }
-      return dummy_elts[index];
+        return 0;
+      return dummy_elts[index].get();
     }
   }
 
@@ -263,7 +288,7 @@ CaloClusterCorrectionCommon::find_dd_elt
              const CaloCluster* cluster,
              float eta,
              float phi,
-             std::vector<CaloDetDescrElement*>& dummy_elts)
+             const std::vector<std::unique_ptr<const CaloDetDescrElement> >& dummy_elts)
 {
   const CaloDetDescrElement* elt = 0;
   float eta_offs = 0;
@@ -272,10 +297,8 @@ CaloClusterCorrectionCommon::find_dd_elt
   int good = 0;
   
   while (good != 2) {
-    static CaloPhiRange range; // I shouldn't have to allocate
-                               // an object for this
     elt = find_dd_elt1 (region, dd_man, cluster,
-                        eta + eta_offs, range.fix (phi + phi_offs));
+                        eta + eta_offs, CaloPhiRange::fix (phi + phi_offs));
 
     if (!elt) {
       elt = dd_inner_strip_fixup (region, dd_man, eta, phi, dummy_elts);
@@ -347,8 +370,6 @@ CaloClusterCorrectionCommon::CaloClusterCorrectionCommon
  */
 CaloClusterCorrectionCommon::~CaloClusterCorrectionCommon ()
 {
-  for (unsigned int i=0; i < m_dummy_elts.size(); i++)
-    delete m_dummy_elts[i];
 }
 
 
@@ -358,12 +379,15 @@ CaloClusterCorrectionCommon::~CaloClusterCorrectionCommon ()
  */
 StatusCode CaloClusterCorrectionCommon::initialize()
 {
+  m_calo_dd_man = CaloDetDescrManager::instance();
+  m_dummy_elts = dd_make_dummy_elts (m_calo_dd_man);
   return CaloClusterCorrection::initialize();
 }
 
 
 /**
  * @brief Perform the correction.  Called by the tool.
+ * @param ctx     The event context.
  * @param cluster The cluster to correct.
  *                It is updated in place.
  *
@@ -373,11 +397,9 @@ StatusCode CaloClusterCorrectionCommon::initialize()
  *  - Computes quantities to pass to @c makeTheCorrection.
  *  - Calls @c makeTheCorrection.
  */
-void CaloClusterCorrectionCommon::makeCorrection (CaloCluster* cluster)
+void CaloClusterCorrectionCommon::makeCorrection (const EventContext& ctx,
+                                                  CaloCluster* cluster) const
 {
-  if (!m_calo_dd_man)
-    m_calo_dd_man = CaloDetDescrManager::instance();
-
   // This causes a lot of overhead (mostly from the MsgStream ctor).
   // Comment out when not needed.
   //MsgStream log( msgSvc(), name() );
@@ -445,8 +467,7 @@ void CaloClusterCorrectionCommon::makeCorrection (CaloCluster* cluster)
 
   // Sometimes unnormalized @f$\phi@f$ values still come through.
   // Make sure this is in the proper range before calling the correction.
-  static CaloPhiRange range; // I shouldn't have to allocate an object for this
-  phi = range.fix (phi);
+  phi = CaloPhiRange::fix (phi);
 
   // Look up the DD element.
   // Give up if we can't find one.
@@ -460,10 +481,10 @@ void CaloClusterCorrectionCommon::makeCorrection (CaloCluster* cluster)
   // Compute the adjusted eta and phi --- the coordinates shifted
   // from the actual to the nominal coordinate system.
   float adj_eta = eta - elt->eta() + elt->eta_raw();
-  float adj_phi = range.fix (phi - elt->phi() + elt->phi_raw());
+  float adj_phi = CaloPhiRange::fix (phi - elt->phi() + elt->phi_raw());
 
   // Call the actual correction.
-  makeTheCorrection (cluster, elt, eta, adj_eta, phi, adj_phi, samp);
+  makeTheCorrection (ctx, cluster, elt, eta, adj_eta, phi, adj_phi, samp);
 }
 
 

Calorimeter/CaloClusterCorrection/src/CaloClusterLocalCalib.cxx

@@ -102,8 +102,8 @@ StatusCode  CaloClusterLocalCalib::execute(CaloCluster* theCluster) {
         
         double oldEnergy = theCluster->e();           
         
-        const CaloDetDescrManager*   m_calo_dd_man  = CaloDetDescrManager::instance(); 
-        const CaloCell_ID*               m_calo_id  = m_calo_dd_man->getCaloCell_ID();   
+        const CaloDetDescrManager*   calo_dd_man  = CaloDetDescrManager::instance(); 
+        const CaloCell_ID*               calo_id  = calo_dd_man->getCaloCell_ID();   
               
 //         Make new Cluster and CellColl
         CaloCellContainer* myCellColl = new CaloCellContainer(SG::OWN_ELEMENTS);  
@@ -116,7 +116,7 @@ StatusCode  CaloClusterLocalCalib::execute(CaloCluster* theCluster) {
           const  CaloCell* pCell = *cellIter;  
           double CellEnergy = pCell->e();    
           //Identifier myId = pCell->ID();    
-          //IdentifierHash myHashId = m_calo_id->calo_cell_hash(myId); 
+          //IdentifierHash myHashId = calo_id->calo_cell_hash(myId); 
           if( CellEnergy < 0. )   CellEnergy = -1 * pCell->e();    
           CellReplica = new CaloCell( pCell->caloDDE(), pCell->ID(), CellEnergy, pCell->time(), pCell->quality(),  pCell->provenance(), pCell->gain() );
           myCellColl->push_back(CellReplica);          
@@ -155,7 +155,7 @@ StatusCode  CaloClusterLocalCalib::execute(CaloCluster* theCluster) {
            const CaloCell* pCell = *mycellIter;
            double cellWeight = mycellIter.weight();  
            Identifier myId = pCell->ID();    
-           IdentifierHash myHashId = m_calo_id->calo_cell_hash(myId);
+           IdentifierHash myHashId = calo_id->calo_cell_hash(myId);
            weightMap[myHashId] = cellWeight;           
          }
 
@@ -165,7 +165,7 @@ StatusCode  CaloClusterLocalCalib::execute(CaloCluster* theCluster) {
          cellIter    = theCluster->cell_begin();
          for(;cellIter!=theCluster->cell_end();cellIter++) {
            const CaloCell* pCell = *cellIter;
-           IdentifierHash myHashId = m_calo_id->calo_cell_hash(pCell->ID()); 
+           IdentifierHash myHashId = calo_id->calo_cell_hash(pCell->ID()); 
            double weight = weightMap[myHashId];
            theCluster->reweightCell(cellIter,weight);  
          }           

Calorimeter/CaloClusterCorrection/src/CaloClusterLocalCalibCone.cxx

@@ -19,7 +19,7 @@
 //-----------------------
 // This Class's Header --
 //-----------------------
-#include "CaloClusterCorrection/CaloClusterLocalCalibCone.h"
+#include "CaloClusterLocalCalibCone.h"
 
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloIdentifier/CaloCell_ID.h"

Calorimeter/CaloClusterCorrection/src/CaloClusterLogPos.cxx

@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "CaloClusterCorrection/CaloClusterLogPos.h"
+#include "CaloClusterLogPos.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloGeoHelpers/CaloPhiRange.h"
 #include "CaloIdentifier/CaloCell_ID.h"
@@ -74,8 +74,6 @@ CaloClusterLogPos::geoInit(IOVSVC_CALLBACK_ARGS)
    
 StatusCode  CaloClusterLogPos::execute(xAOD::CaloCluster* theCluster) {
   
-  static CaloPhiRange range;
-
   if ( msgSvc()->outputLevel(name()) <= MSG::DEBUG ) {
 
     msg(MSG::DEBUG) << " old cluster eta = " << theCluster->eta() 
@@ -128,12 +126,12 @@ StatusCode  CaloClusterLogPos::execute(xAOD::CaloCluster* theCluster) {
 	  // need to be normalized to the range [-pi,+pi] in the end
 	  
 	  if ( weightAll > 0 
-	       && phiAll/weightAll < range.phi_min() + 90*deg
-	       && thisCell->phi() > range.phi_max() - 90*deg)
+	       && phiAll/weightAll < CaloPhiRange::phi_min() + 90*deg
+	       && thisCell->phi() > CaloPhiRange::phi_max() - 90*deg)
 	    phiAll    += (thisCell->phi()-360*deg)*lw;
 	  else if ( weightAll > 0 
-		    && phiAll/weightAll > range.phi_max() - 90*deg
-		    && thisCell->phi() < range.phi_min() + 90*deg)
+		    && phiAll/weightAll > CaloPhiRange::phi_max() - 90*deg
+		    && thisCell->phi() < CaloPhiRange::phi_min() + 90*deg)
 	    phiAll    += (thisCell->phi()+360*deg)*lw;
 	  else
 	    phiAll    += thisCell->phi()*lw;
@@ -143,13 +141,13 @@ StatusCode  CaloClusterLogPos::execute(xAOD::CaloCluster* theCluster) {
 	  etaSample[theSample]    += thisCell->eta()*lw;
 	  if ( weightSample[theSample] > 0 
 	       && phiSample[theSample]/weightSample[theSample] 
-	       < range.phi_min() + 90*deg
-	       && thisCell->phi() > range.phi_max() - 90*deg)
+	       < CaloPhiRange::phi_min() + 90*deg
+	       && thisCell->phi() > CaloPhiRange::phi_max() - 90*deg)
 	    phiSample[theSample]    += (thisCell->phi()-360*deg)*lw;
 	  else if ( weightSample[theSample] > 0 
 		    && phiSample[theSample]/weightSample[theSample] 
-		    > range.phi_max() - 90*deg
-		    && thisCell->phi() < range.phi_min() + 90*deg)
+		    > CaloPhiRange::phi_max() - 90*deg
+		    && thisCell->phi() < CaloPhiRange::phi_min() + 90*deg)
 	    phiSample[theSample]    += (thisCell->phi()+360*deg)*lw;
 	  else
 	    phiSample[theSample]    += thisCell->phi()*lw;
@@ -162,7 +160,7 @@ StatusCode  CaloClusterLogPos::execute(xAOD::CaloCluster* theCluster) {
     if ( weightAll > 0 ) {
       const double inv_weightAll = 1. / weightAll;
       theCluster->setEta(etaAll * inv_weightAll);
-      theCluster->setPhi(range.fix(phiAll * inv_weightAll));
+      theCluster->setPhi(CaloPhiRange::fix(phiAll * inv_weightAll));
     }
     
     // std::vector<double> theEtas(CaloCell_ID::Unknown,0);
@@ -180,7 +178,7 @@ StatusCode  CaloClusterLogPos::execute(xAOD::CaloCluster* theCluster) {
 	float phiSample=theCluster->phiSample(s);
 	etaSample /= weightSample[i];
 	phiSample /= weightSample[i];
-	phiSample = range.fix(phiSample);
+	phiSample = CaloPhiRange::fix(phiSample);
 	theCluster->setEta(s,etaSample);
 	theCluster->setPhi(s,phiSample);
       }

Calorimeter/CaloClusterCorrection/src/CaloClusterRemoveBad.cxx

@@ -3,11 +3,11 @@
 */
 
 // include header files
-#include "CaloClusterCorrection/CaloClusterRemoveBad.h"
+#include "CaloClusterRemoveBad.h"
 #include "CaloEvent/CaloCell.h"
 #include "CaloEvent/CaloClusterContainer.h"
 #include "GaudiKernel/MsgStream.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 /********************************************************************
 

Calorimeter/CaloClusterCorrection/src/CaloClusterRemoveDuplicates.cxx

@@ -3,14 +3,14 @@
 */
 
 // include header files
-#include "CaloClusterCorrection/CaloClusterRemoveDuplicates.h"
+#include "CaloClusterRemoveDuplicates.h"
 #include "CaloEvent/CaloCell.h"
 #include "CaloEvent/CaloClusterContainer.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "GaudiKernel/MsgStream.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 /********************************************************************
 

Calorimeter/CaloClusterCorrection/src/CaloClusterTimeTool.cxx

@@ -14,6 +14,7 @@ PURPOSE:  correct time for EM clusters
 
 ********************************************************************/
 
+#include "CaloClusterTimeTool.h"
 #include "Identifier/Identifier.h"
 #include "Identifier/HWIdentifier.h"
 
@@ -24,7 +25,6 @@ PURPOSE:  correct time for EM clusters
 
 #include "CaloCondBlobObjs/CaloCondUtils.h"
 
-#include "CaloClusterCorrection/CaloClusterTimeTool.h"
 #include "AthenaKernel/IOVSvcDefs.h"
 
 
@@ -32,7 +32,9 @@ using xAOD::CaloCluster;
 
 
 CaloClusterTimeTool::CaloClusterTimeTool (const std::string& type,const std::string& name,const IInterface* parent)
-:  AthAlgTool( type, name, parent )
+   :  AthAlgTool( type, name, parent ),
+      m_LArOnlineIDHelper(nullptr),
+      m_calo_id(nullptr)
 {
   declareInterface<ICaloClusterTimeTool>(this);
   

Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloClusterTimeTool.h → Calorimeter/CaloClusterCorrection/src/CaloClusterTimeTool.h

@@ -27,7 +27,7 @@ PURPOSE:  correct time for EM clusters
 #include "CaloEvent/CaloCell.h"
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "LArIdentifier/LArOnlineID.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
 
 
 #include <string>
@@ -36,8 +36,6 @@ PURPOSE:  correct time for EM clusters
 #include <fstream>
 #include <sstream>
 
-using namespace std;
-
 class CaloClusterTimeTool : public AthAlgTool, virtual public ICaloClusterTimeTool 
 {
 public:

Calorimeter/CaloClusterCorrection/src/CaloClusterUpdate.cxx

@@ -38,7 +38,7 @@ Updated:  May 5, 2004    (Sven Menke)
 
 ********************************************************************/
 // include header files
-#include "CaloClusterCorrection/CaloClusterUpdate.h"
+#include "CaloClusterUpdate.h"
 
 #include "GaudiKernel/MsgStream.h"
 #include "CaloGeoHelpers/proxim.h" 
@@ -56,11 +56,9 @@ CaloClusterUpdate::CaloClusterUpdate(const std::string& type,
 CaloClusterUpdate::~CaloClusterUpdate()
 { }
 
-void CaloClusterUpdate::makeCorrection(CaloCluster* cluster)
+void CaloClusterUpdate::makeCorrection(const EventContext& /*ctx*/,
+                                       CaloCluster* cluster) const
 {
-
-  static CaloPhiRange range;
-
   float energy=0; 
   float eta=0; 
   float phi2=0; 
@@ -148,7 +146,7 @@ void CaloClusterUpdate::makeCorrection(CaloCluster* cluster)
 
   if (phi2 != -999. && wphi != 0) {
     phi2 = phi2/wphi ; 
-    phi2 = range.fix (phi2);
+    phi2 = CaloPhiRange::fix (phi2);
   }
   else {
       if (cluster->inBarrel() && ! cluster->inEndcap()) phi2 = cluster->phiSample(CaloSampling::EMB2);