fix and test getBin

XzzX · Feb 18, 2025 · a059fd4 · a059fd4
1 parent 48e7851
commit a059fd4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/mrmd/data/MultiHistogram.hpp b/mrmd/data/MultiHistogram.hpp
@@ -56,7 +56,7 @@ struct MultiHistogram
      */
     KOKKOS_INLINE_FUNCTION idx_t getBin(const real_t& val) const
     {
-        auto bin = idx_c((val - min) * inverseBinSize);
+        auto bin = idx_c(std::floor((val - min) * inverseBinSize));
         if (bin < 0) bin = -1;
         if (bin >= numBins) bin = -1;
         return bin;

diff --git a/mrmd/data/MultiHistogram.test.cpp b/mrmd/data/MultiHistogram.test.cpp
@@ -21,6 +21,15 @@ namespace mrmd
 namespace data
 {
 
+TEST(MultiHistogram, getBin)
+{
+    MultiHistogram histogram("histogram", 0_r, 10_r, 10, 2);
+    EXPECT_EQ(histogram.getBin(-0.5_r), -1);
+    EXPECT_EQ(histogram.getBin(0.5_r), 0);
+    EXPECT_EQ(histogram.getBin(5.5_r), 5);
+    EXPECT_EQ(histogram.getBin(10.5_r), -1);
+}
+
 TEST(MultiHistogram, getBinPosition)
 {
     MultiHistogram histogram("histogram", 0_r, 10_r, 10, 2);