diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloCellDetPos.h b/Calorimeter/CaloUtils/CaloUtils/CaloCellDetPos.h
index 0a9cc38f3bb554f584d59ee48c15369aac925dde..930dcc595fffacb1413e0fa0ebf10d4bd605c432 100644
--- a/Calorimeter/CaloUtils/CaloUtils/CaloCellDetPos.h
+++ b/Calorimeter/CaloUtils/CaloUtils/CaloCellDetPos.h
@@ -24,16 +24,6 @@ class CaloCellDetPos
public:
- /**
- * @brief constructor of CaloCellDetPos
- */
- CaloCellDetPos();
-
- /**
- * @brief destructor of CaloCellDetPos
- */
- ~CaloCellDetPos();
-
/**
* @brief get Detector level eta-phi position from Atlas level (aligned) position
* @param const CaloDetDescrManager mgr CaloDetDescManager Instance
@@ -86,9 +76,6 @@ class CaloCellDetPos
bool getAtlasPosition(CaloCell_ID::CaloSample sam , double etaDet, double phiDet,
double & etaAtlas, double & phiAtlas) const;
- private:
-
- static const CaloPhiRange s_range;
};
#endif
diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloCellList.h b/Calorimeter/CaloUtils/CaloUtils/CaloCellList.h
index fbc18e951fb7a1c4f0f641a366edaea7bfa9df7c..6b8ffc73aaa0dacc67c390de71bf7b42cf6fca6e 100644
--- a/Calorimeter/CaloUtils/CaloUtils/CaloCellList.h
+++ b/Calorimeter/CaloUtils/CaloUtils/CaloCellList.h
@@ -42,13 +42,12 @@ class CaloCellList
public:
typedef std::vector<const CaloCell*> vector_type;
typedef vector_type::const_iterator list_iterator;
-
// CaloCellList();
CaloCellList(const CaloCellContainer* cell_container);
CaloCellList(const CaloCellContainer* cell_container, const CaloCell_ID::SUBCALO caloNum);
CaloCellList(const CaloCellContainer* cell_container, const std::vector<CaloCell_ID::SUBCALO>& caloNums);
- ~CaloCellList();
+ ~CaloCellList() = default;
// deta/dphi are the half-widths of the window.
// That is, we select cells within eta-deta .. eta+deta and similarly for
diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h b/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h
index 8231f4ad872e8debf8385257ddcf9ea54caf2535..2b78a1c9bf3e9d557b64708dc52c990c3ef71eb6 100644
--- a/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h
+++ b/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h
@@ -368,9 +368,6 @@ private:
// Added to cluster in the calorimeter frame
double m_s10r; // eta_raw-weighted energy sum.
double m_s01r; // phi_raw-weighted energy sum.
-
- /// Phi-wrapping helper.
- static const CaloPhiRange s_range;
};
friend struct Helper;
//@}
diff --git a/Calorimeter/CaloUtils/src/CaloCellDetPos.cxx b/Calorimeter/CaloUtils/src/CaloCellDetPos.cxx
index 3f4dcbb48ef706749b330babdd55854d027a46e0..d13465d55861d69c36955bf3dbd2117147c7c85f 100644
--- a/Calorimeter/CaloUtils/src/CaloCellDetPos.cxx
+++ b/Calorimeter/CaloUtils/src/CaloCellDetPos.cxx
@@ -11,13 +11,6 @@
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloDetDescr/CaloDetDescrElement.h"
-const CaloPhiRange CaloCellDetPos::s_range;
-
-CaloCellDetPos::CaloCellDetPos()
-{}
-
-CaloCellDetPos::~CaloCellDetPos()
-{}
bool CaloCellDetPos::getDetPosition(const CaloDetDescrManager& mgr,
CaloCell_ID::CaloSample sam,
double etaAtlas, double phiAtlas,
diff --git a/Calorimeter/CaloUtils/src/CaloCellList.cxx b/Calorimeter/CaloUtils/src/CaloCellList.cxx
index 3b932dc655000bbd4884c026f6b4adf59a7cd791..899a219b964643d050bf62df27ccf0399ab892fe 100644
--- a/Calorimeter/CaloUtils/src/CaloCellList.cxx
+++ b/Calorimeter/CaloUtils/src/CaloCellList.cxx
@@ -59,7 +59,6 @@ CaloCellList::CaloCellList(const CaloCellContainer* cell_container,
std::copy(caloNums.begin(), caloNums.end(), back_inserter(m_caloNums));
}
-CaloCellList::~CaloCellList() {}
void
CaloCellList::select(double eta, double phi, double deta, double dphi)
@@ -137,7 +136,7 @@ CaloCellList::doSelect(const CaloDetDescrManager& mgr,
std::vector<IdentifierHash> calo_mgr_vect;
std::vector<CaloCell_ID::SUBCALO>::const_iterator itrCaloNum = m_caloNums.begin();
std::vector<CaloCell_ID::SUBCALO>::const_iterator itrEndCaloNum = m_caloNums.end();
-
+
for (; itrCaloNum != itrEndCaloNum; ++itrCaloNum) {
CaloCell_ID::SUBCALO caloNum = *itrCaloNum;
if (sam != CaloCell_ID::Unknown) {
diff --git a/Calorimeter/CaloUtils/src/CaloLayerCalculator.cxx b/Calorimeter/CaloUtils/src/CaloLayerCalculator.cxx
index 1615d88c1891ab7ca7f1ceed679549188df5e39a..8a1b11a8cf4ea327f20421a20a025d18142701ac 100644
--- a/Calorimeter/CaloUtils/src/CaloLayerCalculator.cxx
+++ b/Calorimeter/CaloUtils/src/CaloLayerCalculator.cxx
@@ -62,7 +62,7 @@ CaloLayerCalculator::fill (const CaloDetDescrManager& mgr,
}
}
- CaloCellList cell_list(cell_container);
+ CaloCellList cell_list(cell_container);
cell_list.select(mgr,eta,phi,deta,dphi,sampling);
fill (cell_list.begin(),
@@ -143,20 +143,15 @@ void CaloLayerCalculator::resetOnNegativeEnergy(double eta, double phi)
m_etas = 0;
m_phis = 0;
- //m_em = 0;
+ //m_em = 0;
m_emax = 0;
// Added to cluster in the calorimeter frame
- m_etamr = eta;
- m_phimr = phi;
+ m_etamr = eta;
+ m_phimr = phi;
}
-
-/// Phi-wrapping helper.
-const CaloPhiRange CaloLayerCalculator::Helper::s_range;
-
-
/**
* @brief Initialize for doing layer variable calculation.
* @param calc The parent @c CaloLayerCalculator instance.
@@ -220,7 +215,7 @@ CaloLayerCalculator::Helper::cell (const CaloCell* cell, double weight)
double dphic = CaloPhiRange::diff (phic, m_phi);
double dphir = CaloPhiRange::diff (phir, m_phi);
- // The conditions are applied in the calorimeter frame, the biggest difference w.r.t. before...
+ // The conditions are applied in the calorimeter frame, the biggest difference w.r.t. before...
if (etar >= m_eta-m_deta/2. && etar <= m_eta+m_deta/2.) {
if (dphir >= -m_dphi/2. && dphir <= m_dphi/2.) {
@@ -281,7 +276,7 @@ CaloLayerCalculator::Helper::~Helper()
m_calc.m_phim = CaloPhiRange::fix (s1 + m_phi);
m_calc.m_phis = m_s02/m_s00 - s1*s1;
-
+
m_calc.m_etam = m_s10/m_s00;
m_calc.m_etas = m_s20/m_s00 - m_calc.m_etam*m_calc.m_etam;
@@ -302,14 +297,14 @@ CaloLayerCalculator::Helper::~Helper()
else {
//reset();//replaced by:
m_calc.resetOnNegativeEnergy(m_eta,m_phi);
-
- //energy of a sampling CAN be negative (especially PS and back)
+
+ //energy of a sampling CAN be negative (especially PS and back)
//when there is the (gaussian) noise
- //TEMPORARY SOLUTION ( energy negative is not reset to 0 anymore,
+ //TEMPORARY SOLUTION ( energy negative is not reset to 0 anymore,
//but m_etam, m_phim, m_etas, m_phis are still null !! )
- // => << TO BE REDONE >>
+ // => << TO BE REDONE >>
}
-
+
if (m_calc.m_etas > 0.) m_calc.m_etas = sqrt(m_calc.m_etas);
if (m_calc.m_phis > 0.) m_calc.m_phis = sqrt (m_calc.m_phis);
}