detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2026-02-19 21:38:41 +01:00
Code Issues Actions Packages Releases Activity

fixed out of bounds in test (#259)

Browse Source 
- fixed test (out of bounds access)
This commit is contained in:
mazzol_a
2025-12-19 13:15:49 +01:00
committed by GitHub
parent 7f3123d68f
commit dfb29b719f
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/aare/Interpolator.hpp
View File

@@ -169,6 +169,14 @@ Coordinate2D Interpolator::transform_eta_values(const Eta2<T> &eta) const {
auto ix = last_smaller(m_etabinsx, eta.x); auto ix = last_smaller(m_etabinsx, eta.x);
auto iy = last_smaller(m_etabinsy, eta.y); auto iy = last_smaller(m_etabinsy, eta.y);
if (static_cast<ssize_t>(ix) >= m_etabinsx.size() - 1 ||
static_cast<ssize_t>(iy) >= m_etabinsy.size() - 1 ||
static_cast<ssize_t>(ie) >= m_energy_bins.size() - 1)
throw std::runtime_error(
fmt::format("Eta values out of bounds of eta distribution: eta.x = "
"{:.4f}, eta.y = {:.4f}, energy = {:.4f}",
eta.x, eta.y, eta.sum));
// TODO: bilinear interpolation only works if all bins have a size > 1 - // TODO: bilinear interpolation only works if all bins have a size > 1 -
// otherwise bilinear interpolation with zero values which skew the // otherwise bilinear interpolation with zero values which skew the
// results // results

6
src/Interpolation.test.cpp
View File

@@ -11,9 +11,9 @@ using namespace aare;
TEST_CASE("Test new Interpolation API", "[Interpolation]") { TEST_CASE("Test new Interpolation API", "[Interpolation]") {
NDArray<double, 1> energy_bins(std::array<ssize_t, 1>{2}); NDArray<double, 1> energy_bins(std::array<double, 2>{0.0, 100.0});
NDArray<double, 1> etax_bins(std::array<ssize_t, 1>{4}, 0.0); NDArray<double, 1> etax_bins(std::array<double, 4>{0.0, 0.3, 0.6, 1.0});
NDArray<double, 1> etay_bins(std::array<ssize_t, 1>{4}, 0.0); NDArray<double, 1> etay_bins(std::array<double, 4>{0.0, 0.3, 0.6, 1.0});
NDArray<double, 3> eta_distribution(std::array<ssize_t, 3>{3, 3, 1}, 0.0); NDArray<double, 3> eta_distribution(std::array<ssize_t, 3>{3, 3, 1}, 0.0);
Interpolator interpolator(eta_distribution.view(), etax_bins.view(), Interpolator interpolator(eta_distribution.view(), etax_bins.view(),