From 4e4b0e3010a9897bfdfefdf739251c0077520138 Mon Sep 17 00:00:00 2001
From: Martin Teichmann <martin.teichmann@xfel.eu>
Date: Thu, 22 Dec 2022 14:29:05 +0100
Subject: [PATCH] fix integration with dark images
---
src/toolbox_scs/detectors/hrixs.py | 2 +-
src/toolbox_scs/test/test_hrixs.py | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/toolbox_scs/detectors/hrixs.py b/src/toolbox_scs/detectors/hrixs.py
index 5148c07..24f87bc 100644
--- a/src/toolbox_scs/detectors/hrixs.py
+++ b/src/toolbox_scs/detectors/hrixs.py
@@ -432,7 +432,7 @@ class hRIXS:
margin = 10
ret = np.zeros((len(data["hRIXS_det"]), bins - 2 * margin))
if self.USE_DARK:
- dark_image = self.dark_image[self.X_RANGE, self.Y_RANGE]
+ dark_image = self.dark_image.values[self.X_RANGE, self.Y_RANGE]
images = data["hRIXS_det"].values[:, self.X_RANGE, self.Y_RANGE]
x, y = np.ogrid[:images.shape[1], :images.shape[2]]
diff --git a/src/toolbox_scs/test/test_hrixs.py b/src/toolbox_scs/test/test_hrixs.py
index 59eed1b..1b5957d 100644
--- a/src/toolbox_scs/test/test_hrixs.py
+++ b/src/toolbox_scs/test/test_hrixs.py
@@ -22,6 +22,12 @@ class TestHRIXS(unittest.TestCase):
28517.704705882363)
self.assertEqual(data['spectrum'][1, 50].coords['energy'], 90)
+ h.dark_image = xa.DataArray(np.ones((100, 200)), dims=('x', 'y'))
+ h.USE_DARK = True
+ h.integrate(data)
+ self.assertEqual(data['spectrum'][1, 50].values[()],
+ 28516.704705882363)
+
def test_centroid(self):
data = xa.Dataset()
img = np.array([
--
GitLab