From 25d88643bd339b5cd5a70b817c50c37a0b91a657 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Wed, 18 Mar 2015 15:33:45 +0000
Subject: [PATCH] Segmentation: Add functions to work on vectors of
cellBoundaries instead of uniform cellSizes
Treatment of edge cases (see comments in the code as well)
If we are close to the lower bound, we assume it is in the bottom
Include upper boundary to the segmentation
If the value is below or above the lowest or highest, throw exception, this means the segmentation is always bound by values we give it
Need to subtract 1 from the result, because upper_bound works that way
---
.../include/DDSegmentation/Segmentation.h | 5 ++++
DDSegmentation/src/Segmentation.cpp | 28 +++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/DDSegmentation/include/DDSegmentation/Segmentation.h b/DDSegmentation/include/DDSegmentation/Segmentation.h
index b20b462ff..68de568d6 100644
--- a/DDSegmentation/include/DDSegmentation/Segmentation.h
+++ b/DDSegmentation/include/DDSegmentation/Segmentation.h
@@ -133,6 +133,11 @@ protected:
/// Helper method to convert a 1D position to a cell ID
static int positionToBin(double position, double cellSize, double offset = 0.);
+ /// Helper method to convert a bin number to a 1D position given a vector of binBoundaries
+ static double binToPosition(CellID bin, std::vector<double> const& cellBoundaries, double offset = 0.);
+ /// Helper method to convert a 1D position to a cell ID given a vector of binBoundaries
+ static int positionToBin(double position, std::vector<double> const& cellBoundaries, double offset = 0.);
+
/// The segmentation name
std::string _name;
/// The segmentation type
diff --git a/DDSegmentation/src/Segmentation.cpp b/DDSegmentation/src/Segmentation.cpp
index 2995828cd..8430bb59c 100644
--- a/DDSegmentation/src/Segmentation.cpp
+++ b/DDSegmentation/src/Segmentation.cpp
@@ -11,6 +11,7 @@
#include <sstream>
#include <stdexcept>
#include <cmath>
+#include <algorithm>
namespace DD4hep {
namespace DDSegmentation {
@@ -144,5 +145,32 @@ int Segmentation::positionToBin(double position, double cellSize, double offset)
return int(floor((position + 0.5 * cellSize - offset) / cellSize));
}
+/// Helper method to convert a bin number to a 1D position given a vector of binBoundaries
+double Segmentation::binToPosition(CellID bin, std::vector<double> const& cellBoundaries, double offset) {
+ return (cellBoundaries[bin+1] + cellBoundaries[bin])*0.5 + offset;
+}
+/// Helper method to convert a 1D position to a cell ID given a vector of binBoundaries
+int Segmentation::positionToBin(double position, std::vector<double> const& cellBoundaries, double offset) {
+
+ // include the lower edge to the segmentation
+ if(fabs(position - cellBoundaries.front()) < 1e-12) return 0;
+
+ // include the upper edge of the last bin to the segmentation
+ if(fabs(position - cellBoundaries.back()) < 1e-12) return int(cellBoundaries.size()-2);
+
+ // hits outside cannot be treated
+ if(position < cellBoundaries.front()) throw std::runtime_error("Hit Position is outside of segmentation");
+ if(position > cellBoundaries.back() ) throw std::runtime_error("Hit Position is outside of segmentation");
+
+
+ std::vector<double>::const_iterator bin = std::upper_bound(cellBoundaries.begin(),
+ cellBoundaries.end(),
+ position-offset);
+
+ // need to reduce found bin by one, because upper_bound works that way, lower_bound would not help
+ return bin - cellBoundaries.begin() - 1 ;
+
+}
+
} /* namespace DDSegmentation */
} /* namespace DD4hep */
--
GitLab