Skip to content
Snippets Groups Projects
Commit 7eecbd4c authored by Maximilian Emanuel Goblirsch-Kolb's avatar Maximilian Emanuel Goblirsch-Kolb
Browse files

more consistent use of [] vs .at for arrays of 'known-safe' size

parent 19215ab0
No related branches found
No related tags found
No related merge requests found
...@@ -337,7 +337,7 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad ...@@ -337,7 +337,7 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad
/// the first position from the left side /// the first position from the left side
int n0 = 0; int n0 = 0;
for (; n0!=static_cast<int>(layer[0].size()); ++n0) { for (; n0!=static_cast<int>(layer[0].size()); ++n0) {
if (par_startingPoint[2] > layer[0].at(n0).z()) break; if (par_startingPoint[2] > layer[0][n0].z()) break;
} }
/// check the barrel layers /// check the barrel layers
...@@ -345,13 +345,13 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad ...@@ -345,13 +345,13 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad
/// the first position in the radial direction /// the first position in the radial direction
int n1 = 0; int n1 = 0;
for (; n1!=static_cast<int>(layer[1].size()); ++n1) { for (; n1!=static_cast<int>(layer[1].size()); ++n1) {
if (par_startingPoint[3] < layer[1].at(n1).r()) break; if (par_startingPoint[3] < layer[1][n1].r()) break;
} }
/// and finally, the left endcap. /// and finally, the left endcap.
/// this time, look for the layer closest on the right side. /// this time, look for the layer closest on the right side.
int n2 = 0; int n2 = 0;
for (; n2!=static_cast<int>(layer[2].size()); ++n2) { for (; n2!=static_cast<int>(layer[2].size()); ++n2) {
if (par_startingPoint[2] < layer[2].at(n2).z()) break; if (par_startingPoint[2] < layer[2][n2].z()) break;
} }
...@@ -433,19 +433,19 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad ...@@ -433,19 +433,19 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad
/// loop over all barrel layers (starting with the closest one previously identified) /// loop over all barrel layers (starting with the closest one previously identified)
for (; n1<static_cast<int>(layer[1].size()); ++n1) { for (; n1<static_cast<int>(layer[1].size()); ++n1) {
/// stop if we moved past the targer point in R /// stop if we moved past the targer point in R
if (par_targetPoint[3] < layer[1].at(n1).r()) break; if (par_targetPoint[3] < layer[1][n1].r()) break;
assert( roadMakerData.elementUsageTracker.at(1).size() > static_cast<unsigned int>(n1) ); assert( roadMakerData.elementUsageTracker[1].size() > static_cast<unsigned int>(n1) );
/// collect all compatible detector elements from the current layer /// collect all compatible detector elements from the current layer
layer[1].at(n1).getBarrelDetElements(par_startingPoint, searchDirection, lDE, roadMakerData.elementUsageTracker[1][n1]); layer[1][n1].getBarrelDetElements(par_startingPoint, searchDirection, lDE, roadMakerData.elementUsageTracker[1][n1]);
} }
/// if we are moving inward in R, iterate the other way for the barrel /// if we are moving inward in R, iterate the other way for the barrel
} else { } else {
for (--n1; n1>=0; --n1) { for (--n1; n1>=0; --n1) {
/// stop if we moved past the test point in R /// stop if we moved past the test point in R
if (par_targetPoint[3] > layer[1].at(n1).r()+dr) break; if (par_targetPoint[3] > layer[1][n1].r()+dr) break;
assert( roadMakerData.elementUsageTracker.at(1).size() > static_cast<unsigned int>(n1) ); assert( roadMakerData.elementUsageTracker[1].size() > static_cast<unsigned int>(n1) );
/// collect all compatible detector elements /// collect all compatible detector elements
layer[1].at(n1).getBarrelDetElements(par_startingPoint, searchDirection, lDE, roadMakerData.elementUsageTracker[1][n1]); layer[1][n1].getBarrelDetElements(par_startingPoint, searchDirection, lDE, roadMakerData.elementUsageTracker[1][n1]);
} }
++n1; ++n1;
} }
...@@ -454,17 +454,17 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad ...@@ -454,17 +454,17 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad
/// again check if we are moving forward or back in z /// again check if we are moving forward or back in z
if (par_targetPoint[2]>par_startingPoint[2]) { if (par_targetPoint[2]>par_startingPoint[2]) {
for (; n2<static_cast<int>(layer[2].size()); ++n2) { for (; n2<static_cast<int>(layer[2].size()); ++n2) {
if (par_targetPoint[2] < layer[2].at(n2).z()) break; if (par_targetPoint[2] < layer[2][n2].z()) break;
assert( roadMakerData.elementUsageTracker.at(2).size() > static_cast<unsigned int>(n2) ); assert( roadMakerData.elementUsageTracker[2].size() > static_cast<unsigned int>(n2) );
/// collect all compatible detector elements /// collect all compatible detector elements
layer[2].at(n2).getEndcapDetElements(par_startingPoint, searchDirection, lDE,roadMakerData.elementUsageTracker[2][n2]); layer[2][n2].getEndcapDetElements(par_startingPoint, searchDirection, lDE,roadMakerData.elementUsageTracker[2][n2]);
} }
} else { } else {
for (--n2; n2>=0; --n2) { for (--n2; n2>=0; --n2) {
if (par_targetPoint[2] > layer[2].at(n2).z()) break; if (par_targetPoint[2] > layer[2][n2].z()) break;
assert( roadMakerData.elementUsageTracker.at(2).size() > static_cast<unsigned int>(n2) ); assert( roadMakerData.elementUsageTracker[2].size() > static_cast<unsigned int>(n2) );
/// collect all compatible detector elements /// collect all compatible detector elements
layer[2].at(n2).getEndcapDetElements(par_startingPoint, searchDirection, lDE, roadMakerData.elementUsageTracker[2][n2]); layer[2][n2].getEndcapDetElements(par_startingPoint, searchDirection, lDE, roadMakerData.elementUsageTracker[2][n2]);
} }
++n2; ++n2;
} }
...@@ -473,17 +473,17 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad ...@@ -473,17 +473,17 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad
/// same game as above /// same game as above
if (par_targetPoint[2]<par_startingPoint[2]) { if (par_targetPoint[2]<par_startingPoint[2]) {
for (; n0<static_cast<int>(layer[0].size()); ++n0) { for (; n0<static_cast<int>(layer[0].size()); ++n0) {
if (par_targetPoint[2] > layer[0].at(n0).z()) break; if (par_targetPoint[2] > layer[0][n0].z()) break;
assert( roadMakerData.elementUsageTracker.at(0).size() > static_cast<unsigned int>(n0) ); assert( roadMakerData.elementUsageTracker[0].size() > static_cast<unsigned int>(n0) );
/// collect all compatible detector elements /// collect all compatible detector elements
layer[0].at(n0).getEndcapDetElements(par_startingPoint, searchDirection, lDE,roadMakerData.elementUsageTracker[0][n0]); layer[0][n0].getEndcapDetElements(par_startingPoint, searchDirection, lDE,roadMakerData.elementUsageTracker[0][n0]);
} }
} else { } else {
for (--n0; n0>=0; --n0) { for (--n0; n0>=0; --n0) {
if (par_targetPoint[2] < layer[0].at(n0).z()) break; if (par_targetPoint[2] < layer[0][n0].z()) break;
assert( roadMakerData.elementUsageTracker.at(0).size() > static_cast<unsigned int>(n0) ); assert( roadMakerData.elementUsageTracker[0].size() > static_cast<unsigned int>(n0) );
/// collect all compatible detector elements /// collect all compatible detector elements
layer[0].at(n0).getEndcapDetElements(par_startingPoint, searchDirection, lDE,roadMakerData.elementUsageTracker[0][n0]); layer[0][n0].getEndcapDetElements(par_startingPoint, searchDirection, lDE,roadMakerData.elementUsageTracker[0][n0]);
} }
++n0; ++n0;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment