junifer 0.0.6.dev349__tar.gz → 0.0.6.dev366__tar.gz

{junifer-0.0.6.dev349 → junifer-0.0.6.dev366}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.6.dev349
+Version: 0.0.6.dev366
 Summary: JUelich NeuroImaging FEature extractoR
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
 Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>

junifer-0.0.6.dev366/docs/changes/newsfragments/411.change

@@ -0,0 +1 @@
+:meth:`.ParcellationRegistry.load` now has a new parameter ``target_space`` to provide parcellation in highest possible resolution if it does not match the space of the parcellation by `Fede Raimondo`_ and `Synchon Mandal`_

junifer-0.0.6.dev366/docs/changes/newsfragments/411.enh

@@ -0,0 +1 @@
+Refactor the parcellation logic in the pipeline to account for and optimise space transformations and merges by `Synchon Mandal`_ and `Fede Raimondo`_

junifer-0.0.6.dev366/docs/changes/newsfragments/414.misc

@@ -0,0 +1 @@
+Simplify logic for parcellation and mask space warping by `Synchon Mandal`_

{junifer-0.0.6.dev349 → junifer-0.0.6.dev366}/junifer/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.6.dev349'
-__version_tuple__ = version_tuple = (0, 0, 6, 'dev349')
+__version__ = version = '0.0.6.dev366'
+__version_tuple__ = version_tuple = (0, 0, 6, 'dev366')

{junifer-0.0.6.dev349 → junifer-0.0.6.dev366}/junifer/data/masks/_masks.py

@@ -14,8 +14,8 @@ from typing import (
 )
 
 import nibabel as nib
+import nilearn.image as nimg
 import numpy as np
-from nilearn.image import get_data, new_img_like, resample_to_img
 from nilearn.masking import (
     compute_background_mask,
     compute_epi_mask,
@@ -168,14 +168,14 @@ def compute_brain_mask(
             )
     # Resample template to target image
     else:
-        resampled_template = resample_to_img(
+        resampled_template = nimg.resample_to_img(
             source_img=template, target_img=target_data["data"]
         )
 
     # Threshold resampled template and get mask
-    mask = (get_data(resampled_template) >= threshold).astype("int8")
+    mask = (nimg.get_data(resampled_template) >= threshold).astype("int8")
 
-    return new_img_like(target_data["data"], mask)  # type: ignore
+    return nimg.new_img_like(target_data["data"], mask)  # type: ignore
 
 
 class MaskRegistry(BasePipelineDataRegistry, metaclass=Singleton):
@@ -523,7 +523,7 @@ class MaskRegistry(BasePipelineDataRegistry, metaclass=Singleton):
                     )
                 logger.debug("Resampling inherited mask to target image.")
                 # Resample inherited mask to target image
-                mask_img = resample_to_img(
+                mask_img = nimg.resample_to_img(
                     source_img=mask_img,
                     target_img=target_data["data"],
                 )
@@ -568,34 +568,41 @@ class MaskRegistry(BasePipelineDataRegistry, metaclass=Singleton):
                             "mask."
                         )
 
+                    # Set here to simplify things later
+                    mask_img: nib.nifti1.Nifti1Image = mask_object
+
                     # Resample and warp mask to standard space
                     if mask_space != target_std_space:
                         logger.debug(
                             f"Warping {t_mask} to {target_std_space} space "
-                            "using ants."
+                            "using ANTs."
                         )
                         mask_img = ANTsMaskWarper().warp(
                             mask_name=mask_name,
-                            mask_img=mask_object,
+                            mask_img=mask_img,
                             src=mask_space,
                             dst=target_std_space,
                             target_data=target_data,
                             warp_data=warper_spec,
                         )
+                        # Remove extra dimension added by ANTs
+                        mask_img = nimg.math_img(
+                            "np.squeeze(img)", img=mask_img
+                        )
 
-                    else:
-                        # Resample mask to target image; no further warping
+                    if target_space != "native":
+                        # No warping is going to happen, just resampling,
+                        # because we are in the correct space
                         logger.debug(f"Resampling {t_mask} to target image.")
-                        if target_space != "native":
-                            mask_img = resample_to_img(
-                                source_img=mask_object,
-                                target_img=target_data["data"],
-                            )
-                        # Set mask_img in case no warping happens before this
-                        else:
-                            mask_img = mask_object
-                    # Resample and warp mask if target data is native
-                    if target_space == "native":
+                        mask_img = nimg.resample_to_img(
+                            source_img=mask_img,
+                            target_img=target_img,
+                        )
+                    else:
+                        # Warp mask if target space is native as
+                        # either the image is in the right non-native space or
+                        # it's warped from one non-native space to another
+                        # non-native space
                         logger.debug(
                             "Warping mask to native space using "
                             f"{warper_spec['warper']}."

{junifer-0.0.6.dev349 → junifer-0.0.6.dev366}/junifer/data/parcellations/_parcellations.py

@@ -16,9 +16,10 @@ from typing import TYPE_CHECKING, Any, Optional, Union
 
 import httpx
 import nibabel as nib
+import nilearn.image as nimg
 import numpy as np
 import pandas as pd
-from nilearn import datasets, image
+from nilearn import datasets
 
 from ...utils import logger, raise_error, warn_with_log
 from ...utils.singleton import Singleton
@@ -269,6 +270,7 @@ class ParcellationRegistry(BasePipelineDataRegistry, metaclass=Singleton):
     def load(
         self,
         name: str,
+        target_space: str,
         parcellations_dir: Union[str, Path, None] = None,
         resolution: Optional[float] = None,
         path_only: bool = False,
@@ -282,6 +284,8 @@ class ParcellationRegistry(BasePipelineDataRegistry, metaclass=Singleton):
         ----------
         name : str
             The name of the parcellation.
+        target_space : str
+            The desired space of the parcellation.
         parcellations_dir : str or pathlib.Path, optional
             Path where the parcellations files are stored. The default location
             is "$HOME/junifer/data/parcellations" (default None).
@@ -328,6 +332,14 @@ class ParcellationRegistry(BasePipelineDataRegistry, metaclass=Singleton):
         else:
             space = parcellation_definition["space"]
 
+        # Check and get highest resolution
+        if space != target_space:
+            logger.info(
+                f"Parcellation will be warped from {space} to {target_space} "
+                "using highest resolution"
+            )
+            resolution = None
+
         # Check if the parcellation family is custom or built-in
         if t_family == "CustomUserParcellation":
             parcellation_fname = Path(parcellation_definition["path"])
@@ -441,13 +453,14 @@ class ParcellationRegistry(BasePipelineDataRegistry, metaclass=Singleton):
             img, labels, _, space = self.load(
                 name=name,
                 resolution=resolution,
+                target_space=target_space,
             )
 
             # Convert parcellation spaces if required;
             # cannot be "native" due to earlier check
             if space != target_std_space:
                 logger.debug(
-                    f"Warping {name} to {target_std_space} space using ants."
+                    f"Warping {name} to {target_std_space} space using ANTs."
                 )
                 raw_img = ANTsParcellationWarper().warp(
                     parcellation_name=name,
@@ -458,18 +471,46 @@ class ParcellationRegistry(BasePipelineDataRegistry, metaclass=Singleton):
                     warp_data=None,
                 )
                 # Remove extra dimension added by ANTs
-                img = image.math_img("np.squeeze(img)", img=raw_img)
-
-            logger.debug(f"Resampling {name} to target image.")
-            # Resample parcellation to target image
-            img_to_merge = image.resample_to_img(
-                source_img=img,
-                target_img=target_img,
-                interpolation="nearest",
-                copy=True,
-            )
+                img = nimg.math_img("np.squeeze(img)", img=raw_img)
+
+            if target_space != "native":
+                # No warping is going to happen, just resampling, because
+                # we are in the correct space
+                logger.debug(f"Resampling {name} to target image.")
+                # Resample parcellation to target image
+                img = nimg.resample_to_img(
+                    source_img=img,
+                    target_img=target_img,
+                    interpolation="nearest",
+                    copy=True,
+                )
+            else:
+                # Warp parcellation if target space is native as either
+                # the image is in the right non-native space or it's
+                # warped from one non-native space to another non-native space
+                logger.debug(
+                    "Warping parcellation to native space using "
+                    f"{warper_spec['warper']}."
+                )
+                # extra_input check done earlier and warper_spec exists
+                if warper_spec["warper"] == "fsl":
+                    img = FSLParcellationWarper().warp(
+                        parcellation_name="native",
+                        parcellation_img=img,
+                        target_data=target_data,
+                        warp_data=warper_spec,
+                    )
+                elif warper_spec["warper"] == "ants":
+                    img = ANTsParcellationWarper().warp(
+                        parcellation_name="native",
+                        parcellation_img=img,
+                        src="",
+                        dst="native",
+                        target_data=target_data,
+                        warp_data=warper_spec,
+                    )
 
-            all_parcellations.append(img_to_merge)
+            all_parcellations.append(img)
             all_labels.append(labels)
 
         # Avoid merging if there is only one parcellation
@@ -485,30 +526,6 @@ class ParcellationRegistry(BasePipelineDataRegistry, metaclass=Singleton):
                 labels_lists=all_labels,
             )
 
-        # Warp parcellation if target space is native
-        if target_space == "native":
-            logger.debug(
-                "Warping parcellation to native space using "
-                f"{warper_spec['warper']}."
-            )
-            # extra_input check done earlier and warper_spec exists
-            if warper_spec["warper"] == "fsl":
-                resampled_parcellation_img = FSLParcellationWarper().warp(
-                    parcellation_name="native",
-                    parcellation_img=resampled_parcellation_img,
-                    target_data=target_data,
-                    warp_data=warper_spec,
-                )
-            elif warper_spec["warper"] == "ants":
-                resampled_parcellation_img = ANTsParcellationWarper().warp(
-                    parcellation_name="native",
-                    parcellation_img=resampled_parcellation_img,
-                    src="",
-                    dst="native",
-                    target_data=target_data,
-                    warp_data=warper_spec,
-                )
-
         return resampled_parcellation_img, labels
 
 
@@ -1786,7 +1803,7 @@ def merge_parcellations(
                 "The parcellations have different resolutions!"
                 "Resampling all parcellations to the first one in the list."
             )
-            t_parc = image.resample_to_img(
+            t_parc = nimg.resample_to_img(
                 t_parc, ref_parc, interpolation="nearest", copy=True
             )
 
@@ -1812,6 +1829,6 @@ def merge_parcellations(
             "parcellation that was first in the list."
         )
 
-    parcellation_img_res = image.new_img_like(parcellations_list[0], parc_data)
+    parcellation_img_res = nimg.new_img_like(parcellations_list[0], parc_data)
 
     return parcellation_img_res, labels

{junifer-0.0.6.dev349 → junifer-0.0.6.dev366}/junifer/data/parcellations/tests/test_parcellations.py

@@ -60,7 +60,9 @@ def test_register_already_registered() -> None:
         space="MNI152Lin",
     )
     assert (
-        ParcellationRegistry().load("testparc", path_only=True)[2].name
+        ParcellationRegistry()
+        .load("testparc", target_space="MNI152Lin", path_only=True)[2]
+        .name
         == "testparc.nii.gz"
     )
 
@@ -81,7 +83,9 @@ def test_register_already_registered() -> None:
     )
 
     assert (
-        ParcellationRegistry().load("testparc", path_only=True)[2].name
+        ParcellationRegistry()
+        .load("testparc", target_space="MNI152Lin", path_only=True)[2]
+        .name
         == "testparc2.nii.gz"
     )
 
@@ -96,7 +100,8 @@ def test_parcellation_wrong_labels_values(tmp_path: Path) -> None:
 
     """
     schaefer, labels, schaefer_path, _ = ParcellationRegistry().load(
-        "Schaefer100x7"
+        "Schaefer100x7",
+        "MNI152NLin6Asym",
     )
     assert schaefer is not None
 
@@ -106,7 +111,7 @@ def test_parcellation_wrong_labels_values(tmp_path: Path) -> None:
     )
 
     with pytest.raises(ValueError, match=r"has 100 parcels but 10"):
-        ParcellationRegistry().load("WrongLabels")
+        ParcellationRegistry().load("WrongLabels", "MNI152NLin6Asym")
 
     # Test wrong number of labels
     ParcellationRegistry().register(
@@ -114,7 +119,7 @@ def test_parcellation_wrong_labels_values(tmp_path: Path) -> None:
     )
 
     with pytest.raises(ValueError, match=r"has 100 parcels but 101"):
-        ParcellationRegistry().load("WrongLabels2")
+        ParcellationRegistry().load("WrongLabels2", "MNI152NLin6Asym")
 
     schaefer_data = schaefer.get_fdata().copy()
     schaefer_data[schaefer_data == 50] = 0
@@ -126,7 +131,7 @@ def test_parcellation_wrong_labels_values(tmp_path: Path) -> None:
         "WrongValues", new_schaefer_path, labels[:-1], "MNI152Lin"
     )
     with pytest.raises(ValueError, match=r"must have all the values in the"):
-        ParcellationRegistry().load("WrongValues")
+        ParcellationRegistry().load("WrongValues", "MNI152NLin6Asym")
 
     schaefer_data = schaefer.get_fdata().copy()
     schaefer_data[schaefer_data == 50] = 200
@@ -138,7 +143,7 @@ def test_parcellation_wrong_labels_values(tmp_path: Path) -> None:
         "WrongValues2", new_schaefer_path, labels, "MNI152Lin"
     )
     with pytest.raises(ValueError, match=r"must have all the values in the"):
-        ParcellationRegistry().load("WrongValues2")
+        ParcellationRegistry().load("WrongValues2", "MNI152NLin6Asym")
 
 
 @pytest.mark.parametrize(
@@ -202,7 +207,7 @@ def test_register(
     assert name in ParcellationRegistry().list
     # Load registered parcellation
     _, lbl, fname, parcellation_space = ParcellationRegistry().load(
-        name=name, path_only=True
+        name=name, target_space=space, path_only=True
     )
     # Check values for registered parcellation
     assert lbl == parcels_labels
@@ -239,7 +244,7 @@ def test_list_correct(parcellation_name: str) -> None:
 def test_load_incorrect() -> None:
     """Test loading of invalid parcellations."""
     with pytest.raises(ValueError, match=r"not found"):
-        ParcellationRegistry().load("wrongparcellation")
+        ParcellationRegistry().load("wrongparcellation", "MNI152NLin6Asym")
 
 
 def test_retrieve_parcellation_incorrect() -> None:
@@ -323,6 +328,7 @@ def test_schaefer(
     # Load parcellation
     img, label, img_path, space = ParcellationRegistry().load(
         name=parcellation_name,
+        target_space="MNI152NLin6Asym",
         parcellations_dir=tmp_path,
         resolution=resolution,
     )
@@ -392,6 +398,7 @@ def test_suit(tmp_path: Path, space_key: str, space: str) -> None:
     # Load parcellation
     img, label, img_path, parcellation_space = ParcellationRegistry().load(
         name=f"SUITx{space_key}",
+        target_space=space,
         parcellations_dir=tmp_path,
     )
     assert img is not None
@@ -441,7 +448,9 @@ def test_tian_3T_6thgeneration(
     assert "TianxS4x3TxMNI6thgeneration" in parcellations
     # Load parcellation
     img, lbl, fname, parcellation_space_1 = ParcellationRegistry().load(
-        name=f"TianxS{scale}x3TxMNI6thgeneration", parcellations_dir=tmp_path
+        name=f"TianxS{scale}x3TxMNI6thgeneration",
+        parcellations_dir=tmp_path,
+        target_space="MNI152NLin2009cAsym",
     )
     fname1 = f"Tian_Subcortex_S{scale}_3T_1mm.nii.gz"
     assert img is not None
@@ -452,6 +461,7 @@ def test_tian_3T_6thgeneration(
     # Load parcellation
     img, lbl, fname, parcellation_space_2 = ParcellationRegistry().load(
         name=f"TianxS{scale}x3TxMNI6thgeneration",
+        target_space="MNI152NLin6Asym",
         parcellations_dir=tmp_path,
         resolution=2,
     )
@@ -489,6 +499,7 @@ def test_tian_3T_nonlinear2009cAsym(
     # Load parcellation
     img, lbl, fname, space = ParcellationRegistry().load(
         name=f"TianxS{scale}x3TxMNInonlinear2009cAsym",
+        target_space="MNI152NLin2009cAsym",
         parcellations_dir=tmp_path,
     )
     fname1 = f"Tian_Subcortex_S{scale}_3T_2009cAsym.nii.gz"
@@ -524,7 +535,9 @@ def test_tian_7T_6thgeneration(
     assert "TianxS4x7TxMNI6thgeneration" in parcellations
     # Load parcellation
     img, lbl, fname, space = ParcellationRegistry().load(
-        name=f"TianxS{scale}x7TxMNI6thgeneration", parcellations_dir=tmp_path
+        name=f"TianxS{scale}x7TxMNI6thgeneration",
+        target_space="MNI152NLin6Asym",
+        parcellations_dir=tmp_path,
     )
     fname1 = f"Tian_Subcortex_S{scale}_7T.nii.gz"
     assert img is not None
@@ -611,7 +624,9 @@ def test_aicha(tmp_path: Path, version: int) -> None:
     assert f"AICHA_v{version}" in ParcellationRegistry().list
     # Load parcellation
     img, label, img_path, space = ParcellationRegistry().load(
-        name=f"AICHA_v{version}", parcellations_dir=tmp_path
+        name=f"AICHA_v{version}",
+        target_space="IXI549Space",
+        parcellations_dir=tmp_path,
     )
     assert img is not None
     assert img_path.name == "AICHA.nii"
@@ -680,6 +695,7 @@ def test_shen(
     # Load parcellation
     img, label, img_path, space = ParcellationRegistry().load(
         name=f"Shen_{year}_{n_rois}",
+        target_space="MNI152NLin2009cAsym",
         parcellations_dir=tmp_path,
         resolution=resolution,
     )
@@ -875,7 +891,8 @@ def test_yan(
         )
     # Load parcellation
     img, label, img_path, space = ParcellationRegistry().load(
-        name=parcellation_name,  # type: ignore
+        name=parcellation_name,
+        target_space="MNI152NLin6Asym",
         parcellations_dir=tmp_path,
         resolution=resolution,
     )
@@ -1012,6 +1029,7 @@ def test_brainnetome(
     # Load parcellation
     img, label, img_path, space = ParcellationRegistry().load(
         name=parcellation_name,
+        target_space="MNI152NLin6Asym",
         parcellations_dir=tmp_path,
         resolution=resolution,
     )
@@ -1044,10 +1062,11 @@ def test_merge_parcellations() -> None:
     """Test merging parcellations."""
     # load some parcellations for testing
     schaefer_parcellation, schaefer_labels, _, _ = ParcellationRegistry().load(
-        "Schaefer100x17"
+        "Schaefer100x17", target_space="MNI152NLin2009cAsym"
     )
     tian_parcellation, tian_labels, _, _ = ParcellationRegistry().load(
-        "TianxS2x3TxMNInonlinear2009cAsym"
+        "TianxS2x3TxMNInonlinear2009cAsym",
+        target_space="MNI152NLin2009cAsym",
     )
     # prepare the list of the actual parcellations
     parcellation_list = [schaefer_parcellation, tian_parcellation]
@@ -1079,7 +1098,9 @@ def test_merge_parcellations_3D_multiple_non_overlapping(
 
     """
     # Get the testing parcellation
-    parcellation, labels, _, _ = ParcellationRegistry().load("Schaefer100x7")
+    parcellation, labels, _, _ = ParcellationRegistry().load(
+        "Schaefer100x7", target_space="MNI152NLin2009cAsym"
+    )
 
     assert parcellation is not None
 
@@ -1114,7 +1135,9 @@ def test_merge_parcellations_3D_multiple_overlapping() -> None:
     """Test merge_parcellations with multiple overlapping parcellations."""
 
     # Get the testing parcellation
-    parcellation, labels, _, _ = ParcellationRegistry().load("Schaefer100x7")
+    parcellation, labels, _, _ = ParcellationRegistry().load(
+        "Schaefer100x7", target_space="MNI152NLin2009cAsym"
+    )
 
     assert parcellation is not None
 
@@ -1149,7 +1172,9 @@ def test_merge_parcellations_3D_multiple_duplicated_labels() -> None:
     """Test merge_parcellations with duplicated labels."""
 
     # Get the testing parcellation
-    parcellation, labels, _, _ = ParcellationRegistry().load("Schaefer100x7")
+    parcellation, labels, _, _ = ParcellationRegistry().load(
+        "Schaefer100x7", target_space="MNI152NLin2009cAsym"
+    )
 
     assert parcellation is not None
 
@@ -1198,6 +1223,7 @@ def test_get_single() -> None:
         # Get raw parcellation
         raw_parcellation, raw_labels, _, _ = ParcellationRegistry().load(
             "TianxS1x3TxMNInonlinear2009cAsym",
+            target_space="MNI152NLin2009cAsym",
             resolution=1.5,
         )
         resampled_raw_parcellation = resample_to_img(
@@ -1240,7 +1266,7 @@ def test_get_multi_same_space() -> None:
         ]
         for name in parcellations_names:
             img, labels, _, _ = ParcellationRegistry().load(
-                name=name, resolution=1.5
+                name=name, target_space="MNI152NLin2009cAsym", resolution=1.5
             )
             # Resample raw parcellations
             resampled_img = resample_to_img(

{junifer-0.0.6.dev349 → junifer-0.0.6.dev366}/junifer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.6.dev349
+Version: 0.0.6.dev366
 Summary: JUelich NeuroImaging FEature extractoR
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
 Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>

{junifer-0.0.6.dev349 → junifer-0.0.6.dev366}/junifer.egg-info/SOURCES.txt

@@ -110,9 +110,12 @@ docs/changes/newsfragments/408.enh
 docs/changes/newsfragments/408.feature
 docs/changes/newsfragments/409.bugfix
 docs/changes/newsfragments/409.enh
+docs/changes/newsfragments/411.change
+docs/changes/newsfragments/411.enh
 docs/changes/newsfragments/412.change
 docs/changes/newsfragments/412.feature
 docs/changes/newsfragments/413.change
+docs/changes/newsfragments/414.misc
 docs/extending/coordinates.rst
 docs/extending/datagrabber.rst
 docs/extending/dependencies.rst