From bd7d6f8ed577e58c415a9c9d379e66c7c4931cbb Mon Sep 17 00:00:00 2001
From: Knut Zoch <knut.zoch@cern.ch>
Date: Wed, 20 Sep 2017 07:07:34 +0200
Subject: [PATCH] Fixed readability braces around for loops
Former-commit-id: 816f27d60a9c8f9a7194f0d1d2e16b47a19203a4
---
.../PixelMonitoring/PixelMainMon.h | 36 ++++++++++++++-----
.../PixelMonitoring/src/Clusters.cxx | 19 +++++++---
.../PixelMonitoring/src/Errors.cxx | 8 +++--
.../PixelMonitoring/src/HelperFunctions.cxx | 12 +++++--
.../PixelMonitoring/src/Hits.cxx | 3 +-
.../PixelMonitoring/src/PixelDCSMon.cxx | 3 +-
.../PixelMonitoring/src/Status.cxx | 9 +++--
7 files changed, 65 insertions(+), 25 deletions(-)
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
index c978ab16b67..ff433e3f13d 100755
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
@@ -653,15 +653,33 @@ class PixelMainMon : public ManagedMonitorToolBase {
m_fsm_status(new std::map<int, std::map<int, float>*>),
m_moduleMap(new std::map<std::string, int>){};
~moduleDcsDataHolder() {
- for (auto lbmap : *m_tempModule) delete lbmap.second;
- for (auto lbmap : *m_tempInlet) delete lbmap.second;
- for (auto lbmap : *m_tempOutlet) delete lbmap.second;
- for (auto lbmap : *m_hv_voltage) delete lbmap.second;
- for (auto lbmap : *m_lv_voltage) delete lbmap.second;
- for (auto lbmap : *m_hv_current) delete lbmap.second;
- for (auto lbmap : *m_lv_current) delete lbmap.second;
- for (auto lbmap : *m_fsm_state) delete lbmap.second;
- for (auto lbmap : *m_fsm_status) delete lbmap.second;
+ for (auto lbmap : *m_tempModule) {
+ delete lbmap.second;
+ }
+ for (auto lbmap : *m_tempInlet) {
+ delete lbmap.second;
+ }
+ for (auto lbmap : *m_tempOutlet) {
+ delete lbmap.second;
+ }
+ for (auto lbmap : *m_hv_voltage) {
+ delete lbmap.second;
+ }
+ for (auto lbmap : *m_lv_voltage) {
+ delete lbmap.second;
+ }
+ for (auto lbmap : *m_hv_current) {
+ delete lbmap.second;
+ }
+ for (auto lbmap : *m_lv_current) {
+ delete lbmap.second;
+ }
+ for (auto lbmap : *m_fsm_state) {
+ delete lbmap.second;
+ }
+ for (auto lbmap : *m_fsm_status) {
+ delete lbmap.second;
+ }
delete m_tempModule;
delete m_tempInlet;
delete m_tempOutlet;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
index 14dfaf4bf3a..ef165fe5504 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
@@ -470,13 +470,22 @@ StatusCode PixelMainMon::FillClustersMon(void) {
if (m_doModules && m_doOnTrack) {
if (m_doIBL) {
- for (int i = 0; i < 20; i++)
- for (int j = 0; j < 14; j++) m_ClusPerEventArray_lI[j][i] = 0;
+ for (int i = 0; i < 20; i++) {
+ for (int j = 0; j < 14; j++) {
+ m_ClusPerEventArray_lI[j][i] = 0;
+ }
+ }
}
for (int i = 0; i < 13; i++) {
- for (int j = 0; j < 22; j++) m_ClusPerEventArray_l0[j][i] = 0;
- for (int j = 0; j < 38; j++) m_ClusPerEventArray_l1[j][i] = 0;
- for (int j = 0; j < 52; j++) m_ClusPerEventArray_l2[j][i] = 0;
+ for (int j = 0; j < 22; j++) {
+ m_ClusPerEventArray_l0[j][i] = 0;
+ }
+ for (int j = 0; j < 38; j++) {
+ m_ClusPerEventArray_l1[j][i] = 0;
+ }
+ for (int j = 0; j < 52; j++) {
+ m_ClusPerEventArray_l2[j][i] = 0;
+ }
}
for (int j = 0; j < 3; j++) {
for (int i = 0; i < 48; i++) {
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
index 108a4bf20d7..a85bcb38e65 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
@@ -224,7 +224,9 @@ StatusCode PixelMainMon::BookRODErrorMon(void) {
if (m_doModules) {
m_errors = std::make_unique<PixelMonModules1D>(PixelMonModules1D("errors", ("Errors in module:ErrorType" + m_histTitleExt + ";Number of Errors").c_str(), 7, 0.5, 7.5));
sc = m_errors->regHist(this, (path + "/ModulesErrors").c_str(), run);
- for (int k = 0; k < 7; k++) m_errors->SetBinLabel(error_type_labels[k].second.c_str(), k + 1);
+ for (int k = 0; k < 7; k++) {
+ m_errors->SetBinLabel(error_type_labels[k].second.c_str(), k + 1);
+ }
}
if (m_do2DMaps && !m_doOnline) {
@@ -562,7 +564,9 @@ StatusCode PixelMainMon::FillRODErrorMon(void) {
} // end loop over all identifiers
double total_errors = 0;
- for (int i = 0; i < PixLayerIBL2D3D::COUNT; i++) total_errors += num_errors[i];
+ for (int i = 0; i < PixLayerIBL2D3D::COUNT; i++) {
+ total_errors += num_errors[i];
+ }
if (m_error_time1 && m_error_time2 && m_error_time3) {
FillTimeHisto(total_errors, m_error_time1, m_error_time2, m_error_time3, 10., 60., 360.);
}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx
index 45ffde6dedf..ddecaf72b94 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/HelperFunctions.cxx
@@ -294,9 +294,15 @@ void PixelMainMon::FillSummaryHistos(PixelMon2DMapsLW* occupancy, TH1F_LW* A, TH
}
}
for (int etaIndex = 1; etaIndex <= 13; etaIndex++) {
- for (int phiIndex = 1; phiIndex <= 22; phiIndex++) B0->Fill(occupancy->B0->GetBinContent(etaIndex, phiIndex) / events);
- for (int phiIndex = 1; phiIndex <= 38; phiIndex++) B1->Fill(occupancy->B1->GetBinContent(etaIndex, phiIndex) / events);
- for (int phiIndex = 1; phiIndex <= 52; phiIndex++) B2->Fill(occupancy->B2->GetBinContent(etaIndex, phiIndex) / events);
+ for (int phiIndex = 1; phiIndex <= 22; phiIndex++) {
+ B0->Fill(occupancy->B0->GetBinContent(etaIndex, phiIndex) / events);
+ }
+ for (int phiIndex = 1; phiIndex <= 38; phiIndex++) {
+ B1->Fill(occupancy->B1->GetBinContent(etaIndex, phiIndex) / events);
+ }
+ for (int phiIndex = 1; phiIndex <= 52; phiIndex++) {
+ B2->Fill(occupancy->B2->GetBinContent(etaIndex, phiIndex) / events);
+ }
}
for (int etaIndex = 1; etaIndex <= 3; etaIndex++) {
for (int phiIndex = 1; phiIndex <= 48; phiIndex++) {
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
index a86fcc65436..0b40fce554c 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
@@ -681,8 +681,9 @@ StatusCode PixelMainMon::FillHitsMon(void) // Called once per event
if (nGoodChannels_total > 0) avgocc = nhits / nGoodChannels_total;
if (m_avgocc_per_lumi) m_avgocc_per_lumi->Fill(m_manager->lumiBlockNumber(), avgocc);
if (m_doOfflineAnalysis) {
- for (int i = 0; i < PixLayerIBL2D3D::COUNT; i++)
+ for (int i = 0; i < PixLayerIBL2D3D::COUNT; i++) {
if (m_avgocc_per_bcid_per_lumi_mod[i]) m_avgocc_per_bcid_per_lumi_mod[i]->Fill(m_manager->lumiBlockNumber(), pix_rod_bcid, avgocc_mod[i]);
+ }
}
for (int i = 0; i < PixLayerIBL2D3D::COUNT; i++) {
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
index 46e1529e2bc..42f250523eb 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelDCSMon.cxx
@@ -544,8 +544,7 @@ StatusCode PixelMainMon::FillPixelDCSMon(void) {
atrlistcol = atrlistcol_fsmstatus;
}
if (sc == StatusCode::SUCCESS) {
- for (CondAttrListCollection::const_iterator citr = atrlistcol->begin();
- citr != atrlistcol->end(); ++citr) {
+ for (CondAttrListCollection::const_iterator citr = atrlistcol->begin(); citr != atrlistcol->end(); ++citr) {
// the following code dumps the attribute list into a string for printing
// to access individual elements by name, use e.g.
// float var1=(((*citr).second)["T04"]).data<float>();
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
index 58801aae153..08f70e55e85 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
@@ -214,12 +214,15 @@ StatusCode PixelMainMon::ProcStatusMon(void) {
}
}
for (int i = 1; i <= 13; i++) {
- for (int j = 1; j <= 22; j++)
+ for (int j = 1; j <= 22; j++) {
m_dqStatus->B0->SetBinContent(i, j, m_occupancy->B0->GetBinContent(i, j) + m_status->B0->GetBinContent(i, j));
- for (int j = 1; j <= 38; j++)
+ }
+ for (int j = 1; j <= 38; j++) {
m_dqStatus->B1->SetBinContent(i, j, m_occupancy->B1->GetBinContent(i, j) + m_status->B1->GetBinContent(i, j));
- for (int j = 1; j <= 52; j++)
+ }
+ for (int j = 1; j <= 52; j++) {
m_dqStatus->B2->SetBinContent(i, j, m_occupancy->B2->GetBinContent(i, j) + m_status->B2->GetBinContent(i, j));
+ }
}
for (int i = 1; i <= 48; i++) {
for (int j = 1; j <= 3; j++) {
--
GitLab