Skip to content

Fix custom-geometry and on-the-fly reconstruction errors in deteCT #200

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

Merged
AnderBiguri merged 1 commit into from
Aug 6, 2026
Merged

Fix custom-geometry and on-the-fly reconstruction errors in deteCT #200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions LION/data_loaders/deteCT.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,15 +274,15 @@ def __is_valid_geo(self, geometry):
warnings.warn(
f"Raw data detector_shape[1] must be 956, it is {geometry.detector_shape[1]}. Interpolation will be used, but note that you are not using exactly the raw data"
)
if geometry.detector_size != default_geo.detector_size:
if not np.array_equal(geometry.detector_size, default_geo.detector_size):
raise ValueError(f"detector_size must be {default_geo.detector_size}")
if geometry.image_shape != default_geo.image_shape:
if not np.array_equal(geometry.image_shape, default_geo.image_shape):
warnings.warn(
f"image_shape must be {default_geo.image_shape}, it is {geometry.image_shape}. Interpolation will be used, but note that you are not using exactly the raw data"
)
if geometry.image_size[1:] != default_geo.image_size[1:]:
if not np.array_equal(geometry.image_size[1:], default_geo.image_size[1:]):
raise ValueError(f"image_size must be {default_geo.image_size}")
if geometry.image_pos != default_geo.image_pos:
if not np.array_equal(geometry.image_pos, default_geo.image_pos):
raise ValueError(f"image_pos must be {default_geo.image_pos}")

full_angles = self.get_default_geometry().angles
Expand All @@ -291,7 +291,12 @@ def __is_valid_geo(self, geometry):

for angle in geometry.angles:
index = next(
i for i, _ in enumerate(full_angles) if np.isclose(_, angle, 10e-4)
(
i
for i, _ in enumerate(full_angles)
if np.isclose(_, angle, 10e-4)
),
None,
)
if index is None:
raise ValueError(
Expand Down Expand Up @@ -466,7 +471,7 @@ def __getitem__(self, index):
# Even if input is recon, we may want to actually do it ourselves.
if self.do_recon:
sinogram = self.__load_and_preprocess_sinogram__(index, self.input_mode)
op = deteCT.get_operator()
op = self.get_operator()
if self.recon_algo == "nag_ls":
input = nag_ls(op, sinogram, 100, min_constraint=0)
elif self.recon_algo == "fdk":
Expand Down Expand Up @@ -495,7 +500,7 @@ def __getitem__(self, index):
)
self.add_noise = noise

op = deteCT.get_operator()
op = self.get_operator()
if self.recon_algo == "nag_ls":
target = nag_ls(op, sinogram, 100, min_constraint=0)
elif self.recon_algo == "fdk":
Expand Down
Loading