From 22796267e63c5fd48dd33db66f30fed393085e5a Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Mon, 17 Apr 2017 20:37:32 +0200
Subject: [PATCH] SiSpacePointsSeedTool_xk: Fix gcc6 warnings.
gcc6 warnings: misleading indentation.
---
.../src/SiSpacePointsSeedMaker_ATLxk.cxx | 19 ++++++++++-----
.../src/SiSpacePointsSeedMaker_BeamGas.cxx | 15 ++++++++----
.../src/SiSpacePointsSeedMaker_Cosmic.cxx | 12 ++++++----
.../src/SiSpacePointsSeedMaker_HeavyIon.cxx | 21 ++++++++++------
.../src/SiSpacePointsSeedMaker_ITK.cxx | 18 +++++++++-----
.../SiSpacePointsSeedMaker_LowMomentum.cxx | 18 +++++++++-----
.../src/SiSpacePointsSeedMaker_Trigger.cxx | 24 ++++++++++++-------
7 files changed, 85 insertions(+), 42 deletions(-)
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
index 3d9fef9d596..4aa19bbbee4 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
@@ -687,7 +687,8 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::findVSp (const std::list<Trk::Vertex>&
MsgStream& InDet::SiSpacePointsSeedMaker_ATLxk::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -1202,7 +1203,9 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::fillLists()
for(int i=m_r_first; i!=m_r_size; ++i) {
- if(!m_r_map[i]) continue; r = m_r_Sorted[i].begin(); re = m_r_Sorted[i].end();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin(); re = m_r_Sorted[i].end();
+
if(!ir0) ir0 = i;
if( m_iteration) {
@@ -1320,7 +1323,8 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production2Sp()
float X = (*r0)->x();
float Y = (*r0)->y();
float R = (*r0)->radius();
- if(R<m_r2minv) continue; if(R>m_r2maxv) break;
+ if(R<m_r2minv) continue;
+ if(R>m_r2maxv) break;
float Z = (*r0)->z();
float ax = X/R;
float ay = Y/R;
@@ -1339,9 +1343,11 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production2Sp()
for(; r!=re; ++r) {
float Rb =(*r)->radius();
- if(Rb<m_r1minv) continue; if(Rb>m_r1maxv) break;
+ if(Rb<m_r1minv) continue;
+ if(Rb>m_r1maxv) break;
float dR = R-Rb;
- if(dR<m_drminv) break; if(dR>m_drmax) continue;
+ if(dR<m_drminv) break;
+ if(dR>m_drmax) continue;
float dZ = Z-(*r)->z();
float Tz = dZ/dR; if(Tz<m_dzdrmin || Tz>m_dzdrmax) continue;
float Zo = Z-R*Tz;
@@ -1363,7 +1369,8 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production2Sp()
float UR = Ut*R+1. ; if(UR == 0.) continue;
float A = Vt*R/UR ;
float B = Vt-A*Ut ;
- if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue; ++nseed;
+ if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue;
+ ++nseed;
newSeed((*r),(*r0),Zo);
}
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
index b6205781b3d..97475700836 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
@@ -216,7 +216,8 @@ StatusCode InDet::SiSpacePointsSeedMaker_BeamGas::finalize()
void InDet::SiSpacePointsSeedMaker_BeamGas::newEvent (int)
{
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
double f[3], gP[3] ={10.,10.,0.};
@@ -328,7 +329,8 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newRegion
(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT)
{
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
double f[3], gP[3] ={10.,10.,0.};
@@ -522,7 +524,8 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::findVSp (const std::list<Trk::Vertex
MsgStream& InDet::SiSpacePointsSeedMaker_BeamGas::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -925,7 +928,8 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::fillLists()
for(int i=0; i!= m_r_size; ++i) {
- if(!m_r_map[i]) continue; r = m_r_Sorted[i].begin();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin();
while(r!=m_r_Sorted[i].end()) {
@@ -1098,7 +1102,8 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::production3Sp
}
}
breakb:
- if(!Nb || Nb==m_maxsizeSP) continue; int Nt = Nb;
+ if(!Nb || Nb==m_maxsizeSP) continue;
+ int Nt = Nb;
// Top links production
//
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
index 896a2844f6b..2823afe3abd 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
@@ -289,7 +289,8 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newRegion
(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT)
{
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
m_i_spforseed = m_l_spforseed.begin();
float irstep = 1./m_r_rstep;
@@ -765,7 +766,8 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::fillLists()
for(int i=0; i!= m_r_size; ++i) {
- if(!m_r_map[i]) continue; r = m_r_Sorted[i].begin();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin();
while(r!=m_r_Sorted[i].end()) {
@@ -998,7 +1000,8 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::production3Sp
}
breakb:
- if(!Nb || Nb==m_maxsizeSP) continue; int Nt = Nb;
+ if(!Nb || Nb==m_maxsizeSP) continue;
+ int Nt = Nb;
// Top links production
//
@@ -1129,7 +1132,8 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::production3SpWithoutField
}
breakb:
- if(!Nb || Nb==m_maxsizeSP) continue; int Nt = Nb;
+ if(!Nb || Nb==m_maxsizeSP) continue;
+ int Nt = Nb;
// Top links production
//
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
index 78db556995b..6aac6b169c7 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
@@ -210,7 +210,8 @@ StatusCode InDet::SiSpacePointsSeedMaker_HeavyIon::finalize()
void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent (int)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
double f[3], gP[3] ={10.,10.,0.};
@@ -296,7 +297,8 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
@@ -993,7 +995,8 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::fillLists()
for(int i=0; i!= m_r_size; ++i) {
- if(!m_r_map[i]) continue; r = m_r_Sorted[i].begin();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin();
while(r!=m_r_Sorted[i].end()) {
@@ -1095,7 +1098,8 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp()
float X = (*r0)->x();
float Y = (*r0)->y();
float R = (*r0)->radius();
- if(R<m_r2minv) continue; if(R>m_r2maxv) break;
+ if(R<m_r2minv) continue;
+ if(R>m_r2maxv) break;
float Z = (*r0)->z();
float ax = X/R;
float ay = Y/R;
@@ -1114,9 +1118,11 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp()
for(; r!=re; ++r) {
float Rb =(*r)->radius();
- if(Rb<m_r1minv) continue; if(Rb>m_r1maxv) break;
+ if(Rb<m_r1minv) continue;
+ if(Rb>m_r1maxv) break;
float dR = R-Rb;
- if(dR<m_drminv) break; if(dR>m_drmax) continue;
+ if(dR<m_drminv) break;
+ if(dR>m_drmax) continue;
float dZ = Z-(*r)->z();
float Tz = dZ/dR; if(Tz<m_dzdrmin || Tz>m_dzdrmax) continue;
float Zo = Z-R*Tz;
@@ -1138,7 +1144,8 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp()
float UR = Ut*R+1. ; if(UR == 0.) continue;
float A = Vt*R/UR ;
float B = Vt-A*Ut ;
- if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue; ++nseed;
+ if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue;
+ ++nseed;
newSeed((*r)->spacepoint,(*r0)->spacepoint,Zo);
}
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
index d13678b3e36..a5581cb4fb8 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
@@ -655,7 +655,8 @@ void InDet::SiSpacePointsSeedMaker_ITK::findVSp (const std::list<Trk::Vertex>& l
MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -1209,7 +1210,8 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillLists()
for(int i=m_r_first; i!=m_r_size; ++i) {
- if(!m_r_map[i]) continue; r = m_r_Sorted[i].begin(); re = m_r_Sorted[i].end();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin(); re = m_r_Sorted[i].end();
if(!ir0) ir0 = i;
if(m_iteration && (*r)->spacepoint->clusterList().second) break;
@@ -1320,7 +1322,8 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp()
float X = (*r0)->x();
float Y = (*r0)->y();
float R = (*r0)->radius();
- if(R<m_r2minv) continue; if(R>m_r2maxv) break;
+ if(R<m_r2minv) continue;
+ if(R>m_r2maxv) break;
float Z = (*r0)->z();
float ax = X/R;
float ay = Y/R;
@@ -1339,9 +1342,11 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp()
for(; r!=re; ++r) {
float Rb =(*r)->radius();
- if(Rb<m_r1minv) continue; if(Rb>m_r1maxv) break;
+ if(Rb<m_r1minv) continue;
+ if(Rb>m_r1maxv) break;
float dR = R-Rb;
- if(dR<m_drminv) break; if(dR>m_drmax) continue;
+ if(dR<m_drminv) break;
+ if(dR>m_drmax) continue;
float dZ = Z-(*r)->z();
float Tz = dZ/dR; if(Tz<m_dzdrmin || Tz>m_dzdrmax) continue;
float Zo = Z-R*Tz;
@@ -1363,7 +1368,8 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp()
float UR = Ut*R+1. ; if(UR == 0.) continue;
float A = Vt*R/UR ;
float B = Vt-A*Ut ;
- if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue; ++nseed;
+ if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue;
+ ++nseed;
newSeed((*r),(*r0),Zo);
}
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
index 2e2c7cc39b0..479662bd8f1 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
@@ -220,7 +220,8 @@ StatusCode InDet::SiSpacePointsSeedMaker_LowMomentum::finalize()
void InDet::SiSpacePointsSeedMaker_LowMomentum::newEvent (int)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
m_i_spforseed = m_l_spforseed.begin();
buildBeamFrameWork();
@@ -302,7 +303,8 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newRegion
(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
m_i_spforseed = m_l_spforseed.begin();
buildBeamFrameWork();
@@ -494,7 +496,8 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::findVSp (const std::list<Trk::Ve
MsgStream& InDet::SiSpacePointsSeedMaker_LowMomentum::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -939,7 +942,8 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::fillLists()
for(int i=0; i!= m_r_size; ++i) {
- if(!m_r_map[i]) continue; r = m_r_Sorted[i].begin();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin();
while(r!=m_r_Sorted[i].end()) {
@@ -1032,7 +1036,8 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::production3Sp()
for(; z!=11; ++z) {
- int a = f *11+ZI[z]; if(!m_rfz_map[a]) continue;
+ int a = f *11+ZI[z];
+ if(!m_rfz_map[a]) continue;
int NB = 0, NT = 0;
for(int i=0; i!=m_rfz_b[a]; ++i) {
@@ -1116,7 +1121,8 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::production3Sp
}
}
breakb:
- if(!Nb || Nb==m_maxsizeSP) continue; int Nt = Nb;
+ if(!Nb || Nb==m_maxsizeSP) continue;
+ int Nt = Nb;
// Top links production
//
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
index aefda1caf4b..2ed490f22fe 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
@@ -212,7 +212,8 @@ StatusCode InDet::SiSpacePointsSeedMaker_Trigger::finalize()
void InDet::SiSpacePointsSeedMaker_Trigger::newEvent (int)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
double f[3], gP[3] ={10.,10.,0.};
@@ -327,7 +328,8 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newRegion
(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
@@ -549,7 +551,8 @@ void InDet::SiSpacePointsSeedMaker_Trigger::findVSp (const std::list<Trk::Vertex
MsgStream& InDet::SiSpacePointsSeedMaker_Trigger::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -1046,7 +1049,8 @@ void InDet::SiSpacePointsSeedMaker_Trigger::fillLists()
for(int i=0; i!= m_r_size; ++i) {
- if(!m_r_map[i]) continue; r = m_r_Sorted[i].begin();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin();
while(r!=m_r_Sorted[i].end()) {
@@ -1144,7 +1148,8 @@ void InDet::SiSpacePointsSeedMaker_Trigger::production2Sp()
float X = (*r0)->x();
float Y = (*r0)->y();
float R = (*r0)->radius();
- if(R<m_r2minv) continue; if(R>m_r2maxv) break;
+ if(R<m_r2minv) continue;
+ if(R>m_r2maxv) break;
float Z = (*r0)->z();
float ax = X/R;
float ay = Y/R;
@@ -1163,9 +1168,11 @@ void InDet::SiSpacePointsSeedMaker_Trigger::production2Sp()
for(; r!=re; ++r) {
float Rb =(*r)->radius();
- if(Rb<m_r1minv) continue; if(Rb>m_r1maxv) break;
+ if(Rb<m_r1minv) continue;
+ if(Rb>m_r1maxv) break;
float dR = R-Rb;
- if(dR<m_drminv) break; if(dR>m_drmax) continue;
+ if(dR<m_drminv) break;
+ if(dR>m_drmax) continue;
float dZ = Z-(*r)->z();
float Tz = dZ/dR; if(Tz<m_dzdrmin || Tz>m_dzdrmax) continue;
float Zo = Z-R*Tz;
@@ -1187,7 +1194,8 @@ void InDet::SiSpacePointsSeedMaker_Trigger::production2Sp()
float UR = Ut*R+1. ; if(UR == 0.) continue;
float A = Vt*R/UR ;
float B = Vt-A*Ut ;
- if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue; ++nseed;
+ if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue;
+ ++nseed;
newSeed((*r)->spacepoint,(*r0)->spacepoint,Zo);
}
}
--
GitLab