Skip to content

REF: Refactor gradient data checks in DWI data class #327

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
wants to merge 7 commits into
base: main
Choose a base branch
from
+705 −140
Open

REF: Refactor gradient data checks in DWI data class #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c53efc
REF: Refactor gradient data checks in DWI data class
jhlegarreta Nov 14, 2025
18319f6
rf: overhaul suggested by nipreps/nifreeze#327's title
oesteban Nov 19, 2025
dfff01a
fix: first error, moving to next
oesteban Nov 21, 2025
198669e
fix: update tests with better data object
oesteban Nov 21, 2025
064413e
REF: Improve gradient formatting function robustness
jhlegarreta Nov 22, 2025
7933b75
TST: Add additional object instantiation equality checks
jhlegarreta Nov 22, 2025
5d7cff7
STY: Rename test function to describe better its purpose
jhlegarreta Nov 22, 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
14 changes: 2 additions & 12 deletions src/nifreeze/data/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
def load(
filename: Path | str,
brainmask_file: Path | str | None = None,
motion_file: Path | str | None = None,
**kwargs,
) -> BaseDataset | DWI | PET:
"""
Expand All @@ -45,8 +44,6 @@ def load(
brainmask_file : :obj:`os.pathlike`, optional
A brainmask NIfTI file. If provided, will be loaded and
stored in the returned dataset.
motion_file : :obj:`os.pathlike`
A file containing head motion affine matrices (linear).
Returns
-------
Expand All @@ -67,9 +64,6 @@ def load(

from nifreeze.utils.ndimage import load_api

if motion_file:
raise NotImplementedError

filename = Path(filename)
if filename.name.endswith(NFDH5_EXT):
for dataclass in (BaseDataset, PET, DWI):
Expand All @@ -81,15 +75,11 @@ def load(
if "gradients_file" in kwargs or "bvec_file" in kwargs:
from nifreeze.data.dmri import from_nii as dmri_from_nii

return dmri_from_nii(
filename, brainmask_file=brainmask_file, motion_file=motion_file, **kwargs
)
return dmri_from_nii(filename, brainmask_file=brainmask_file, **kwargs)
elif "frame_time" in kwargs or "frame_duration" in kwargs:
from nifreeze.data.pet import from_nii as pet_from_nii

return pet_from_nii(
filename, brainmask_file=brainmask_file, motion_file=motion_file, **kwargs
)
return pet_from_nii(filename, brainmask_file=brainmask_file, **kwargs)

img = load_api(filename, SpatialImage)
retval: BaseDataset = BaseDataset(dataobj=np.asanyarray(img.dataobj), affine=img.affine)
Expand Down
Loading