From c8205d05d86b2164c3334e1dfa4f0cfaad6721b2 Mon Sep 17 00:00:00 2001 From: Felice Date: Sun, 22 Sep 2019 11:15:45 +0200 Subject: [PATCH 1/3] Fix std::clamp range --- DataFormats/HGCalReco/interface/TICLLayerTile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DataFormats/HGCalReco/interface/TICLLayerTile.h b/DataFormats/HGCalReco/interface/TICLLayerTile.h index 58eb16acb2770..a335398c8aa1f 100644 --- 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; } From d7183326164a24a1be0a54d689bf6a8c17202fb1 Mon Sep 17 00:00:00 2001 From: Felice Date: Sun, 22 Sep 2019 11:15:54 +0200 Subject: [PATCH 2/3] Fix std::clamp range --- .../HGCalRecProducers/interface/HGCalLayerTiles.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RecoLocalCalo/HGCalRecProducers/interface/HGCalLayerTiles.h b/RecoLocalCalo/HGCalRecProducers/interface/HGCalLayerTiles.h index 2a66d0f463a58..fac067df7a76d 100644 --- 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; } From afc35175c42387914c2923ee3361e46fe84af9bb Mon Sep 17 00:00:00 2001 From: Felice Date: Sun, 22 Sep 2019 11:19:03 +0200 Subject: [PATCH 3/3] Apply clang code format --- DataFormats/HGCalReco/interface/TICLLayerTile.h | 2 +- .../HGCalRecProducers/interface/HGCalLayerTiles.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DataFormats/HGCalReco/interface/TICLLayerTile.h b/DataFormats/HGCalReco/interface/TICLLayerTile.h index a335398c8aa1f..9ea7e99c529f4 100644 --- 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-1); + 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 index fac067df7a76d..efceee5477998 100644 --- 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-1); + 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-1); + 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-1); + 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-1); + phiBin = std::clamp(phiBin, 0, hgcaltilesconstants::nRowsPhi - 1); return phiBin; }