Skip to content

Add error message for impossible roi request to ZeissDataReader and fix sign error when negative values passed to ROI #2244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lauramurgatroyd wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add error message for impossible roi request to ZeissDataReader and fix sign error when negative values passed to ROI #2244

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22f0946
Add error message for incorrect roi request
lauramurgatroyd Dec 5, 2025
f52aeba
remove print
lauramurgatroyd Dec 5, 2025
6b7a0f6
Fix sign error
lauramurgatroyd Dec 16, 2025
252ae03
Merge branch 'master' into zeiss_roi_limits
lauramurgatroyd Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Wrappers/Python/cil/io/ZEISSDataReader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,22 @@ def set_up(self,
for key in roi.keys():
idx = zeiss_data_order[key]
if roi[key] != -1:
if key == AcquisitionDimension.ANGLE:
if roi[key][1] > 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 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 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

Expand Down
Loading