From 22f0946f6d03323c4599b712a11e19e53904c629 Mon Sep 17 00:00:00 2001 From: lauramurgatroyd Date: Fri, 5 Dec 2025 15:52:10 +0000 Subject: [PATCH 1/3] Add error message for incorrect roi request --- Wrappers/Python/cil/io/ZEISSDataReader.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Wrappers/Python/cil/io/ZEISSDataReader.py b/Wrappers/Python/cil/io/ZEISSDataReader.py index 6ec368804..767ff9071 100644 --- a/Wrappers/Python/cil/io/ZEISSDataReader.py +++ b/Wrappers/Python/cil/io/ZEISSDataReader.py @@ -133,6 +133,17 @@ def set_up(self, for key in roi.keys(): idx = zeiss_data_order[key] if roi[key] != -1: + print(roi[key]) + if key == AcquisitionDimension.ANGLE: + if roi[key][1] > default_roi[0][1]: + raise ValueError('Requested angle range {} exceeds available range [0, {}]'.format(roi[key], default_roi[0][1])) + elif key == ImageDimension.VERTICAL or key == AcquisitionDimension.VERTICAL: + if roi[key][1] > default_roi[1][1]: + raise ValueError('Requested vertical range {} exceeds available range [0, {}]'.format(roi[key], default_roi[1][1])) + elif key == ImageDimension.HORIZONTAL_X or key == ImageDimension.HORIZONTAL_Y or key == AcquisitionDimension.HORIZONTAL: + if roi[key][1] > default_roi[2][1]: + raise ValueError('Requested horizontal range {} exceeds available range [0, {}]'.format(roi[key], default_roi[2][1])) + for i, x in enumerate(roi[key]): if x is None: continue @@ -206,6 +217,7 @@ def slice_metadata(self,metadata): width_slc = range(*self._roi[2]) #These values are 0 or do not exist in TXM files and can be skipped if metadata['data geometry'] == 'acquisition': + print("The image_slc is:", image_slc) metadata['thetas'] = metadata['thetas'][image_slc] metadata['x_positions'] = metadata['x_positions'][image_slc] metadata['y_positions'] = metadata['y_positions'][image_slc] From f52aeba7dffc9d4921c851af509e16b614886119 Mon Sep 17 00:00:00 2001 From: lauramurgatroyd Date: Fri, 5 Dec 2025 15:54:42 +0000 Subject: [PATCH 2/3] remove print --- Wrappers/Python/cil/io/ZEISSDataReader.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Wrappers/Python/cil/io/ZEISSDataReader.py b/Wrappers/Python/cil/io/ZEISSDataReader.py index 767ff9071..6471748dd 100644 --- a/Wrappers/Python/cil/io/ZEISSDataReader.py +++ b/Wrappers/Python/cil/io/ZEISSDataReader.py @@ -217,7 +217,6 @@ def slice_metadata(self,metadata): width_slc = range(*self._roi[2]) #These values are 0 or do not exist in TXM files and can be skipped if metadata['data geometry'] == 'acquisition': - print("The image_slc is:", image_slc) metadata['thetas'] = metadata['thetas'][image_slc] metadata['x_positions'] = metadata['x_positions'][image_slc] metadata['y_positions'] = metadata['y_positions'][image_slc] From 6b7a0f6662378d701a01c763ab5888d135fd0a41 Mon Sep 17 00:00:00 2001 From: lauramurgatroyd Date: Tue, 16 Dec 2025 13:58:09 +0000 Subject: [PATCH 3/3] Fix sign error --- Wrappers/Python/cil/io/ZEISSDataReader.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Wrappers/Python/cil/io/ZEISSDataReader.py b/Wrappers/Python/cil/io/ZEISSDataReader.py index 6471748dd..11d89363f 100644 --- a/Wrappers/Python/cil/io/ZEISSDataReader.py +++ b/Wrappers/Python/cil/io/ZEISSDataReader.py @@ -133,23 +133,22 @@ def set_up(self, for key in roi.keys(): idx = zeiss_data_order[key] if roi[key] != -1: - print(roi[key]) if key == AcquisitionDimension.ANGLE: if roi[key][1] > default_roi[0][1]: - raise ValueError('Requested angle range {} exceeds available range [0, {}]'.format(roi[key], default_roi[0][1])) + raise ValueError('Requested angle range {} exceeds maximum of {}'.format(roi[key], default_roi[0][1])) elif key == ImageDimension.VERTICAL or key == AcquisitionDimension.VERTICAL: if roi[key][1] > default_roi[1][1]: - raise ValueError('Requested vertical range {} exceeds available range [0, {}]'.format(roi[key], default_roi[1][1])) + raise ValueError('Requested vertical range {} exceeds maximum of {}'.format(roi[key], default_roi[1][1])) elif key == ImageDimension.HORIZONTAL_X or key == ImageDimension.HORIZONTAL_Y or key == AcquisitionDimension.HORIZONTAL: if roi[key][1] > default_roi[2][1]: - raise ValueError('Requested horizontal range {} exceeds available range [0, {}]'.format(roi[key], default_roi[2][1])) + raise ValueError('Requested horizontal range {} exceeds maximum of {}'.format(roi[key], default_roi[2][1])) for i, x in enumerate(roi[key]): if x is None: continue if i != 2: #start and stop - default_roi[idx][i] = x if x >= 0 else default_roi[idx][1] - x + default_roi[idx][i] = x if x >= 0 else default_roi[idx][1] + x else: #step default_roi[idx][i] = x if x > 0 else 1