Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloClusterUpdate.h → Calorimeter/CaloClusterCorrection/src/CaloClusterUpdate.h

@@ -53,9 +53,11 @@ class CaloClusterUpdate : public CaloClusterCorrection
 		   const std::string& name,
 		   const IInterface* parent);
   // destructor 
-  ~CaloClusterUpdate();
+  virtual ~CaloClusterUpdate() 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/CaloComputeSWcellWeights.cxx

@@ -22,7 +22,7 @@ PURPOSE:  - Compute simple cell weights for Sliding Window
 *********************************************************************/
 
 // include header files
-#include "CaloClusterCorrection/CaloComputeSWcellWeights.h"
+#include "CaloComputeSWcellWeights.h"
 #include "CaloEvent/CaloCell.h"
 #include "CaloEvent/CaloClusterContainer.h"
 //#include "CaloDetDescr/CaloDetDescrElement.h"

Calorimeter/CaloClusterCorrection/src/CaloDummyCorrection.cxx

@@ -11,7 +11,7 @@
  */
 
 
-#include "CaloClusterCorrection/CaloDummyCorrection.h"
+#include "CaloDummyCorrection.h"
 #include "AthenaKernel/errorcheck.h"
 
 
@@ -44,7 +44,8 @@ StatusCode CaloDummyCorrection::initialize()
 
 // derived class implement the real correction.
 // (Does nothing here.)
-void CaloDummyCorrection::makeCorrection(CaloCluster*)
+void CaloDummyCorrection::makeCorrection(const EventContext& /*ctx*/,
+                                         CaloCluster*) const
 {
 }
 

Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloDummyCorrection.h → Calorimeter/CaloClusterCorrection/src/CaloDummyCorrection.h

@@ -48,17 +48,18 @@ public:
   /**
    * @brief Standard initialization method.
    */
-  virtual StatusCode initialize();
+  virtual StatusCode initialize() override;
 
 
   // derived class implement the real correction.
   // (Does nothing here.)
-  virtual void makeCorrection(xAOD::CaloCluster*);
+  virtual void makeCorrection(const EventContext& ctx,
+                              xAOD::CaloCluster*) const override;
 
 
   /// Ignore non-existing properties.
   using CaloClusterCorrection::setProperty;
-  virtual StatusCode setProperty (const Property& p);
+  virtual StatusCode setProperty (const Property& p) override;
 };
 
 

Calorimeter/CaloClusterCorrection/src/CaloFillRectangularCluster.cxx

@@ -18,6 +18,7 @@
 #include "CaloDetDescr/CaloDetDescriptor.h"
 #include "CaloGeoHelpers/CaloPhiRange.h"
 #include "GeoModelInterfaces/IGeoModelSvc.h"
+#include "StoreGate/ReadHandle.h"
 
 #include "CaloEvent/CaloCellContainer.h"
 #include "CaloUtils/CaloCellList.h"
@@ -68,7 +69,6 @@ void etaphi_range (double eta,
                    double& deta,
                    double& dphi)
 {
-  static CaloPhiRange range;
   deta = 0;
   dphi = 0;
 
@@ -110,19 +110,19 @@ void etaphi_range (double eta,
   elt_l = dd_man->get_element_raw
     (sampling,
      eta  - elt->deta() - eps,
-     range.fix (phi - elt->dphi() - eps));
+     CaloPhiRange::fix (phi - elt->dphi() - eps));
   double dphi_l = 0; // Phi difference on the low-eta () side.
   if (elt_l)
-    dphi_l = std::abs (range.fix (phi - elt_l->phi_raw())) + eps;
+    dphi_l = std::abs (CaloPhiRange::fix (phi - elt_l->phi_raw())) + eps;
 
   // Now look in the positive eta direction.
   elt_r = dd_man->get_element_raw
     (sampling,
      eta + elt->deta() + eps,
-     range.fix (phi - elt->dphi() - eps));
+     CaloPhiRange::fix (phi - elt->dphi() - eps));
   double dphi_r = 0; // Phi difference on the positive (down) side.
   if (elt_r)
-    dphi_r = std::abs (range.fix (phi - elt_r->phi_raw())) + eps;
+    dphi_r = std::abs (CaloPhiRange::fix (phi - elt_r->phi_raw())) + eps;
 
   // Total dphi is twice the maximum.
   dphi = 2 * std::max (dphi_l, dphi_r);
@@ -151,7 +151,7 @@ public:
    * @param parent The parent correction class.
    * @param cluster The cluster being operated on.
    */
-  SamplingHelper (CaloClusterCorrection& parent,
+  SamplingHelper (const CaloClusterCorrection& parent,
                   CaloCluster* cluster);
 
 
@@ -276,7 +276,7 @@ protected:
   CaloLayerCalculator m_calc;
 
   /// The correction object using us.
-  CaloClusterCorrection& m_parent;
+  const CaloClusterCorrection& m_parent;
 
   /// The cluster we're updating.
   CaloCluster* m_cluster;
@@ -294,7 +294,7 @@ protected:
  * @param parent The parent correction class.
  * @param cluster The cluster being operated on.
  */
-SamplingHelper::SamplingHelper (CaloClusterCorrection& parent,
+SamplingHelper::SamplingHelper (const CaloClusterCorrection& parent,
                                 CaloCluster* cluster)
   : m_parent (parent),
     m_cluster (cluster),
@@ -487,7 +487,7 @@ public:
    * @param list The cell list.
    * @param cell_container The container from which the cells came.
    */
-  SamplingHelper_CaloCellList (CaloClusterCorrection& parent,
+  SamplingHelper_CaloCellList (const CaloClusterCorrection& parent,
                                CaloCluster* cluster,
                                const CaloCellList& list,
                                const CaloCellContainer* cell_container);
@@ -539,7 +539,7 @@ private:
  * @param cell_container The container from which the cells came.
  */
 SamplingHelper_CaloCellList::SamplingHelper_CaloCellList
-   (CaloClusterCorrection& parent,
+   (const CaloClusterCorrection& parent,
     CaloCluster* cluster,
     const CaloCellList& list,
     const CaloCellContainer* /*cell_container*/)
@@ -613,7 +613,7 @@ public:
    * @param parent The parent correction class.
    * @param cluster The cluster being operated on.
    */
-  SamplingHelper_Cluster (CaloClusterCorrection& parent,
+  SamplingHelper_Cluster (const CaloClusterCorrection& parent,
                           CaloCluster* cluster);
 
   /**
@@ -652,7 +652,7 @@ public:
  * @param parent The parent correction class.
  * @param cluster The cluster being operated on.
  */
-SamplingHelper_Cluster::SamplingHelper_Cluster (CaloClusterCorrection& parent,
+SamplingHelper_Cluster::SamplingHelper_Cluster (const CaloClusterCorrection& parent,
                                                 CaloCluster* cluster)
   : SamplingHelper (parent, cluster)
 {
@@ -748,6 +748,8 @@ StatusCode CaloFillRectangularCluster::initialize()
 {
   // The method from the base class.
   CHECK( CaloClusterCorrection::initialize() );
+  if (!m_cellsName.key().empty())
+    CHECK( m_cellsName.initialize() );
 
   const IGeoModelSvc *geoModel=0;
   StatusCode sc = service("GeoModelSvc", geoModel);
@@ -826,18 +828,20 @@ CaloFillRectangularCluster::geoInit(IOVSVC_CALLBACK_ARGS)
 
 /*
  * @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
-CaloFillRectangularCluster::makeCorrection1(CaloClusterCorr::SamplingHelper&
+CaloFillRectangularCluster::makeCorrection1(const EventContext& ctx,
+                                            CaloClusterCorr::SamplingHelper&
                                              helper,
                                             double eta,
                                             double phi,
                                             const CaloSampling::CaloSample 
-                                             samplings[4])
+                                             samplings[4]) const
 {
   // Do sampling 2.
   helper.calculate_and_set (eta, phi, m_deta2, m_dphi2, eta, phi,
@@ -914,12 +918,14 @@ CaloFillRectangularCluster::makeCorrection1(CaloClusterCorr::SamplingHelper&
     const CaloCellContainer* cc = helper.cluster()->getCellLinks()->getCellContainer();
 
     //Leave the option to use a different cell container
-    if (!m_cellsName.empty()) {
-      if ( ! evtStore()->retrieve (cc, m_cellsName).isSuccess()) {
+    if (!m_cellsName.key().empty()) {
+      SG::ReadHandle<CaloCellContainer> cchand (m_cellsName, ctx);
+      if (!cchand.isValid()) {
         REPORT_ERROR(StatusCode::FAILURE)
-          << "Can't retrieve cell container " << m_cellsName;
+          << "Can't retrieve cell container " << m_cellsName.key();
         return;
       }
+      cc = cchand.cptr();
     }
     
     if(!cc) //cover the case when the cluster does not give a cell container and the name is empty
@@ -967,11 +973,13 @@ CaloFillRectangularCluster::makeCorrection1(CaloClusterCorr::SamplingHelper&
 
 /*
  * @brief Execute the correction, given a helper object.
+ * @param ctx     The event context.
  * @param helper Sampling calculation helper object.
  */
 void
-CaloFillRectangularCluster::makeCorrection2 (CaloClusterCorr::SamplingHelper&
-                                             helper)
+CaloFillRectangularCluster::makeCorrection2 (const EventContext& ctx,
+                                             CaloClusterCorr::SamplingHelper&
+                                             helper) const
 {
 
   // Don't do anything if we don't have any cells.
@@ -1060,12 +1068,12 @@ CaloFillRectangularCluster::makeCorrection2 (CaloClusterCorr::SamplingHelper&
 
   // Barrel
   if (aeta < 1.6) {
-    makeCorrection1 (helper, eta, phi, samplings_b);
+    makeCorrection1 (ctx, helper, eta, phi, samplings_b);
   }
 
   // Endcap
   if (aeta > 1.3) {
-    makeCorrection1 (helper, eta, phi, samplings_e);
+    makeCorrection1 (ctx, helper, eta, phi, samplings_e);
   }
 
   // Set the total cluster energy to the sum over all samplings.
@@ -1087,9 +1095,11 @@ CaloFillRectangularCluster::makeCorrection2 (CaloClusterCorr::SamplingHelper&
 
 /**
  * @brief CaloClusterCorrection virtual method
+ * @param ctx     The event context.
  * @param cluster The cluster on which to operate.
  */
-void CaloFillRectangularCluster::makeCorrection(CaloCluster* cluster)
+void CaloFillRectangularCluster::makeCorrection(const EventContext& ctx,
+                                                CaloCluster* cluster) const
 {
 
   ATH_MSG_DEBUG( "Executing CaloFillRectangularCluster" << endreq) ;
@@ -1103,21 +1113,21 @@ void CaloFillRectangularCluster::makeCorrection(CaloCluster* cluster)
     cluster->getCellLinks()->clear();
  
     //Leave the option to use a different cell container 
-    if (!m_cellsName.empty()) {
-      if ( ! evtStore()->retrieve (cell_container, m_cellsName).isSuccess()) {
-	REPORT_ERROR(StatusCode::FAILURE)
-	  << "Can't retrieve cell container " << m_cellsName;
-	return;
+    if (!m_cellsName.key().empty()) {
+      SG::ReadHandle<CaloCellContainer> cchand (m_cellsName, ctx);
+      if (!cchand.isValid()) {
+        REPORT_ERROR(StatusCode::FAILURE)
+          << "Can't retrieve cell container " << m_cellsName.key();
+        return;
       }
- 
+      cell_container = cchand.cptr();
     }
 
 
     // Define the center for building the list of candidate cells.
     double eta = cluster->eta0();
     double phi = cluster->phi0();
-    static CaloPhiRange range;
-    phi = range.fix (phi);
+    phi = CaloPhiRange::fix (phi);
 
     // Build the candidate cell list.
     // This 5 is a safe margin for cell_list calculation
@@ -1130,12 +1140,12 @@ void CaloFillRectangularCluster::makeCorrection(CaloCluster* cluster)
                                                          cluster,
                                                          cell_list,
                                                          cell_container);
-    makeCorrection2 (helper);
+    makeCorrection2 (ctx, helper);
   }
   else {
     // We're recalculating a cluster using the existing cells.
     CaloClusterCorr::SamplingHelper_Cluster helper (*this, cluster);
-    makeCorrection2 (helper);
+    makeCorrection2 (ctx, helper);
   }
 }
 
@@ -1154,18 +1164,17 @@ void CaloFillRectangularCluster::makeCorrection(CaloCluster* cluster)
 void CaloFillRectangularCluster::get_seed (const CaloCluster* cluster,
                                            const CaloCell* max_et_cell,
                                            double& eta,
-                                           double& phi)
+                                           double& phi) const
 {
   ///!!! NEW way of the endcap-shift treatment (same for barrel and endcap)
   // a.b.c 2004 : for barrel, correct for the alignment before 
   //               comparing the Tower direction and the cell's
   // ( for Atlas the difference is null, but it's not true for TB )
-  static CaloPhiRange range;
   const CaloDetDescrElement* elt = max_et_cell->caloDDE();
   double phi_shift = elt->phi()-elt->phi_raw();
   double eta_shift = elt->eta()-elt->eta_raw();
   eta = cluster->eta0()+eta_shift;
-  phi = range.fix(cluster->phi0()+phi_shift);
+  phi = CaloPhiRange::fix(cluster->phi0()+phi_shift);
 
   // Special case to handle a pathology seen at the edge of the calorimeter
   // with clusters with an eta size of 3.  The cluster size used for the SW
@@ -1205,7 +1214,7 @@ void CaloFillRectangularCluster::get_seed (const CaloCluster* cluster,
   // stay in the calo frame and do not cook for cluster on edge
   // (inputs are now 3x5 so there should not be problems anymore)
   eta = cluster->eta0();
-  phi = range.fix(cluster->phi0());
+  phi = CaloPhiRange::fix(cluster->phi0());
 
 }
 

Calorimeter/CaloClusterCorrection/src/CaloLongWeights_v2.cxx

@@ -13,7 +13,7 @@ CREATED:  Jan 25, 2006
 PURPOSE:  correction for the energy lost in the dead material
 
 ********************************************************************/
-#include "CaloClusterCorrection/CaloLongWeights_v2.h"
+#include "CaloLongWeights_v2.h"
 #include "CaloClusterCorrection/interpolate.h"
 
 
@@ -33,13 +33,14 @@ CaloLongWeights_v2::CaloLongWeights_v2(const std::string& type,
   declareConstant("EtaEndCap",       m_endcap_frontier);
 }
  
-void CaloLongWeights_v2::makeTheCorrection(CaloCluster* cluster,
-					  const CaloDetDescrElement* /*elt*/,
-					  float eta,
-					  float /*adj_eta*/,
-					  float /*phi*/,
-					  float /*phi*/,
-					  CaloSampling::CaloSample /*samp*/) const
+void CaloLongWeights_v2::makeTheCorrection(const EventContext& /*ctx*/,
+                                           CaloCluster* cluster,
+                                           const CaloDetDescrElement* /*elt*/,
+                                           float eta,
+                                           float /*adj_eta*/,
+                                           float /*phi*/,
+                                           float /*phi*/,
+                                           CaloSampling::CaloSample /*samp*/) const
 { 
   float the_eta = std::abs (eta);
   if (the_eta >= m_etamax) return;

Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloLongWeights_v2.h → Calorimeter/CaloClusterCorrection/src/CaloLongWeights_v2.h

@@ -31,13 +31,14 @@ public:
                      const IInterface* parent);
 
  
-  virtual void makeTheCorrection (xAOD::CaloCluster* cluster,
+  virtual void makeTheCorrection (const EventContext& ctx,
+                                  xAOD::CaloCluster* cluster,
                                   const CaloDetDescrElement* elt,
                                   float eta,
                                   float adj_eta,
                                   float phi,
                                   float adj_phi,
-                                  CaloSampling::CaloSample samp) const;
+                                  CaloSampling::CaloSample samp) const override;
 
 
  private:

Calorimeter/CaloClusterCorrection/src/CaloPhiParabola.cxx

@@ -13,7 +13,7 @@ CREATED:  Jan 25, 2006
 PURPOSE:  corrects for the parabolic behavior in the E vs Phi curve
 
 ********************************************************************/
-#include "CaloClusterCorrection/CaloPhiParabola.h"
+#include "CaloPhiParabola.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloClusterCorrection/interpolate.h"
 #include "CLHEP/Units/PhysicalConstants.h"
@@ -34,7 +34,8 @@ CaloPhiParabola::CaloPhiParabola (const std::string& type,
 }
 
 
-void CaloPhiParabola::makeTheCorrection (CaloCluster* cluster,
+void CaloPhiParabola::makeTheCorrection (const EventContext& /*ctx*/,
+                                         CaloCluster* cluster,
                                          const CaloDetDescrElement* /*elt*/,
                                          float /*eta*/,
                                          float /*adj_eta*/,

Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloPhiParabola.h → Calorimeter/CaloClusterCorrection/src/CaloPhiParabola.h

@@ -29,13 +29,14 @@ public:
                   const std::string& name,
                   const IInterface* parent);
 
-  virtual void makeTheCorrection (xAOD::CaloCluster* cluster,
+  virtual void makeTheCorrection (const EventContext& ctx,
+                                  xAOD::CaloCluster* cluster,
                                   const CaloDetDescrElement* elt,
                                   float eta,
                                   float adj_eta,
                                   float phi,
                                   float adj_phi,
-                                  CaloSampling::CaloSample samp) const;
+                                  CaloSampling::CaloSample samp) const override;
 
 private:
 

Calorimeter/CaloClusterCorrection/src/CaloRunClusterCorrections.cxx

@@ -13,7 +13,7 @@
  */
 
 
-#include "CaloClusterCorrection/CaloRunClusterCorrections.h"
+#include "CaloRunClusterCorrections.h"
 #include "CaloClusterCorrection/CaloClusterCorrectionCommon.h"
 #include "CaloRec/ToolWithConstantsMixin.h"
 #include "CaloUtils/CaloClusterStoreHelper.h"

Calorimeter/CaloClusterCorrection/src/CaloScaleCluster.cxx

@@ -11,7 +11,7 @@
  */
 
 
-#include "CaloClusterCorrection/CaloScaleCluster.h"
+#include "CaloScaleCluster.h"
 #include "CaloClusterCorrection/interpolate.h"
 #include <cmath>
 
@@ -39,6 +39,7 @@ CaloScaleCluster::CaloScaleCluster (const std::string& type,
 
 /**
  * @brief Virtual function for the correction-specific code.
+ * @param ctx     The event context.
  * @param cluster The cluster to correct.
  *                It is updated in place.
  * @param elt     The detector description element corresponding
@@ -56,7 +57,8 @@ CaloScaleCluster::CaloScaleCluster (const std::string& type,
  *                @c CaloSampling::CaloSample; i.e., it has both
  *                the calorimeter region and sampling encoded.
  */
-void CaloScaleCluster::makeTheCorrection (CaloCluster* cluster,
+void CaloScaleCluster::makeTheCorrection (const EventContext& /*ctx*/,
+                                          CaloCluster* cluster,
                                           const CaloDetDescrElement* /*elt*/,
                                           float /*eta*/,
                                           float adj_eta,

Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloScaleCluster.h → Calorimeter/CaloClusterCorrection/src/CaloScaleCluster.h

@@ -44,6 +44,7 @@ class CaloScaleCluster
 
   /**
    * @brief Virtual function for the correction-specific code.
+   * @param ctx     The event context.
    * @param cluster The cluster to correct.
    *                It is updated in place.
    * @param elt     The detector description element corresponding
@@ -61,13 +62,14 @@ class CaloScaleCluster
    *                @c CaloSampling::CaloSample; i.e., it has both
    *                the calorimeter region and sampling encoded.
    */
-  virtual void makeTheCorrection (xAOD::CaloCluster* cluster,
+  virtual void makeTheCorrection (const EventContext& ctx,
+                                  xAOD::CaloCluster* cluster,
                                   const CaloDetDescrElement* elt,
                                   float eta,
                                   float adj_eta,
                                   float phi,
                                   float adj_phi,
-                                  CaloSampling::CaloSample samp) const;
+                                  CaloSampling::CaloSample samp) const override;
 
   
 private:

Calorimeter/CaloClusterCorrection/src/CaloSwApplyWgts_g3.cxx

@@ -22,7 +22,7 @@ Updated:  May 5, 2004    (Sven Menke)
 
 
 ********************************************************************/
-#include "CaloClusterCorrection/CaloSwApplyWgts_g3.h"
+#include "CaloSwApplyWgts_g3.h"
 
 
 // correction constants Leonardo Carminati
@@ -51,7 +51,7 @@ Bin# |  Eta < 1.35  | 1.35<eta<1.6 | eta > 1.6
 */
 
 using xAOD::CaloCluster;
-const float CaloSwApplyWgts_g3::m_table_eta[numEtaBins+1] 
+const float CaloSwApplyWgts_g3::m_table_eta[s_numEtaBins+1] 
 = {0.000000, 0.025000, 0.050000, 0.075000, 0.100000, 0.125000, 
    0.150000, 0.175000, 0.200000, 0.225000, 0.250000, 0.275000, 
    0.300000, 0.325000, 0.350000, 0.375000, 0.400000, 0.425000, 
@@ -69,7 +69,7 @@ const float CaloSwApplyWgts_g3::m_table_eta[numEtaBins+1]
    2.100000, 2.125000, 2.150000, 2.175000, 2.200000, 2.225000, 
    2.250000, 2.275000, 2.300000, 2.325000, 2.350000, 2.375000, 
    2.400000, 2.425000, 2.450000, 2.475000, 2.500000};
-const float CaloSwApplyWgts_g3::m_table_p[4][numEtaBins] = {
+const float CaloSwApplyWgts_g3::m_table_p[4][s_numEtaBins] = {
   {
     2.159336, 2.159365, 2.159426, 2.159524, 2.185450, 1.784150, 
     1.468300, 1.577280, 2.357230, 2.143870, 2.429050, 2.128170, 
@@ -165,7 +165,8 @@ CaloSwApplyWgts_g3::~CaloSwApplyWgts_g3()
 { }
 
 // make correction to one cluster 
-void CaloSwApplyWgts_g3::makeCorrection(CaloCluster* cluster)
+void CaloSwApplyWgts_g3::makeCorrection(const EventContext& /*ctx*/,
+                                        CaloCluster* cluster) const
 {
 
   
@@ -192,12 +193,12 @@ void CaloSwApplyWgts_g3::makeCorrection(CaloCluster* cluster)
 
 }
 
-float CaloSwApplyWgts_g3::GetWgt(int layer, float aeta)
+float CaloSwApplyWgts_g3::GetWgt(int layer, float aeta) const
 {
-  if (aeta < m_table_eta[0] || aeta > m_table_eta[numEtaBins])
+  if (aeta < m_table_eta[0] || aeta > m_table_eta[s_numEtaBins])
     return m_table_p[layer%4][0];
-  else
-    for (int i = 0; i < numEtaBins; ++i) 
+  else {
+    for (int i = 0; i < s_numEtaBins; ++i) 
       {
 	//    Check Eta range and do interpolation
 	
@@ -220,33 +221,9 @@ float CaloSwApplyWgts_g3::GetWgt(int layer, float aeta)
 	    }
 	  }
       }
+  }
   
-    return m_table_p[0][0] ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  return m_table_p[0][0] ;
 }
 
     

Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloSwApplyWgts_g3.h → Calorimeter/CaloClusterCorrection/src/CaloSwApplyWgts_g3.h

@@ -34,17 +34,20 @@ class CaloSwApplyWgts_g3 : public CaloClusterCorrection
                      const std::string& name,
                      const IInterface* parent);
   // destructor 
-  ~CaloSwApplyWgts_g3();
+  virtual ~CaloSwApplyWgts_g3() override;
+  
   // virtual method in CaloClusterCorrection
-  virtual void makeCorrection(xAOD::CaloCluster* cluster);
+  virtual void makeCorrection(const EventContext& ctx,
+                              xAOD::CaloCluster* cluster) const override;
 
  private:
 
-  CaloSwApplyWgts_g3();
-  static const int numEtaBins=100;
-  float GetWgt(int table, float eta);
-  static const float m_table_eta[numEtaBins+1];
-  static const float m_table_p[4][numEtaBins];
+  CaloSwApplyWgts_g3() = delete;
+
+  static const int s_numEtaBins=100;
+  float GetWgt(int table, float eta) const;
+  static const float m_table_eta[s_numEtaBins+1];
+  static const float m_table_p[4][s_numEtaBins];
 };
 
 #endif

Calorimeter/CaloClusterCorrection/src/CaloSwCalibHitsCalibration.cxx

@@ -23,7 +23,7 @@ Updated:  January 17, 2008 (LC)
 
 ********************************************************************/
 
-#include "CaloClusterCorrection/CaloSwCalibHitsCalibration.h"
+#include "CaloSwCalibHitsCalibration.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 
 
@@ -60,6 +60,7 @@ CaloSwCalibHitsCalibration::CaloSwCalibHitsCalibration
 
 /**
   * @brief Virtual function for the correction-specific code.
+  * @param ctx     The event context.
   * @param cluster The cluster to correct.
   *                It is updated in place.
   * @param elt     The detector description element corresponding
@@ -80,7 +81,8 @@ CaloSwCalibHitsCalibration::CaloSwCalibHitsCalibration
 
 
 void CaloSwCalibHitsCalibration::makeTheCorrection
-   (CaloCluster* cluster,
+(const EventContext& /*ctx*/,
+    CaloCluster* cluster,
     const CaloDetDescrElement* /*elt*/,
     float eta,
     float adj_eta,
@@ -158,7 +160,7 @@ void CaloSwCalibHitsCalibration::makeTheCorrection
    ATH_MSG_DEBUG( "Second order:  " << sec[0] << "  " << sec[1]
           << "  "  << sec[2] << " " << sec[3] << endreq);
 
-   static CaloSampling::CaloSample samps[2][4] = {
+   static const CaloSampling::CaloSample samps[2][4] = {
      { CaloSampling::PreSamplerB,
        CaloSampling::EMB1,
        CaloSampling::EMB2,
@@ -262,7 +264,8 @@ double shower_lbary = m_showerDepth.depth (the_aeta, cluster, msg() );
      if (the_aeta < m_eta_start_crack) {
        double WpsOff      = froffset[1] + froffset[2]     * raw_energy + 
                             froffset[3] * raw_energy * raw_energy;
-       double WpsSlo      = frslope[1]  * pow(log(raw_energy),frslope[2]) +
+       double WpsSlo      = frslope[1]  * pow(log(raw_energy),
+                                              static_cast<double>(frslope[2])) +
                             frslope[3] *sqrt( raw_energy );
        e_front_reco=WpsOff + WpsSlo*(eps_base );
 

Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloSwCalibHitsCalibration.h → Calorimeter/CaloClusterCorrection/src/CaloSwCalibHitsCalibration.h

@@ -26,11 +26,12 @@ class CaloSwCalibHitsCalibration : public CaloClusterCorrectionCommon
 public:
   // constructor 
   CaloSwCalibHitsCalibration (const std::string& type,
-                     const std::string& name,
-                     const IInterface* parent);
+                              const std::string& name,
+                              const IInterface* parent);
 
   /**
    * @brief Virtual function for the correction-specific code.
+   * @param ctx     The event context.
    * @param cluster The cluster to correct.
    *                It is updated in place.
    * @param elt     The detector description element corresponding
@@ -48,13 +49,14 @@ public:
    *                @c CaloSampling::CaloSample; i.e., it has both
    *                the calorimeter region and sampling encoded.
    */
-  virtual void makeTheCorrection (xAOD::CaloCluster* cluster,
+  virtual void makeTheCorrection (const EventContext& ctx,
+                                  xAOD::CaloCluster* cluster,
                                   const CaloDetDescrElement* elt,
                                   float eta,
                                   float adj_eta,
                                   float phi,
                                   float adj_phi,
-                                  CaloSampling::CaloSample samp) const;
+                                  CaloSampling::CaloSample samp) const override;
 
 
  private:

Calorimeter/CaloClusterCorrection/src/CaloSwCalibHitsShowerDepth.cxx

@@ -68,7 +68,7 @@ double CaloSwCalibHitsShowerDepth::depth (float aeta,
   else
     return 0;
 
-  static CaloSampling::CaloSample samps[2][4] = {
+  static const CaloSampling::CaloSample samps[2][4] = {
     { CaloSampling::PreSamplerB,
       CaloSampling::EMB1,
       CaloSampling::EMB2,

Calorimeter/CaloClusterCorrection/src/CaloSwClcon_g3.cxx

@@ -34,7 +34,7 @@ Updated:  June, 2004    (sss)
 ********************************************************************/
 
 
-#include "CaloClusterCorrection/CaloSwClcon_g3.h"
+#include "CaloSwClcon_g3.h"
 #include "AthenaKernel/errorcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cmath>
@@ -61,7 +61,8 @@ CaloSwClcon_g3::~CaloSwClcon_g3()
 { }
 
 // apply correction to one cluster.
-void CaloSwClcon_g3::makeCorrection(CaloCluster* cluster)
+void CaloSwClcon_g3::makeCorrection(const EventContext& /*ctx*/,
+                                    CaloCluster* cluster) const
 {
   float eta = cluster->eta();
   float aeta = fabs(eta);