junifer 0.0.2.dev138__py3-none-any.whl → 0.0.2.dev140__py3-none-any.whl

junifer/markers/tests/test_collection.py

@@ -39,7 +39,7 @@ def test_marker_collection_incorrect_markers() -> None:
         ),
     ]
     with pytest.raises(ValueError, match=r"must have different names"):
-        MarkerCollection(wrong_markers)
+        MarkerCollection(wrong_markers)  # type: ignore
 
 
 def test_marker_collection() -> None:
@@ -62,7 +62,7 @@ def test_marker_collection() -> None:
             name="gmd_schaefer100x7_trim_mean90",
         ),
     ]
-    mc = MarkerCollection(markers=markers)
+    mc = MarkerCollection(markers=markers)  # type: ignore
     assert mc._markers == markers
     assert mc._preprocessing is None
     assert mc._storage is None
@@ -96,7 +96,7 @@ def test_marker_collection() -> None:
             return input
 
     mc2 = MarkerCollection(
-        markers=markers,
+        markers=markers,  # type: ignore
         preprocessing=BypassPreprocessing(),
         datareader=DefaultDataReader(),
     )
@@ -127,7 +127,7 @@ def test_marker_collection_with_preprocessing() -> None:
         ),
     ]
     mc = MarkerCollection(
-        markers=markers,
+        markers=markers,  # type: ignore
         preprocessing=fMRIPrepConfoundRemover(),
     )
     assert mc._markers == markers
@@ -173,7 +173,7 @@ def test_marker_collection_storage(tmp_path: Path) -> None:
     uri = tmp_path / "test_marker_collection_storage.sqlite"
     storage = SQLiteFeatureStorage(uri=uri)
     mc = MarkerCollection(
-        markers=markers,
+        markers=markers,  # type: ignore
         storage=storage,
         datareader=DefaultDataReader(),
     )
@@ -185,7 +185,9 @@ def test_marker_collection_storage(tmp_path: Path) -> None:
         out = mc.fit(input)
         assert out is None
 
-    mc2 = MarkerCollection(markers=markers, datareader=DefaultDataReader())
+    mc2 = MarkerCollection(
+        markers=markers, datareader=DefaultDataReader()  # type: ignore
+    )
     mc2.validate(dg)
     assert mc2._storage is None
 

junifer/markers/tests/test_marker_utils.py

@@ -27,13 +27,14 @@ def test_ets() -> None:
     n_edges = int(n_rois * (n_rois - 1) / 2)
 
     # test without labels
-    edge_ts = _ets(bold_ts)
+    edge_ts, _ = _ets(bold_ts)
     assert edge_ts.shape == (n_time, n_edges)
 
     # test with labels
     roi_labels = [f"Label_{x}" for x in range(n_rois)]
     edge_ts, edge_labels = _ets(bold_ts, roi_labels)
     assert edge_ts.shape == (n_time, n_edges)
+    assert edge_labels is not None
     assert len(edge_labels) == n_edges
 
 

junifer/markers/tests/test_parcel_aggregation.py

@@ -229,7 +229,7 @@ def test_ParcelAggregation_3D_mask() -> None:
     marker = ParcelAggregation(
         parcellation="Schaefer100x7",
         method="mean",
-        mask="GM_prob0.2",
+        masks="GM_prob0.2",
         name="gmd_schaefer100x7_mean",
         on="VBM_GM",
     )  # Test passing "on" as a keyword argument
@@ -274,7 +274,7 @@ def test_ParcelAggregation_3D_mask_computed() -> None:
     marker = ParcelAggregation(
         parcellation="Schaefer100x7",
         method="mean",
-        mask={"compute_brain_mask": {"threshold": 0.2}},
+        masks={"compute_brain_mask": {"threshold": 0.2}},
         name="gmd_schaefer100x7_mean",
         on="VBM_GM",
     )  # Test passing "on" as a keyword argument

junifer/markers/tests/test_sphere_aggregation.py

@@ -159,7 +159,7 @@ def test_SphereAggregation_3D_mask() -> None:
         method="mean",
         radius=RADIUS,
         on="VBM_GM",
-        mask="GM_prob0.2",
+        masks="GM_prob0.2",
     )
     input = {"VBM_GM": {"data": img, "meta": {}}}
     jun_values4d = marker.fit_transform(input)["VBM_GM"]["data"]

junifer/markers/utils.py

@@ -7,7 +7,7 @@
 #          Federico Raimondo <f.raimondo@fz-juelich.de>
 # License: AGPL
 
-from typing import Any, Callable, Dict, List, Type, Union
+from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
 
 import numpy as np
 import pandas as pd
@@ -56,8 +56,9 @@ def singleton(cls: Type) -> Type:
 
 
 def _ets(
-    bold_ts: np.ndarray, roi_names: Union[None, List[str]] = None
-) -> np.ndarray:
+    bold_ts: np.ndarray,
+    roi_names: Union[None, List[str]] = None,
+) -> Tuple[np.ndarray, Optional[List[str]]]:
     """Compute the edge-wise time series based on BOLD time series.
 
     Take a timeseries of brain areas, and calculate timeseries for each
@@ -80,9 +81,8 @@ def _ets(
         edge-wise time series, i.e. estimate of functional connectivity at each
         time point.
     edge_names : List[str]
-        List of edge names corresponding to columns in the
-        edge-wise time series. This is only returned if the roi_names
-        are specified.
+        List of edge names corresponding to columns in the edge-wise time
+        series. If roi_names are not specified, this is None.
 
     References
     ----------
@@ -102,18 +102,18 @@ def _ets(
     ets = timeseries[:, u] * timeseries[:, v]
     # Obtain the corresponding edge labels if specified else return
     if roi_names is None:
-        return ets
+        return ets, None
     else:
         if len(roi_names) != n_roi:
             raise_error(
                 "List of roi names does not correspond "
                 "to the number of ROIs in the timeseries!"
             )
-        roi_names = np.array(roi_names)
+        _roi_names = np.array(roi_names)
         edge_names = [
-            "~".join([x, y]) for x, y in zip(roi_names[u], roi_names[v])
+            "~".join([x, y]) for x, y in zip(_roi_names[u], _roi_names[v])
         ]
-        return ets, list(edge_names)
+        return ets, edge_names
 
 
 def _correlate_dataframes(

junifer/preprocess/base.py

@@ -115,12 +115,22 @@ class BasePreprocessor(ABC, PipelineStepMixin, UpdateMetaMixin):
             if type_ in input.keys():
                 logger.info(f"Computing {type_}")
                 t_input = input[type_]
-                extra_input = input.copy()
+
+                # Pass the other data types as extra input, removing
+                # the current type
+                extra_input = input
                 extra_input.pop(type_)
                 key, t_out = self.preprocess(
                     input=t_input, extra_input=extra_input
                 )
+
+                # Add the output to the Junifer Data object
                 out[key] = t_out
+
+                # In case we are creating a new type, re-add the original input
+                if key != type_:
+                    out[type_] = t_input
+
                 self.update_meta(out[key], "preprocess")
         return out
 

junifer/preprocess/confounds/fmriprep_confound_remover.py

@@ -11,9 +11,9 @@ import numpy as np
 import pandas as pd
 from nilearn._utils.niimg_conversions import check_niimg_4d
 from nilearn.image import clean_img
-from nilearn.masking import compute_brain_mask
 
 from ...api.decorators import register_preprocessor
+from ...data import get_mask
 from ...utils import logger, raise_error
 from ..base import BasePreprocessor
 
@@ -134,11 +134,10 @@ class fMRIPrepConfoundRemover(BasePreprocessor):
     t_r : float, optional
         Repetition time, in second (sampling period).
         If None, it will use t_r from nifti header (default None).
-    mask_img: Niimg-like object, optional
-        If provided, signal is only cleaned from voxels inside the mask.
-        If mask is provided, it should have same shape and affine as imgs.
-        If not provided, a mask is computed using
-        :func:`nilearn.masking.compute_brain_mask` (default None).
+    masks : str, dict or list of dict or str, optional
+        The specification of the masks to apply to regions before extracting
+        signals. Check :ref:`Using Masks <using_masks>` for more details.
+        If None, will not apply any mask (default None).
 
     """
 
@@ -153,7 +152,7 @@ class fMRIPrepConfoundRemover(BasePreprocessor):
         low_pass: Optional[float] = None,
         high_pass: Optional[float] = None,
         t_r: Optional[float] = None,
-        mask_img: Optional["Nifti1Image"] = None,
+        masks: Union[str, Dict, List[Union[Dict, str]], None] = None,
     ) -> None:
         """Initialise the class."""
         if strategy is None:
@@ -169,7 +168,7 @@ class fMRIPrepConfoundRemover(BasePreprocessor):
         self.low_pass = low_pass
         self.high_pass = high_pass
         self.t_r = t_r
-        self.mask_img = mask_img
+        self.masks = masks
 
         self._valid_components = ["motion", "wm_csf", "global_signal"]
         self._valid_confounds = ["basic", "power2", "derivatives", "full"]
@@ -521,19 +520,20 @@ class fMRIPrepConfoundRemover(BasePreprocessor):
             raise ValueError(f"Invalid confounds format {t_format}")
 
     def _remove_confounds(
-        self, bold_img: "Nifti1Image", confounds_df: pd.DataFrame
+        self,
+        input: Dict[str, Any],
+        extra_input: Optional[Dict[str, Any]] = None,
     ) -> Union["Nifti1Image", "Nifti2Image", "MGHImage", List]:
         """Remove confounds from the BOLD image.
 
         Parameters
         ----------
-        bold_img : Niimg-like object
-            4D image. The signals in the last dimension are filtered
-            (see http://nilearn.github.io/manipulating_images/input_output.html
-            for a detailed description of the valid input types).
-        confounds_df : pd.DataFrame
-            Dataframe containing confounds to remove. Number of rows should
-            correspond to number of volumes in the BOLD image.
+        input : dict
+            Dictionary containing the ``BOLD`` value from the
+            Junifer Data object.
+        extra_input : dict, optional
+            Dictionary containing the rest of the Junifer Data object. Must
+            include the ``BOLD_confounds`` key.
 
         Returns
         --------
@@ -541,8 +541,11 @@ class fMRIPrepConfoundRemover(BasePreprocessor):
             Input image with confounds removed.
 
         """
+        assert extra_input is not None  # Not the case, data is validated
+        confounds_df = self._pick_confounds(extra_input["BOLD_confounds"])
         confounds_array = confounds_df.values
 
+        bold_img = input["data"]
         t_r = self.t_r
         if t_r is None:
             logger.info("No `t_r` specified, using t_r from nifti header")
@@ -552,10 +555,17 @@ class fMRIPrepConfoundRemover(BasePreprocessor):
                 f"Read t_r from nifti header: {t_r}",
             )
 
-        mask_img = self.mask_img
-        if mask_img is None:
-            logger.info("Computing brain mask from image")
-            mask_img = compute_brain_mask(bold_img)
+        mask_img = None
+        if self.masks is not None:
+            logger.debug(f"Masking with {self.masks}")
+            mask_img = get_mask(
+                masks=self.masks, target_data=input, extra_input=extra_input
+            )
+            # Save the mask in the extra input and link it to the bold data
+            # this allows to use "inherit" down the pipeline
+            if extra_input is not None:
+                extra_input["BOLD_mask"] = {"data": mask_img}
+                input["mask_item"] = "BOLD_mask"
 
         logger.info("Cleaning image")
         logger.debug(f"\tdetrend: {self.detrend}")
@@ -600,8 +610,5 @@ class fMRIPrepConfoundRemover(BasePreprocessor):
 
         """
         self._validate_data(input, extra_input)
-        assert extra_input is not None
-        bold_img = input["data"]
-        confounds_df = self._pick_confounds(extra_input["BOLD_confounds"])
-        input["data"] = self._remove_confounds(bold_img, confounds_df)
+        input["data"] = self._remove_confounds(input, extra_input=extra_input)
         return "BOLD", input

junifer/preprocess/confounds/tests/test_fmriprep_confound_remover.py

@@ -452,10 +452,10 @@ def test_fMRIPrepConfoundRemover__remove_confounds() -> None:
     with PartlyCloudyTestingDataGrabber(reduce_confounds=False) as dg:
         input = dg["sub-01"]
         input = reader.fit_transform(input)
-        confounds = confound_remover._pick_confounds(input["BOLD_confounds"])
         raw_bold = input["BOLD"]["data"]
+        extra_input = {k: v for k, v in input.items() if k != "BOLD"}
         clean_bold = confound_remover._remove_confounds(
-            bold_img=raw_bold, confounds_df=confounds
+            input=input["BOLD"], extra_input=extra_input
         )
         clean_bold = typing.cast(nib.Nifti1Image, clean_bold)
         # TODO: Find a better way to test functionality here
@@ -533,7 +533,63 @@ def test_fMRIPrepConfoundRemover_fit_transform() -> None:
         assert t_meta["low_pass"] is None
         assert t_meta["high_pass"] is None
         assert t_meta["t_r"] is None
-        assert t_meta["mask_img"] is None
+        assert t_meta["masks"] is None
+
+        assert "dependencies" in output["BOLD"]["meta"]
+        dependencies = output["BOLD"]["meta"]["dependencies"]
+        assert dependencies == {"numpy", "nilearn"}
+
+
+def test_fMRIPrepConfoundRemover_fit_transform_masks() -> None:
+    """Test fMRIPrepConfoundRemover with all confounds present."""
+
+    # need reader for the data
+    reader = DefaultDataReader()
+    # All strategies full, no spike
+    confound_remover = fMRIPrepConfoundRemover(
+        masks={"compute_brain_mask": {"threshold": 0.2}}
+    )
+
+    with PartlyCloudyTestingDataGrabber(reduce_confounds=False) as dg:
+        input = dg["sub-01"]
+        input = reader.fit_transform(input)
+        orig_bold = input["BOLD"]["data"].get_fdata().copy()
+        output = confound_remover.fit_transform(input)
+        trans_bold = output["BOLD"]["data"].get_fdata()
+        # Transformation is in place
+        assert_array_equal(trans_bold, input["BOLD"]["data"].get_fdata())
+
+        # Data should have the same shape
+        assert orig_bold.shape == trans_bold.shape
+
+        # but be different
+        assert_raises(
+            AssertionError, assert_array_equal, orig_bold, trans_bold
+        )
+
+        assert "meta" in output["BOLD"]
+        assert "preprocess" in output["BOLD"]["meta"]
+        t_meta = output["BOLD"]["meta"]["preprocess"]
+        assert t_meta["class"] == "fMRIPrepConfoundRemover"
+        # It should have all the default parameters
+        assert t_meta["strategy"] == confound_remover.strategy
+        assert t_meta["spike"] is None
+        assert t_meta["detrend"] is True
+        assert t_meta["standardize"] is True
+        assert t_meta["low_pass"] is None
+        assert t_meta["high_pass"] is None
+        assert t_meta["t_r"] is None
+        assert isinstance(t_meta["masks"], dict)
+        assert t_meta["masks"] is not None
+        assert len(t_meta["masks"]) == 1
+        assert "compute_brain_mask" in t_meta["masks"]
+        assert len(t_meta["masks"]["compute_brain_mask"]) == 1
+        assert "threshold" in t_meta["masks"]["compute_brain_mask"]
+        assert t_meta["masks"]["compute_brain_mask"]["threshold"] == 0.2
+
+        assert "BOLD_mask" in output
+        assert "mask_item" in output["BOLD"]
+        assert output["BOLD"]["mask_item"] == "BOLD_mask"
 
         assert "dependencies" in output["BOLD"]["meta"]
         dependencies = output["BOLD"]["meta"]["dependencies"]

{junifer-0.0.2.dev138.dist-info → junifer-0.0.2.dev140.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.2.dev138
+Version: 0.0.2.dev140
 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.2.dev138.dist-info → junifer-0.0.2.dev140.dist-info}/RECORD

@@ -1,5 +1,5 @@
 junifer/__init__.py,sha256=rJgTGeR-SOntQoLSGo36zKDTE8IMRBn2-YwC0JSNUpU,377
-junifer/_version.py,sha256=qVdH9WeywnuErNlf5zsHPfkfRSMVifPFRbRtdc_dpY8,177
+junifer/_version.py,sha256=HvZxramN6g_D--rQIkn39dXpmFhOcuXTkrv5rcfxKgs,177
 junifer/stats.py,sha256=3Yt9xD51S0S922T8R6hElO7itvf-Sz41P_SwPzR9KIg,3523
 junifer/api/__init__.py,sha256=YILu9M7SC0Ri4CVd90fELH2OnK_gvCYAXCoqBNCFE8E,257
 junifer/api/cli.py,sha256=WiMF7c3SJuRi_rxxBaaTb7YCQOpfebvhAOh-cKDV8sM,8993
@@ -35,7 +35,7 @@ junifer/configs/juseless/datagrabbers/tests/test_ukb_vbm.py,sha256=V2vk6Y2RP4sLZ
 junifer/configs/tests/test_juseless.py,sha256=J_Ujtbttb3dLy5phkNLNuTPZy2xXejRhl_7SGIjV91Q,876
 junifer/data/__init__.py,sha256=mqayvhnk3oVzAzJyFhw8QGKIZY0GGGIXPzQHJkOkMQ0,482
 junifer/data/coordinates.py,sha256=kezVbrHDfa_LGjMWg9BM6Izl3Rr9pajQhDoakO4lQ6A,4686
-junifer/data/masks.py,sha256=_HWqdVEIrBkFJk-Bo72e5x0mp8yxJ2yLX5JcC0Pf27o,8304
+junifer/data/masks.py,sha256=8C33Z84mDzB27bemDSYff9Job2rNHJNsaCJQIRqmZIg,11273
 junifer/data/parcellations.py,sha256=fzOPlKaD-F4Du1723vFn0qZ3ZNlCPpBUOiyzvEIqtWs,24404
 junifer/data/utils.py,sha256=K9quLIoWRmm2QFM8Rdy_5bYsWb_XhL0l5Uq_1Sie0kA,1274
 junifer/data/VOIs/meta/CogAC_VOIs.txt,sha256=PJr-gShA19NA8rV_pcWDEwrTl35H_95qQNXdIeQotLU,397
@@ -60,7 +60,7 @@ junifer/data/masks/vickery-patil/CAT12_IXI555_MNI152_TMP_GS_GMprob0.2_clean_3mm.
 junifer/data/masks/vickery-patil/GMprob0.2_cortex_3mm_NA_rm.nii.gz,sha256=jfMe_4H9XEnArYms5bSQbqS2V1_HbLHTfI5amQa_Pes,8700
 junifer/data/tests/test_coordinates.py,sha256=RCYOuaAjs2wqPeFHX-l9Bryt5Zw5mOIV0WpsH891RwA,3240
 junifer/data/tests/test_data_utils.py,sha256=Vy7x8zaHws5hmn92PKSv3H38hU2kamOpyaH6nG_NNpw,1086
-junifer/data/tests/test_masks.py,sha256=JE8i8LAeeqm8-sdztbE833RgoYBxQfuimZW6b-dme4I,8149
+junifer/data/tests/test_masks.py,sha256=hekRQNhbLqCMSYmO5NISdYdWwdsbHOowOxmbgrBG76c,13266
 junifer/data/tests/test_parcellations.py,sha256=2UAnQw2NZNHzrZ6wcPplZH6y8mf6yuNuAlg6RmJAi0U,17123
 junifer/datagrabber/__init__.py,sha256=US44K6DeCFWnF7TJzNt_CD5c7q9XaAF5NLS0llyGibQ,579
 junifer/datagrabber/base.py,sha256=RS9jNUPgzjUoOQUEwqVQDr6yOkaBDtQpbHXbiu0eRjs,4638
@@ -71,12 +71,12 @@ junifer/datagrabber/pattern.py,sha256=OjPqz6VM22bVTeWra1DEzDBe0jL1NMTqu8jHTWGCWy
 junifer/datagrabber/pattern_datalad.py,sha256=9_HDjChlqb4RLxaC3zrB5EO5fdKT43iroEDvDIk0xVI,1628
 junifer/datagrabber/utils.py,sha256=x2NG076T_jTiDLpl6lXy7-_RUVuPwSmygf3FZcOdK6k,2769
 junifer/datagrabber/aomic/__init__.py,sha256=e2PiVk95yR99Wzy6MBnNmUCAyuQcg9jzbfrA3Frm5fQ,295
-junifer/datagrabber/aomic/id1000.py,sha256=PuR2yRw4EVkfkUkq-V5c0X4CatC35pw_T_8PTX8MC8I,2944
-junifer/datagrabber/aomic/piop1.py,sha256=EeXsXIn-rNxJKHWivt9RkCL7LSlDp3Lylkj9lcv7gSE,5144
-junifer/datagrabber/aomic/piop2.py,sha256=NQP61YcWe5W5jDx1zcX5st2sbwvXAmWkA_DcEC_V3IY,4155
-junifer/datagrabber/aomic/tests/test_id1000.py,sha256=Nq8ENtXkDe8cz45w2hGcYsZysJ0It8NT60GidOGxmqk,3370
-junifer/datagrabber/aomic/tests/test_piop1.py,sha256=No_tq-q-mjErIcYnOZZZCuGRE6AOwp-avjC1ViDyeWk,4407
-junifer/datagrabber/aomic/tests/test_piop2.py,sha256=6BO8QrxIaNuj153CpIYan-Z7YEZvlKdbXEovmxQhykY,4183
+junifer/datagrabber/aomic/id1000.py,sha256=X_hs8Y0qP1CO7YXQM3g0KIGJiFQjFfexuGN0acypYLM,3944
+junifer/datagrabber/aomic/piop1.py,sha256=wd8-WlDG7KJRCUmZ7ORABxc8iFLMMedSfc6wYBAn9CI,5698
+junifer/datagrabber/aomic/piop2.py,sha256=hBOVvBsBSyeS9dPp7xSIhQFIqFl69y7wifjfkz5cypM,5303
+junifer/datagrabber/aomic/tests/test_id1000.py,sha256=-QCMDylQgGM0Re_EYHilnT4NrOVtyQ2AASPCpMXy0vk,3523
+junifer/datagrabber/aomic/tests/test_piop1.py,sha256=Aw9oRs_H-hnUyr6-w5CPf85yOVneAAx_T_XcAIVCy9I,4576
+junifer/datagrabber/aomic/tests/test_piop2.py,sha256=sCJXdc3-HG5rTkurdNJfTRgEzjnX8dlW1b7DrMnVryg,4351
 junifer/datagrabber/tests/test_base.py,sha256=gzyVbat1e9BE82zbcxEp22eR1yD7rFabQVO_0M2hELg,1994
 junifer/datagrabber/tests/test_datagrabber_utils.py,sha256=Y7g08B8neHiB4HMHDhBxMXDNOmXsQ4fTMalhoA0iLFA,2745
 junifer/datagrabber/tests/test_datalad_base.py,sha256=HeWVdXybfvsVfzQfZxC7wYD6gWTXz2dNCAbZ5thl01E,14683
@@ -94,45 +94,45 @@ junifer/external/nilearn/tests/test_junifer_nifti_spheres_masker.py,sha256=ll0Qo
 junifer/markers/__init__.py,sha256=K35ML9FHYV2V79P4X098YB1ZOfDcnRfZrAZHvVuBg90,769
 junifer/markers/base.py,sha256=PnBMhq3_NJxSr0ige1fuqxbHM3C7cMXSt9_C0KkAZlU,5877
 junifer/markers/collection.py,sha256=AvtaGj08WEhV2oREzD9xG7vQFqs5AFsgCuNbkZkUAfM,4585
-junifer/markers/ets_rss.py,sha256=Zb8phJlujRHL0UKQlINdmQOxH5SrfNbPwSJjxSl-wFM,4411
-junifer/markers/parcel_aggregation.py,sha256=dDclvv3EkR0F7X4Uo0VWld534pCWflz-UvmzNA3qyZI,7902
-junifer/markers/sphere_aggregation.py,sha256=L-zOq9m6pbkpyIPWrkghE0g5q4dUkJoOWPwUsyFtOpY,5284
-junifer/markers/utils.py,sha256=wmf6FY9K3kGzKQ5dh-6NeK0giYfqTsdL5Mo2Swx6mrU,4571
+junifer/markers/ets_rss.py,sha256=brN2FfB5yYwRpm7sfZQh-9wf-GKZm3NiKUYpzdGs5WA,4504
+junifer/markers/parcel_aggregation.py,sha256=QgqTd42xKE_Fj0g-Nsfv2QLlNFBxrBByEgofxSV2giU,8049
+junifer/markers/sphere_aggregation.py,sha256=TxO4pbQCWz2Nx1omUu0RU2Ml62BNJTcwHPeYtQxXKLw,5431
+junifer/markers/utils.py,sha256=0F-6FI80IsKxcyVOAKh3xHho-wshzrB9hDfVOgHYsxk,4608
 junifer/markers/falff/__init__.py,sha256=TFVPjdJ7hIkjIqIf9zwI3Ee0T1hDvhikHBnwv8DqtFA,253
 junifer/markers/falff/falff_base.py,sha256=BdyuUR0xB7bZJfYb3SCVD-KEUTwA_xt_kuaBzUdVQhs,5577
 junifer/markers/falff/falff_estimator.py,sha256=4aaMsDf_HZkQ7KjZAcu0yJvdffb2IIpgAMHD3qU8THQ,10376
-junifer/markers/falff/falff_parcels.py,sha256=WT0Rwzh6hqJh9DoPt36BPO8-F27_WqCqwu12y754ihg,4476
-junifer/markers/falff/falff_spheres.py,sha256=Ct35K5pZReS270ibvnsDqe-5wMick8e8koMoKfcKVDM,4717
+junifer/markers/falff/falff_parcels.py,sha256=Wyjt_p2UsSZ-2OXBpFv6hvrRkVcDJMix4VLhpQo-GXk,4566
+junifer/markers/falff/falff_spheres.py,sha256=O0AF5PRxfrDVKXla1hqog6aYHu1GUr9GMmvdBEx1HjA,4813
 junifer/markers/falff/tests/test_falff_estimator.py,sha256=7UVMFgyxVrWwlh7voKIcgYadcaRxmeuAn0QaN4tTsJs,7706
 junifer/markers/falff/tests/test_falff_parcels.py,sha256=qI_KaS1YPYd-LdhkKhWgLj5yQjqUva7GHsgyPgpdiFY,4844
 junifer/markers/falff/tests/test_falff_spheres.py,sha256=QoMyCq9DNCCz0hO1RGl2nJFOEforZv87m6nHqukZ8_Q,4929
 junifer/markers/functional_connectivity/__init__.py,sha256=Uq8aXpHJesedJNHEixpc4bn7VvYZMhf710jyiX45XlE,499
-junifer/markers/functional_connectivity/crossparcellation_functional_connectivity.py,sha256=yB-3BvTjKVihIscj0fWzmI1da5Wojq5mMYcWIDyp76E,5037
-junifer/markers/functional_connectivity/edge_functional_connectivity_parcels.py,sha256=io_b5bRzshw2xt8pBXSv6Z-5uYs7_Fv-L3tnUpVztVo,3258
-junifer/markers/functional_connectivity/edge_functional_connectivity_spheres.py,sha256=hS88iOfIDlVScPFVAKRG1R7FbNIHwBjJYJpPH0Jz1EA,3598
-junifer/markers/functional_connectivity/functional_connectivity_base.py,sha256=Hp1UkYMv5-clJHih2Wf4xYdtL896KGCLQoU_4C591kE,4963
-junifer/markers/functional_connectivity/functional_connectivity_parcels.py,sha256=V_bzBGDV-GANFViDG8CPneEthUOKp0jtQhrJ2r1reL8,2960
-junifer/markers/functional_connectivity/functional_connectivity_spheres.py,sha256=cQHb0QAChrmal5Scx2lVLf9RgWrbtxYHO21RKRcD2sQ,3352
+junifer/markers/functional_connectivity/crossparcellation_functional_connectivity.py,sha256=JN1GezdwR5yQgfsmJ0_jM92QVLecmGR1ihljIm9NLYE,5129
+junifer/markers/functional_connectivity/edge_functional_connectivity_parcels.py,sha256=Hrtq08UDnCxUcSMJrmXVfOjnfzxZOrLSwffd5FsHRqM,3357
+junifer/markers/functional_connectivity/edge_functional_connectivity_spheres.py,sha256=9hWv8_zd74E5nPtoBapwraWV6fIjOAYUiT9Ktd8XBmA,3710
+junifer/markers/functional_connectivity/functional_connectivity_base.py,sha256=iFuAf5vnFgScIiIavILNMpTiJVkTLk1iw6byt2MNsWQ,5067
+junifer/markers/functional_connectivity/functional_connectivity_parcels.py,sha256=_KcmqDgr3snjrbFuvtg8b3hts9bRgdW0-gvJxYgVW40,3050
+junifer/markers/functional_connectivity/functional_connectivity_spheres.py,sha256=dcdRK2MhxiNMSf9ZisgV9GUE8dDwfk-oH9pXCIY7LK8,3448
 junifer/markers/functional_connectivity/tests/test_crossparcellation_functional_connectivity.py,sha256=-CkCWwSbApt6d3DCEC2OhTLXyyySFyYXeWcO4te-z4k,2872
 junifer/markers/functional_connectivity/tests/test_edge_functional_connectivity_parcels.py,sha256=Ir9vZPNU5PoqfzVfy1Mfs5us-juuCegzMO0os2PWVfE,1945
 junifer/markers/functional_connectivity/tests/test_edge_functional_connectivity_spheres.py,sha256=8cjs8BlfjUgzHuu1uODKWtd__Dp81teHEw02ZAqvgBE,2293
-junifer/markers/functional_connectivity/tests/test_functional_connectivity_base.py,sha256=favZGlWE8wRooOOXlO3RNRwjls26DGVz996eQM94izw,490
+junifer/markers/functional_connectivity/tests/test_functional_connectivity_base.py,sha256=RmPTrG0uLKb5RgdHXUnH6lon60FxN1JCtr-dsTBaX28,522
 junifer/markers/functional_connectivity/tests/test_functional_connectivity_parcels.py,sha256=KmbhscwDxk_HbH2MKAXpiRnvj1KFVJZTb2snqcn9a9c,3118
 junifer/markers/functional_connectivity/tests/test_functional_connectivity_spheres.py,sha256=zsiGsZp0Oy7qZOhNjoMafVBST69ET1q7WWITVaaQirc,4170
 junifer/markers/reho/__init__.py,sha256=9IfeAxKEVgMWbhud-8T54Le07I4pR6A29sMKeFtvEPg,189
 junifer/markers/reho/reho_base.py,sha256=z7qFl8x-_NUPYQR7i_3zTH2uA2ImE-Ayn3FMfTVadn8,3619
 junifer/markers/reho/reho_estimator.py,sha256=Ycn__Ir327P4_r1oBJ_d_WXICENHcJxqg1ponUx_r3w,17376
-junifer/markers/reho/reho_parcels.py,sha256=EsY8MCCT_x9vZZQL9ynqK5x-GrTuI4cfOUwqTyXLF78,5555
-junifer/markers/reho/reho_spheres.py,sha256=tMfM_jiIJGH9-bWSlaa8cOuJV-x1THaJ8QqajNkE0s0,5784
+junifer/markers/reho/reho_parcels.py,sha256=eewXe2ApcvI4UnZ1JJZ2hBWM8au1fYwvYHCyOvn_onQ,5651
+junifer/markers/reho/reho_spheres.py,sha256=modxKp6ys_z-GzYszKjwTxsQ9U2md-kvUo1QTZJYtUA,5880
 junifer/markers/reho/tests/test_reho_estimator.py,sha256=Cp8N2FapKQjDxU0Wy-3h6vRHdXAo6CKik84ODzgSQ_U,9100
 junifer/markers/reho/tests/test_reho_parcels.py,sha256=5wDT0u5skCScVuQFeJGq9WJeRTh6h1AB87oS4ejh8nI,4243
 junifer/markers/reho/tests/test_reho_spheres.py,sha256=o77NIkynWcsUJ07BES3S2NDdUNiYOECMgAwTnvmgkmw,4251
-junifer/markers/tests/test_collection.py,sha256=P0Y19QEzQPrhRyo5RfyOpiONlDeCmq9xqQdBmjEEcCc,6740
+junifer/markers/tests/test_collection.py,sha256=R1GlTdxeiVa7-6emQtxWHrrka74UCVUfpyAGUuvXXLk,6850
 junifer/markers/tests/test_ets_rss.py,sha256=xc70Q_9W8e0tIZ5XG_JYbZ8qO8eB0NQ1NFn5UCSY-hw,2619
-junifer/markers/tests/test_marker_utils.py,sha256=LUDO2gH51doc37k7LYl3ai3_mvGdNvGk7_8hiOo-zmk,1440
+junifer/markers/tests/test_marker_utils.py,sha256=SR3ADWI3uGv4ozYqVu-rMZnJVqP6JnjLBgo6qUm16Wk,1478
 junifer/markers/tests/test_markers_base.py,sha256=afn7SRjpb8uNOa6N4_-31JOm4uUl6j4vDb0cYOzkbmo,2196
-junifer/markers/tests/test_parcel_aggregation.py,sha256=MdyyhqGmdJHDxqvKQHq8pM4ZwCpRDe6KVUxBNq3jG6A,15597
-junifer/markers/tests/test_sphere_aggregation.py,sha256=Ijev3JRNXTMB2VFwYXwEq1-Xw0Ei_HCKfHtRamz0TH8,5441
+junifer/markers/tests/test_parcel_aggregation.py,sha256=vgWOX07qi-gsWXfCJFtSvJI07FIsEHXpKXqeK-oTje4,15599
+junifer/markers/tests/test_sphere_aggregation.py,sha256=Ot7-0pas4JpK6XwA1bDDrnB7bo7vKh7hE-hZVAZZobs,5442
 junifer/pipeline/__init__.py,sha256=gOOrLf_C3oe9RdmLLjKMhs2gqtrr5Tzfi_cyTFEp8HM,238
 junifer/pipeline/pipeline_step_mixin.py,sha256=kwqLKmYcdmrAmTHnxImW32O3oMpNSOmJxxVIuUrwyMw,4842
 junifer/pipeline/registry.py,sha256=KavghqdJiCRBF4FYw3NkpL2RegpCfLH2fAY3AWwisaI,3595
@@ -142,10 +142,10 @@ junifer/pipeline/tests/test_pipeline_step_mixin.py,sha256=lthbb53HUObOBUnvO6mMta
 junifer/pipeline/tests/test_registry.py,sha256=XrBx2UaYwoZpjTTc1MWyEb8BD476TFH3JCn6-PPjypk,3864
 junifer/pipeline/tests/test_update_meta_mixin.py,sha256=C9cDTZB-9CN4zYLeSHLSo0dpWrB8o1fj0jlWpcP9Wsc,1374
 junifer/preprocess/__init__.py,sha256=GPbiTHFhb9BzUOSgmo_SpgTFNMmkcCJPhQoUA2MQgJI,255
-junifer/preprocess/base.py,sha256=bm5HLJPJy_qDFgSXHfMjTioSG-qNh6IG-Fdh8OZZic4,4693
+junifer/preprocess/base.py,sha256=VI5hO0VKQW5J2ddpPJpAgqXHfDeoXaQzhbV17TS_gSM,5008
 junifer/preprocess/confounds/__init__.py,sha256=EDlcD9jy8O9xluJr6XOnFXtjGCDVqwg6sDIRDMbM8ZU,235
-junifer/preprocess/confounds/fmriprep_confound_remover.py,sha256=TSxXzg9UTBsOS0Nk2C7PYjTqoDLGpNdUCvWCB9-dnxo,21353
-junifer/preprocess/confounds/tests/test_fmriprep_confound_remover.py,sha256=omW1GtbRC-1cwvKbKLV6UB-32xa4yr_ICGh68uw9Q5M,19349
+junifer/preprocess/confounds/fmriprep_confound_remover.py,sha256=1z7R2ESYcHO2GPn95pa5PUBMEnVExT4__P2k8IM6vNY,21584
+junifer/preprocess/confounds/tests/test_fmriprep_confound_remover.py,sha256=AsQHcCrm98n-BO3MevvmZcVzLbRn5e3YDta9JCJlvtQ,21614
 junifer/preprocess/tests/test_preprocess_base.py,sha256=oWokM9bBx4MYXuN6onKsncOsP17_1Y5EOS2fUX4JT5Y,2559
 junifer/storage/__init__.py,sha256=voc6EDpLAZocPVa0VL2NCEWCZU66IBrFmdStesm3uk8,300
 junifer/storage/base.py,sha256=tpPmqkDcMmH-M2fpj-rhVAOuOzM2tOG6XdPZGDb8N_k,8771
@@ -172,10 +172,10 @@ junifer/utils/fs.py,sha256=Jd9AoV2fIF7pT7KhXsn8T1O1fJ1_SFZgaFuOBAM7DG8,460
 junifer/utils/logging.py,sha256=F2C6y5cNAb3OCVmBdiD8YW_tAknc8EeX_SgKewxcCEA,8852
 junifer/utils/tests/test_fs.py,sha256=o7XTk6OpafppxE4Kx_pDaUfYRt_bU_e1M86FTl5TPVk,862
 junifer/utils/tests/test_logging.py,sha256=uTzlwwlOv7bh_7DngitVFxCDbH_OWsqfeXEcNyKvF24,7748
-junifer-0.0.2.dev138.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.2.dev138.dist-info/LICENSE.md,sha256=z5aMVBrc-9kk0pxaOdOAkI62S5YhYMiF6ADsMtZmOZg,34353
-junifer-0.0.2.dev138.dist-info/METADATA,sha256=gzR0aatU5orYS3f3xNowMeiD95lH_nvs2Uj-eU5rbD8,5656
-junifer-0.0.2.dev138.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-junifer-0.0.2.dev138.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
-junifer-0.0.2.dev138.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.2.dev138.dist-info/RECORD,,
+junifer-0.0.2.dev140.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.2.dev140.dist-info/LICENSE.md,sha256=z5aMVBrc-9kk0pxaOdOAkI62S5YhYMiF6ADsMtZmOZg,34353
+junifer-0.0.2.dev140.dist-info/METADATA,sha256=fmFDkC4Bep5p-M_2Om4eDnyOmYbfuw9bW8S9KwjFFPo,5656
+junifer-0.0.2.dev140.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+junifer-0.0.2.dev140.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
+junifer-0.0.2.dev140.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.2.dev140.dist-info/RECORD,,