Merge pull request #28048 from felicepantaleo/fix_clamp_range

HGCal - bugfix: Fix clamp range in tiling
cms-sw · Sep 24, 2019 · fb2f181 · fb2f181
2 parents f748de7 + afc3517
commit fb2f181
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/DataFormats/HGCalReco/interface/TICLLayerTile.h b/DataFormats/HGCalReco/interface/TICLLayerTile.h
@@ -18,7 +18,7 @@ class TICLLayerTile {
     static_assert(etaRange >= 0.f);
     float r = ticl::constants::nEtaBins / etaRange;
     int etaBin = (std::abs(eta) - ticl::constants::minEta) * r;
-    etaBin = std::clamp(etaBin, 0, ticl::constants::nEtaBins);
+    etaBin = std::clamp(etaBin, 0, ticl::constants::nEtaBins - 1);
     return etaBin;
   }
 

diff --git a/RecoLocalCalo/HGCalRecProducers/interface/HGCalLayerTiles.h b/RecoLocalCalo/HGCalRecProducers/interface/HGCalLayerTiles.h
@@ -41,7 +41,7 @@ class HGCalLayerTiles {
     static_assert(xRange >= 0.);
     constexpr float r = hgcaltilesconstants::nColumns / xRange;
     int xBin = (x - hgcaltilesconstants::minX) * r;
-    xBin = std::clamp(xBin, 0, hgcaltilesconstants::nColumns);
+    xBin = std::clamp(xBin, 0, hgcaltilesconstants::nColumns - 1);
     return xBin;
   }
 
@@ -50,7 +50,7 @@ class HGCalLayerTiles {
     static_assert(yRange >= 0.);
     constexpr float r = hgcaltilesconstants::nRows / yRange;
     int yBin = (y - hgcaltilesconstants::minY) * r;
-    yBin = std::clamp(yBin, 0, hgcaltilesconstants::nRows);
+    yBin = std::clamp(yBin, 0, hgcaltilesconstants::nRows - 1);
     return yBin;
   }
 
@@ -59,7 +59,7 @@ class HGCalLayerTiles {
     static_assert(etaRange >= 0.);
     constexpr float r = hgcaltilesconstants::nColumnsEta / etaRange;
     int etaBin = (eta - hgcaltilesconstants::minEta) * r;
-    etaBin = std::clamp(etaBin, 0, hgcaltilesconstants::nColumnsEta);
+    etaBin = std::clamp(etaBin, 0, hgcaltilesconstants::nColumnsEta - 1);
     return etaBin;
   }
 
@@ -68,7 +68,7 @@ class HGCalLayerTiles {
     static_assert(phiRange >= 0.);
     constexpr float r = hgcaltilesconstants::nRowsPhi / phiRange;
     int phiBin = (phi - hgcaltilesconstants::minPhi) * r;
-    phiBin = std::clamp(phiBin, 0, hgcaltilesconstants::nRowsPhi);
+    phiBin = std::clamp(phiBin, 0, hgcaltilesconstants::nRowsPhi - 1);
     return phiBin;
   }