diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTHitEffMonTool.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTHitEffMonTool.h
index e9811cc24bf1d12edecf8bf0af9389c920d1a894..b4dd80f1bd5cfb85887a4232d72c602192f47e5c 100755
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTHitEffMonTool.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTHitEffMonTool.h
@@ -130,8 +130,6 @@ private:
const InDetDD::SCT_DetectorManager* m_pManager;
SG::ReadHandle<TrackCollection> m_TrackName;
IChronoStatSvc * m_chrono;
- const TrackCollection * m_tracks;
- Trk::TrackSummaryTool* m_TrackSum;
const std::map < Identifier, unsigned int > * m_badChips;
ServiceHandle<MagField::IMagFieldSvc> m_fieldServiceHandle;
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTHitsNoiseMonTool.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTHitsNoiseMonTool.h
index 3c2dc9bbb68024771bb2696c1a3710da39aa74c7..22f45cdb9fd80f313bebd8fd2e60ecb30b39b716 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTHitsNoiseMonTool.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTHitsNoiseMonTool.h
@@ -498,9 +498,9 @@ class SCTHitsNoiseMonTool : public SCTMotherTrigMonTool{
Prof2_t
prof2Factory(const std::string & name, const std::string & title, const SCT_Monitoring::Bec bec, MonGroup & registry, VecProf2_t & storageVector);
Prof2_t
- prof2DFactory(const std::string & name, const std::string & title, MonGroup & registry, int nbinx, int xlo, int xhi, int nbiny, int ylo, int yhi);
+ prof2DFactory(const std::string & name, const std::string & title, MonGroup & registry, int nbinx, float xlo, float xhi, int nbiny, float ylo, float yhi);
Prof_t
- profFactory(const std::string & name, const std::string & title, MonGroup & registry, int nbin, int lo, int hi);
+ profFactory(const std::string & name, const std::string & title, MonGroup & registry, int nbin, float lo, float hi);
Prof_t
profFactory(const std::string & name, const std::string & title, MonGroup & registry);
//@}
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.cxx
index 425d73943f7e80069255eb860684119bc552f4fb..597c6e49e5bde8f610176691a6b7a73f56927ec9 100755
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.cxx
@@ -135,8 +135,6 @@ SCTHitEffMonTool::SCTHitEffMonTool(const string &type, const string &name, const
m_pManager(0),
m_TrackName(std::string("ResolvedSCTTracks")),// original track collection
m_chrono(nullptr),
- m_tracks(nullptr),// original tracks
- m_TrackSum(nullptr),
m_badChips(nullptr),
m_fieldServiceHandle("AtlasFieldSvc", name),
m_bunchCrossingTool("Trig::BunchCrossingTool/BunchCrossingTool", this),
@@ -419,25 +417,25 @@ SCTHitEffMonTool::bookHistograms() {
VERBOSE("Module " << m_sctId->wafer_hash(chip->first) << ", chip " << chip->second);
}
- std::array < MonGroup, N_REGIONS + 1 > histGroupE = {
+ std::array < MonGroup, N_REGIONS + 1 > histGroupE = {{
MonGroup(this, m_path + histogramPath[ENDCAP_C_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[BARREL_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[ENDCAP_A_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[GENERAL_INDEX], run, ATTRIB_UNMANAGED)
- };
+ }};
- std::array < MonGroup, N_REGIONS > histGroupL = {
+ std::array < MonGroup, N_REGIONS > histGroupL = {{
MonGroup(this, m_path + histogramPathRe[ENDCAP_C_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPathRe[BARREL_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPathRe[ENDCAP_A_INDEX], run, ATTRIB_UNMANAGED)
- };// 23.01.2015
+ }};// 23.01.2015
- std::array < MonGroup, N_REGIONS + 1 > histGroupShift = {
+ std::array < MonGroup, N_REGIONS + 1 > histGroupShift = {{
MonGroup(this, m_path + histogramPath[ENDCAP_C_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[BARREL_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[ENDCAP_A_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[GENERAL_INDEX], run, ATTRIB_UNMANAGED)
- };
+ }};
CHECK(bookEffHisto(m_Eff_Total, histGroupE[GENERAL_INDEX], "SctTotalEff", "SCT Total Efficiency", N_REGIONS, 0,
N_REGIONS));
@@ -500,24 +498,24 @@ SCTHitEffMonTool::bookHistograms() {
}
// Booking efficiency maps
// inefficiency plots, i.e. 1 - efficiency
- std::array < TString, N_REGIONS > mapName = {
+ std::array < TString, N_REGIONS > mapName = {{
"m_effm_", "m_eff_", "m_effp_"
- };
- std::array < TString, N_REGIONS > ineffMapName = {
+ }};
+ std::array < TString, N_REGIONS > ineffMapName = {{
"ineffm_", "ineff_", "ineffp_"
- };
- std::array < TString, N_REGIONS > effLumiName = {
+ }};
+ std::array < TString, N_REGIONS > effLumiName = {{
"m_eff_Lumi_", "eff_Lumi_", "p_eff_Lumi_"
- };// 23.01.2015
- std::array < TString, N_REGIONS > sumeff = {
+ }};// 23.01.2015
+ std::array < TString, N_REGIONS > sumeff = {{
"summaryeffm", "summaryeff", "summaryeffp"
- };
- std::array < TString, N_REGIONS > sumeffBCID = {
+ }};
+ std::array < TString, N_REGIONS > sumeffBCID = {{
"summaryeffmBCID", "summaryeffBCID", "summaryeffpBCID"
- };
- std::array < TString, N_REGIONS > sumeff_old = {
+ }};
+ std::array < TString, N_REGIONS > sumeff_old = {{
"summaryeffm_old", "summaryeff_old", "summaryeffp_old"
- };
+ }};
TString sumefftitle[3] = {
"Summary Module Efficiency in Endcap C", "Summary Module Efficiency in Barrel",
"Summary Module Efficiency in Endcap A"
@@ -526,9 +524,9 @@ SCTHitEffMonTool::bookHistograms() {
"Summary Module Efficiency in Endcap C for First BC", "Summary Module Efficiency in Barrel for First BC",
"Summary Module Efficiency in Endcap A for First BC"
};// 30.11.2014
- std::array < TString, 12 > selecName = {
+ std::array < TString, 12 > selecName = {{
"All", "Module", "nHits", "TRTPhase", "Enclosed", "Phi", "Chi2", "Face", "Guard", "Bad chip", "d0", "pT"
- };
+ }};
for (Int_t isub(0); isub != N_REGIONS; ++isub) {
for (Long_t i(0); i != n_layers[isub]; ++i) {
const int detIndex = becIdxLayer2Index(isub, i);
@@ -775,25 +773,25 @@ SCTHitEffMonTool::bookHistogramsRecurrent() {
VERBOSE("Module " << m_sctId->wafer_hash(chip->first) << ", chip " << chip->second);
}
- std::array < MonGroup, N_REGIONS + 1 > histGroupE = {
+ std::array < MonGroup, N_REGIONS + 1 > histGroupE = {{
MonGroup(this, m_path + histogramPath[ENDCAP_C_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[BARREL_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[ENDCAP_A_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[GENERAL_INDEX], run, ATTRIB_UNMANAGED)
- };
+ }};
- std::array < MonGroup, N_REGIONS > histGroupL = {
+ std::array < MonGroup, N_REGIONS > histGroupL = {{
MonGroup(this, m_path + histogramPathRe[ENDCAP_C_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPathRe[BARREL_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPathRe[ENDCAP_A_INDEX], run, ATTRIB_UNMANAGED)
- };// 23.01.2015
+ }};// 23.01.2015
- std::array < MonGroup, N_REGIONS + 1 > histGroupShift = {
+ std::array < MonGroup, N_REGIONS + 1 > histGroupShift = {{
MonGroup(this, m_path + histogramPath[ENDCAP_C_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[BARREL_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[ENDCAP_A_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[GENERAL_INDEX], run, ATTRIB_UNMANAGED)
- };
+ }};
CHECK(bookEffHisto(m_Eff_Total, histGroupE[GENERAL_INDEX], "SctTotalEff", "SCT Total Efficiency", N_REGIONS, 0,
N_REGIONS));
@@ -849,26 +847,26 @@ SCTHitEffMonTool::bookHistogramsRecurrent() {
3.2));
}
// Booking efficiency maps
- std::array < TString, N_REGIONS > mapName = {
+ std::array < TString, N_REGIONS > mapName = {{
"m_eff_", "eff_", "p_eff_"
- };
- std::array < TString, N_REGIONS > effLumiName = {
+ }};
+ std::array < TString, N_REGIONS > effLumiName = {{
"m_eff_Lumi_", "eff_Lumi_", "p_eff_Lumi_"
- };// 23.01.2015
+ }};// 23.01.2015
// inefficiency plots, i.e. 1 - efficiency
- std::array< TString, N_REGIONS > ineffMapName = {
+ std::array< TString, N_REGIONS > ineffMapName = {{
"ineffm_", "ineff_", "ineffp_"
- };
+ }};
//
- std::array < TString, N_REGIONS > sumeff = {
+ std::array < TString, N_REGIONS > sumeff = {{
"summaryeffm", "summaryeff", "summaryeffp"
- };
- std::array < TString, N_REGIONS > sumeffBCID = {
+ }};
+ std::array < TString, N_REGIONS > sumeffBCID = {{
"summaryeffmBCID", "summaryeffBCID", "summaryeffpBCID"
- };
- std::array < TString, N_REGIONS > sumeff_old = {
+ }};
+ std::array < TString, N_REGIONS > sumeff_old = {{
"summaryeffm_old", "summaryeff_old", "summaryeffp_old"
- };
+ }};
TString sumefftitle[3] = {
"Summary Module Efficiency in Endcap C", "Summary Module Efficiency in Barrel",
"Summary Module Efficiency in Endcap A"
@@ -877,9 +875,9 @@ SCTHitEffMonTool::bookHistogramsRecurrent() {
"Summary Module Efficiency in Endcap C for First BC", "Summary Module Efficiency in Barrel for First BC",
"Summary Module Efficiency in Endcap A for First BC"
};
- std::array < TString, 12 > selecName = {
+ std::array < TString, 12 > selecName = {{
"All", "Module", "nHits", "TRTPhase", "Enclosed", "Phi", "Chi2", "Face", "Guard", "Bad chip", "d0", "pT"
- };
+ }};
for (Int_t isub(0); isub != N_REGIONS; ++isub) {
for (Long_t i(0); i != n_layers[isub]; ++i) {
const int detIndex(becIdxLayer2Index(isub, i));
@@ -1925,12 +1923,12 @@ SCTHitEffMonTool::procHistograms() {
m_badChipMap->GetYaxis()->SetRangeUser(-3.4, 3.4);
}
- std::array < MonGroup, N_REGIONS + 1 > histGroupE = {
+ std::array < MonGroup, N_REGIONS + 1 > histGroupE = {{
MonGroup(this, m_path + histogramPath[ENDCAP_C_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[BARREL_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[ENDCAP_A_INDEX], run, ATTRIB_UNMANAGED),
MonGroup(this, m_path + histogramPath[GENERAL_INDEX], run, ATTRIB_UNMANAGED)
- };
+ }};
for (Int_t isub(0); isub != N_REGIONS; ++isub) {
for (Long_t i(0); i != n_layers[isub]; ++i) {
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonTool.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonTool.cxx
index c01c8a3ae9b059ef54a39eb3d8d464698a8ea3b6..21db54535289544071ad6a51f77ccd56e73b38cd 100755
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonTool.cxx
@@ -3448,7 +3448,7 @@ SCTHitsNoiseMonTool::h2IFactory(const std::string &name, const std::string &titl
SCTHitsNoiseMonTool::Prof2_t
SCTHitsNoiseMonTool::prof2DFactory(const std::string &name, const std::string &title, MonGroup ®istry, int nbinx,
- int xlo, int xhi, int nbiny, int ylo, int yhi) {
+ float xlo, float xhi, int nbiny, float ylo, float yhi) {
Prof2_t tmp = new TProfile2D(TString(name), TString(title), nbinx, xlo - 0.5, xhi + 0.5, nbiny, ylo - 0.5, yhi + 0.5);
tmp->SetXTitle("Index in the direction of #eta");
@@ -3462,7 +3462,7 @@ SCTHitsNoiseMonTool::prof2DFactory(const std::string &name, const std::string &t
SCTHitsNoiseMonTool::Prof_t
SCTHitsNoiseMonTool::profFactory(const std::string &name, const std::string &title, MonGroup ®istry, int nbin,
- int lo, int hi) {
+ float lo, float hi) {
Prof_t tmp = TProfile_LW::create(TString(name), TString(title), nbin, lo, hi);
tmp->SetXTitle("LumiBlock");
@@ -3479,9 +3479,9 @@ SCTHitsNoiseMonTool::profFactory(const std::string &name, const std::string &tit
Prof_t tmp = TProfile_LW::create(TString(name), TString(title), 3, 0, 3);
tmp->SetYTitle("Fraction of 01X");
- tmp->GetXaxis()->SetBinLabel(1.5, "Endcap C");
- tmp->GetXaxis()->SetBinLabel(2.5, "Barrel");
- tmp->GetXaxis()->SetBinLabel(3.5, "Endcap A");
+ tmp->GetXaxis()->SetBinLabel(1, "Endcap C");
+ tmp->GetXaxis()->SetBinLabel(2, "Barrel");
+ tmp->GetXaxis()->SetBinLabel(3, "Endcap A");
bool success(registry.regHist(tmp).isSuccess());
if (not success) {
msg(MSG::WARNING) << "Cannot book SCT histogram: " << name << endmsg;
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/cArrayUtilities.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/cArrayUtilities.h
index 53502cb363b7c7a61ea3582ccb53cedc6d2e2076..d94e20aaf96c556c1861c840eeb0bea1067729e8 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/cArrayUtilities.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/cArrayUtilities.h
@@ -18,14 +18,14 @@ namespace SCT_Monitoring {
// give the total size of a 3D C-style array
template<class T, int Size1, int Size2, int Size3>
int
- extent(T (&parray)[Size1][Size2][Size3]) {
+ extent(T (&/*parray*/)[Size1][Size2][Size3]) {
return Size1 * Size2 * Size3;
}
// give the total size of a 2D C-style array
template<class T, int Size1, int Size2>
int
- extent(T (&parray)[Size1][Size2]) {
+ extent(T (&/*parray*/)[Size1][Size2]) {
return Size1 * Size2;
}