diff --git a/src/toolbox_scs/detectors/hrixs.py b/src/toolbox_scs/detectors/hrixs.py index 8af3c81370d39ff6d661f644dba4c517e1d84561..28d3d88fd049fb6034194a55c2d26f08c551d5c4 100644 --- a/src/toolbox_scs/detectors/hrixs.py +++ b/src/toolbox_scs/detectors/hrixs.py @@ -371,6 +371,7 @@ class hRIXS: bins = self.BINS hit_x = [] hit_y = [] + hits = [] ret = np.zeros((len(data["hRIXS_det"]), bins)) for image, r in zip(data["hRIXS_det"], ret): use_image = image.to_numpy() @@ -395,6 +396,7 @@ class hRIXS: if return_hits: hit_x.append(rc[:, 0]) hit_y.append(rc[:, 1]) + hits.append(rc) hy, hx = np.histogram( rc[:, 0], bins=bins, @@ -405,7 +407,9 @@ class hRIXS: energy=np.linspace(self.Y_RANGE.start, self.Y_RANGE.stop, bins) * self.ENERGY_SLOPE + self.ENERGY_INTERCEPT) if return_hits: - return data.assign(xhits=(("trainId"), hit_x), yhits=(("trainId"), hit_y)) + return data.assign(hits=(("trainId"), hits), + xhits=(("trainId"), hit_x), + yhits=(("trainId"), hit_y)) else: return data.assign(spectrum=(("trainId", "energy"), ret))