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

removed times 2 in calculated photon center distance

Browse Source
This commit is contained in:
mazzol_a
2025-10-08 17:01:38 +02:00
parent 72a2604ca5
commit 5329be816e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/aare/Interpolator.hpp
View File

@@ -88,8 +88,8 @@ Interpolator::interpolate(const ClusterVector<ClusterType> &clusters) {
dY = 1.0; dY = 1.0;
break; break;
} }
photon.x -= m_ietax(ix, iy, ie) * 2 - dX; photon.x -= m_ietax(ix, iy, ie) - dX;
photon.y -= m_ietay(ix, iy, ie) * 2 - dY; photon.y -= m_ietay(ix, iy, ie) - dY;
photons.push_back(photon); photons.push_back(photon);
} }
} else if (clusters.cluster_size_x() == 2 || } else if (clusters.cluster_size_x() == 2 ||
@@ -114,10 +114,10 @@ Interpolator::interpolate(const ClusterVector<ClusterType> &clusters) {
auto iy = last_smaller(m_etabinsy, eta.y); auto iy = last_smaller(m_etabinsy, eta.y);
// TODO: why 2? // TODO: why 2?
photon.x -= m_ietax(ix, iy, ie) * photon.x -=
2; // eta goes between 0 and 1 but we could move the hit m_ietax(ix, iy, ie); // eta goes between 0 and 1 but we could
// anywhere in the 2x2 // move the hit anywhere in the 2x2
photon.y -= m_ietay(ix, iy, ie) * 2; photon.y -= m_ietay(ix, iy, ie);
photons.push_back(photon); photons.push_back(photon);
} }

4
python/tests/test_Interpolation.py
View File

@@ -23,8 +23,8 @@ def create_photon_hit_with_gaussian_distribution(mean, covariance_matrix, data_p
return (probability_values.reshape(X.shape)).round() #python bindings only support frame types of uint16_t return (probability_values.reshape(X.shape)).round() #python bindings only support frame types of uint16_t
def photon_hit_in_euclidean_space(cluster_center, pixels_per_superpixel, photon_hit): def photon_hit_in_euclidean_space(cluster_center, pixels_per_superpixel, photon_hit):
scaled_photon_hit_x = cluster_center - (1 - photon_hit[0][0])*0.5*pixels_per_superpixel*pixel_width scaled_photon_hit_x = cluster_center - (1 - photon_hit[0][0])*pixels_per_superpixel*pixel_width
scaled_photon_hit_y = cluster_center - (1 - photon_hit[0][1])*0.5*pixels_per_superpixel*pixel_width scaled_photon_hit_y = cluster_center - (1 - photon_hit[0][1])*pixels_per_superpixel*pixel_width
return (scaled_photon_hit_x, scaled_photon_hit_y) return (scaled_photon_hit_x, scaled_photon_hit_y)
def create_2x2cluster_from_frame(frame, pixels_per_superpixel): def create_2x2cluster_from_frame(frame, pixels_per_superpixel):