diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
index 4aa19bbbee459c1b6e0f11fc22abbd60110b4f10..48ffea8083af313b4e771b19eab61c76479fa3af 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
@@ -1221,7 +1221,11 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::fillLists()
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
int z; float Z = (*r)->z();
@@ -1240,9 +1244,14 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::fillLists()
if(!m_iteration && (*r)->spacepoint->clusterList().second == 0 && z>=3 && z<=7) {
z<=4 ? z=0 : z>=6 ? z=2 : z=1;
- // Azimutla angle and Z-coordinate sort for fast vertex search
+ // Azimuthal angle and Z-coordinate sort for fast vertex search
//
- f = int(F*m_sFv); f<0 ? f+=m_fvNmax : f> m_fvNmax ? f-=m_fvNmax : f=f;
+ f = int(F*m_sFv);
+ if (f < 0)
+ f += m_fvNmax;
+ else if (f> m_fvNmax)
+ f -= m_fvNmax;
+
n = f*3+z; ++m_nsazv;
m_rfzv_Sorted[n].push_back(*r); if(!m_rfzv_map[n]++) m_rfzv_index[m_nrfzv++] = n;
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
index 974757008360a001d9cd495bc204450de00e2afb..eba5f33b85a3eba15b6b483d3b2c4175fc0d92c5 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
@@ -937,7 +937,12 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::fillLists()
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
+
m_rf_Sorted[f].push_back(*r); if(!m_rf_map[f]++) m_rf_index[m_nrf++] = f;
int z; float Z = (*r)->z();
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
index 2823afe3abd4d1ea404429ed6eaca75725d0c72f..c4675942f2db39ff9d8d494d1806d9a2c157d95c 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
@@ -775,8 +775,8 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::fillLists()
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
- f = 1;
+ //int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = 1;
m_rf_Sorted[f].push_back(*r); if(!m_rf_map[f]++) m_rf_index[m_nrf++] = f;
int z; float Z = (*r)->z();
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
index 6aac6b169c7f8b747e6fdc641b7a09fb611a9179..850df7ef91a1ee2569c321015af120f582d4bcc1 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
@@ -1004,7 +1004,11 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::fillLists()
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
int z; float Z = (*r)->z();
@@ -1022,9 +1026,13 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::fillLists()
if((*r)->spacepoint->clusterList().second == 0 && z>=3 && z<=7) {
z<=4 ? z=0 : z>=6 ? z=2 : z=1;
- // Azimutla angle and Z-coordinate sort for fast vertex search
+ // Azimuthal angle and Z-coordinate sort for fast vertex search
//
- f = int(F*m_sFv); f<0 ? f+=m_fvNmax : f> m_fvNmax ? f-=m_fvNmax : f=f;
+ f = int(F*m_sFv);
+ if (f < 0)
+ f += m_fvNmax;
+ else if (f> m_fvNmax)
+ f -= m_fvNmax;
n = f*3+z; ++m_nsazv;
m_rfzv_Sorted[n].push_back(*r); if(!m_rfzv_map[n]++) m_rfzv_index[m_nrfzv++] = n;
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
index a5581cb4fb874d3d27556d0d5667b914dd156de9..e6c2306e0388911ebe0bb26824f81183957e2a52 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
@@ -1222,7 +1222,11 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillLists()
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
int z; float Z = (*r)->z();
@@ -1241,10 +1245,15 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillLists()
if(!m_iteration && (*r)->spacepoint->clusterList().second == 0 && z>=3 && z<=7) {
z<=4 ? z=0 : z>=6 ? z=2 : z=1;
- // Azimutla angle and Z-coordinate sort for fast vertex search
+ // Azimuthal angle and Z-coordinate sort for fast vertex search
//
- f = int(F*m_sFv); f<0 ? f+=m_fvNmax : f> m_fvNmax ? f-=m_fvNmax : f=f;
- n = f*3+z; ++m_nsazv;
+ f = int(F*m_sFv);
+ if (f < 0)
+ f += m_fvNmax;
+ else if (f> m_fvNmax)
+ f -= m_fvNmax;
+
+ n = f*3+z; ++m_nsazv;
m_rfzv_Sorted[n].push_back(*r); if(!m_rfzv_map[n]++) m_rfzv_index[m_nrfzv++] = n;
}
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
index 479662bd8f1829cbcd0f1238145c3e56dd4e8aa3..5b44873edab97dfb8c5664e2d7e94e3d9d400a94 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
@@ -951,7 +951,11 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::fillLists()
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
int z; float Z = (*r)->z();
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
index 2ed490f22fea58b5a5e316bd706c571ac073e2af..de47c9b2513ec31343ed69936356cf906b83e4e6 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
@@ -1058,7 +1058,11 @@ void InDet::SiSpacePointsSeedMaker_Trigger::fillLists()
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
int z; float Z = (*r)->z();
@@ -1072,9 +1076,14 @@ void InDet::SiSpacePointsSeedMaker_Trigger::fillLists()
if((*r)->spacepoint->clusterList().second == 0 && z>=3 && z<=7) {
z<=4 ? z=0 : z>=6 ? z=2 : z=1;
- // Azimutla angle and Z-coordinate sort for fast vertex search
+ // Azimuthal angle and Z-coordinate sort for fast vertex search
//
- f = int(F*m_sFv); f<0 ? f+=m_fvNmax : f> m_fvNmax ? f-=m_fvNmax : f=f;
+ f = int(F*m_sFv);
+ if (f < 0)
+ f+=m_fvNmax;
+ else if (f> m_fvNmax)
+ f-=m_fvNmax;
+
n = f*3+z; ++m_nsazv;
m_rfzv_Sorted[n].push_back(*r); if(!m_rfzv_map[n]++) m_rfzv_index[m_nrfzv++] = n;
}