diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.h b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.h
index 87cc29d46cd4f1cb030356ddc249c4f6f42abc91..bd0e2195d300c54998c933999c056df66c677f1e 100755
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.h
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.h
@@ -96,7 +96,7 @@ public:
of the intersecting track.
*/
virtual const InDet::PixelClusterOnTrack* correct(const Trk::PrepRawData&,
- const Trk::TrackParameters&) const;
+ const Trk::TrackParameters&) const override;
virtual const InDet::PixelClusterOnTrack* correctDefault(const Trk::PrepRawData&,
const Trk::TrackParameters&) const;
@@ -196,14 +196,14 @@ public:
mutable std::vector< std::vector<float> > m_fX, m_fY, m_fB, m_fC, m_fD;
//moved from static to member variable
- static constexpr int nbinphi=9;
- static constexpr int nbineta=6;
- double calphi[nbinphi];
- double caleta[nbineta][3];
- double calerrphi[nbinphi][3];
- double calerreta[nbineta][3];
- double phix[nbinphi+1];
- double etax[nbineta+1];
+ static constexpr int s_nbinphi=9;
+ static constexpr int s_nbineta=6;
+ double m_calphi[s_nbinphi];
+ double m_caleta[s_nbineta][3];
+ double m_calerrphi[s_nbinphi][3];
+ double m_calerreta[s_nbineta][3];
+ double m_phix[s_nbinphi+1];
+ double m_etax[s_nbineta+1];
};
} // end of namespace InDet
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/IBL_calibration.h b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/IBL_calibration.h
index 36a61072052d8329dc463ab646143d5061f97f54..da5ec87d3a0d5da00abb7f163b03d1f05332c480 100644
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/IBL_calibration.h
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/IBL_calibration.h
@@ -2,75 +2,75 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-calphi[0] = 0.0463822;
-calerrphi[0][0] = 0.00458704;
-calerrphi[0][1] = 0.00240123;
-calerrphi[0][2] = 0.0381553;
-calphi[1] = 0.0395409;
-calerrphi[1][0] = 0.00571953;
-calerrphi[1][1] = 0.00217718;
-calerrphi[1][2] = 0.0443544;
-calphi[2] = 0.0291725;
-calerrphi[2][0] = 0.00753389;
-calerrphi[2][1] = 0.00192153;
-calerrphi[2][2] = 0.0502262;
-calphi[3] = 0.0221493;
-calerrphi[3][0] = 0.00908161;
-calerrphi[3][1] = 0.00234422;
-calerrphi[3][2] = 0.052859;
-calphi[4] = 0.0183585;
-calerrphi[4][0] = 0.009916;
-calerrphi[4][1] = 0.00307481;
-calerrphi[4][2] = 0.0560763;
-calphi[5] = 0.0228795;
-calerrphi[5][0] = 0.00886146;
-calerrphi[5][1] = 0.00260481;
-calerrphi[5][2] = 0.0516711;
-calphi[6] = 0.0296685;
-calerrphi[6][0] = 0.00746781;
-calerrphi[6][1] = 0.00197842;
-calerrphi[6][2] = 0.0497699;
-calphi[7] = 0.0395992;
-calerrphi[7][0] = 0.00557493;
-calerrphi[7][1] = 0.00213298;
-calerrphi[7][2] = 0.0454933;
-calphi[8] = 0.0497221;
-calerrphi[8][0] = 0.00461163;
-calerrphi[8][1] = 0.00251781;
-calerrphi[8][2] = 0.0309285;
-caleta[0][0] = 0;
-caleta[0][1] = 0;
-caleta[0][2] = 0.0669391;
-calerreta[0][0] = 0;
-calerreta[0][1] = 0.0614102;
-calerreta[0][2] = 0.00891571;
-caleta[1][0] = 0.0669391;
-caleta[1][1] = 0.199526;
-caleta[1][2] = 0.0642114;
-calerreta[1][0] = 0.0445204;
-calerreta[1][1] = 0.05385;
-calerreta[1][2] = 0.0104638;
-caleta[2][0] = 0.322464;
-caleta[2][1] = 0.207504;
-caleta[2][2] = 0.0699703;
-calerreta[2][0] = 0.045776;
-calerreta[2][1] = 0.0222315;
-calerreta[2][2] = 0.0106168;
-caleta[3][0] = 0.299711;
-caleta[3][1] = 0.215319;
-caleta[3][2] = 0.0653161;
-calerreta[3][0] = 0.0277008;
-calerreta[3][1] = 0.0218932;
-calerreta[3][2] = 0.0108854;
-caleta[4][0] = 0.295881;
-caleta[4][1] = 0.215595;
-caleta[4][2] = 0.0284735;
-calerreta[4][0] = 0.0281094;
-calerreta[4][1] = 0.0215104;
-calerreta[4][2] = 0.0159464;
-caleta[5][0] = 0.321041;
-caleta[5][1] = 0.216542;
-caleta[5][2] = 0.172694;
-calerreta[5][0] = 0.0312848;
-calerreta[5][1] = 0.0236938;
-calerreta[5][2] = 0.0202331;
+m_calphi[0] = 0.0463822;
+m_calerrphi[0][0] = 0.00458704;
+m_calerrphi[0][1] = 0.00240123;
+m_calerrphi[0][2] = 0.0381553;
+m_calphi[1] = 0.0395409;
+m_calerrphi[1][0] = 0.00571953;
+m_calerrphi[1][1] = 0.00217718;
+m_calerrphi[1][2] = 0.0443544;
+m_calphi[2] = 0.0291725;
+m_calerrphi[2][0] = 0.00753389;
+m_calerrphi[2][1] = 0.00192153;
+m_calerrphi[2][2] = 0.0502262;
+m_calphi[3] = 0.0221493;
+m_calerrphi[3][0] = 0.00908161;
+m_calerrphi[3][1] = 0.00234422;
+m_calerrphi[3][2] = 0.052859;
+m_calphi[4] = 0.0183585;
+m_calerrphi[4][0] = 0.009916;
+m_calerrphi[4][1] = 0.00307481;
+m_calerrphi[4][2] = 0.0560763;
+m_calphi[5] = 0.0228795;
+m_calerrphi[5][0] = 0.00886146;
+m_calerrphi[5][1] = 0.00260481;
+m_calerrphi[5][2] = 0.0516711;
+m_calphi[6] = 0.0296685;
+m_calerrphi[6][0] = 0.00746781;
+m_calerrphi[6][1] = 0.00197842;
+m_calerrphi[6][2] = 0.0497699;
+m_calphi[7] = 0.0395992;
+m_calerrphi[7][0] = 0.00557493;
+m_calerrphi[7][1] = 0.00213298;
+m_calerrphi[7][2] = 0.0454933;
+m_calphi[8] = 0.0497221;
+m_calerrphi[8][0] = 0.00461163;
+m_calerrphi[8][1] = 0.00251781;
+m_calerrphi[8][2] = 0.0309285;
+m_caleta[0][0] = 0;
+m_caleta[0][1] = 0;
+m_caleta[0][2] = 0.0669391;
+m_calerreta[0][0] = 0;
+m_calerreta[0][1] = 0.0614102;
+m_calerreta[0][2] = 0.00891571;
+m_caleta[1][0] = 0.0669391;
+m_caleta[1][1] = 0.199526;
+m_caleta[1][2] = 0.0642114;
+m_calerreta[1][0] = 0.0445204;
+m_calerreta[1][1] = 0.05385;
+m_calerreta[1][2] = 0.0104638;
+m_caleta[2][0] = 0.322464;
+m_caleta[2][1] = 0.207504;
+m_caleta[2][2] = 0.0699703;
+m_calerreta[2][0] = 0.045776;
+m_calerreta[2][1] = 0.0222315;
+m_calerreta[2][2] = 0.0106168;
+m_caleta[3][0] = 0.299711;
+m_caleta[3][1] = 0.215319;
+m_caleta[3][2] = 0.0653161;
+m_calerreta[3][0] = 0.0277008;
+m_calerreta[3][1] = 0.0218932;
+m_calerreta[3][2] = 0.0108854;
+m_caleta[4][0] = 0.295881;
+m_caleta[4][1] = 0.215595;
+m_caleta[4][2] = 0.0284735;
+m_calerreta[4][0] = 0.0281094;
+m_calerreta[4][1] = 0.0215104;
+m_calerreta[4][2] = 0.0159464;
+m_caleta[5][0] = 0.321041;
+m_caleta[5][1] = 0.216542;
+m_caleta[5][2] = 0.172694;
+m_calerreta[5][0] = 0.0312848;
+m_calerreta[5][1] = 0.0236938;
+m_calerreta[5][2] = 0.0202331;
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/PixelClusterOnTrackTool.cxx b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/PixelClusterOnTrackTool.cxx
index 91a1cf7b93793ed47fdf3f9c6429de0ccd37cb5a..f60454d3102d442f82f105946927db4893d00e33 100755
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/PixelClusterOnTrackTool.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/PixelClusterOnTrackTool.cxx
@@ -185,10 +185,10 @@ InDet::PixelClusterOnTrackTool::initialize() {
//Moved to initialize to remove statics and prevent repitition
constexpr double phimin=-0.27, phimax=0.27;
- for (int i=0; i<=nbinphi; i++) phix[i]=phimin+i*(phimax-phimin)/nbinphi;
- constexpr double etacen[nbineta]={-0.,1.,1.55,1.9,2.15,2.35};
- etax[0]=0.; etax[nbineta]=2.7;
- for (int i=0; i<nbineta-1; i++) etax[i+1]=(etacen[i]+etacen[i+1])/2.;
+ for (int i=0; i<=s_nbinphi; i++) m_phix[i]=phimin+i*(phimax-phimin)/s_nbinphi;
+ constexpr double etacen[s_nbineta]={-0.,1.,1.55,1.9,2.15,2.35};
+ m_etax[0]=0.; m_etax[s_nbineta]=2.7;
+ for (int i=0; i<s_nbineta-1; i++) m_etax[i+1]=(etacen[i]+etacen[i+1])/2.;
///UGLY!
#include "IBL_calibration.h"
@@ -451,15 +451,15 @@ InDet::PixelClusterOnTrackTool::correctDefault
if (m_IBLAbsent || !blayer) {
delta = m_calibSvc->getBarrelDeltaX(nrows, ang);
} else { // special calibration for IBL
- if (angle < phix[0] || angle > phix[nbinphi] || nrows != 2) {
+ if (angle < m_phix[0] || angle > m_phix[s_nbinphi] || nrows != 2) {
delta = 0.;
}else {
int bin = -1;
- while (angle > phix[bin + 1]) {
+ while (angle > m_phix[bin + 1]) {
bin++;
}
- if ((bin >= 0)and(bin < nbinphi)) {
- delta = calphi[bin];
+ if ((bin >= 0)and(bin < s_nbinphi)) {
+ delta = m_calphi[bin];
} else {
ATH_MSG_ERROR("bin out of range in line " << __LINE__ << " of PixelClusterOnTrackTool.cxx.");
}
@@ -483,20 +483,20 @@ InDet::PixelClusterOnTrackTool::correctDefault
delta = m_calibSvc->getBarrelDeltaY(ncol, etaloc);
} else { // special calibration for IBL
etaloc = std::fabs(etaloc);
- if (etaloc < etax[0] || etaloc > etax[nbineta]) {
+ if (etaloc < m_etax[0] || etaloc > m_etax[s_nbineta]) {
delta = 0.;
} else {
int bin = -1;
- while (etaloc > etax[bin + 1]) {
+ while (etaloc > m_etax[bin + 1]) {
bin++;
}
- if ((bin >= 0)and(bin < nbineta)) {
+ if ((bin >= 0)and(bin < s_nbineta)) {
if (ncol == bin) {
- delta = caleta[bin][0];
+ delta = m_caleta[bin][0];
} else if (ncol == bin + 1) {
- delta = caleta[bin][1];
+ delta = m_caleta[bin][1];
} else if (ncol == bin + 2) {
- delta = caleta[bin][2];
+ delta = m_caleta[bin][2];
} else {
delta = 0.;
}
@@ -561,20 +561,20 @@ InDet::PixelClusterOnTrackTool::correctDefault
if (m_IBLAbsent || !blayer) {
errphi = m_calibSvc->getBarrelNewErrorPhi(ang, nrows);
} else { // special calibration for IBL
- if (angle < phix[0] || angle > phix[nbinphi]) {
+ if (angle < m_phix[0] || angle > m_phix[s_nbinphi]) {
errphi = width.phiR() * TOPHAT_SIGMA;
} else {
- int bin = -1;// cannot be used as array index, which will happen if angle<phix[bin+1]
- while (angle > phix[bin + 1]) {
+ int bin = -1;// cannot be used as array index, which will happen if angle<m_phix[bin+1]
+ while (angle > m_phix[bin + 1]) {
bin++;
}
- if ((bin >= 0)and(bin < nbinphi)) {
+ if ((bin >= 0)and(bin < s_nbinphi)) {
if (nrows == 1) {
- errphi = calerrphi[bin][0];
+ errphi = m_calerrphi[bin][0];
} else if (nrows == 2) {
- errphi = calerrphi[bin][1];
+ errphi = m_calerrphi[bin][1];
} else {
- errphi = calerrphi[bin][2];
+ errphi = m_calerrphi[bin][2];
}
} else {
ATH_MSG_ERROR("bin out of range in line " << __LINE__ << " of PixelClusterOnTrackTool.cxx.");
@@ -588,22 +588,22 @@ InDet::PixelClusterOnTrackTool::correctDefault
erreta = m_calibSvc->getBarrelNewErrorEta(std::fabs(etatrack), nrows, ncol);
} else { // special calibration for IBL
double etaloc = std::fabs(etatrack);
- if (etaloc < etax[0] || etaloc > etax[nbineta]) {
+ if (etaloc < m_etax[0] || etaloc > m_etax[s_nbineta]) {
erreta = width.z() * TOPHAT_SIGMA;
} else {
int bin = 0;
- while (etaloc > etax[bin + 1]) {
+ while (etaloc > m_etax[bin + 1]) {
++bin;
}
- if (bin >= nbineta) {
+ if (bin >= s_nbineta) {
ATH_MSG_ERROR("bin out of range in line " << __LINE__ << " of PixelClusterOnTrackTool.cxx.");
} else {
if (ncol == bin) {
- erreta = calerreta[bin][0];
+ erreta = m_calerreta[bin][0];
} else if (ncol == bin + 1) {
- erreta = calerreta[bin][1];
+ erreta = m_calerreta[bin][1];
} else if (ncol == bin + 2) {
- erreta = calerreta[bin][2];
+ erreta = m_calerreta[bin][2];
} else {
erreta = width.z() * TOPHAT_SIGMA;
}
@@ -1029,7 +1029,7 @@ InDet::PixelClusterOnTrackTool::getErrorsTIDE_Ambi(const InDet::PixelCluster *pi
bool correctdR = false;
- std::array<float, 3> correctiondR = {0., 0., 0.};
+ std::array<float, 3> correctiondR = {{0., 0., 0.}};
if(m_applydRcorrection){
SG::ReadHandle<InDet::DRMap> mapHandle(m_dRMap);