junifer 0.0.4.dev810__py3-none-any.whl → 0.0.4.dev821__py3-none-any.whl

junifer/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.4.dev810'
-__version_tuple__ = version_tuple = (0, 0, 4, 'dev810')
+__version__ = version = '0.0.4.dev821'
+__version_tuple__ = version_tuple = (0, 0, 4, 'dev821')

junifer/api/functions.py

@@ -165,6 +165,8 @@ def run(
         preprocessors=built_preprocessors,
         storage=storage_object,
     )
+    mc.validate(datagrabber_object)
+
     # Fit elements
     with datagrabber_object:
         if elements is not None:

junifer/configs/juseless/datagrabbers/tests/test_ucla.py

@@ -29,9 +29,9 @@ def test_JuselessUCLA() -> None:
             "BOLD",
             "BOLD_confounds",
             "T1w",
-            "probseg_CSF",
-            "probseg_GM",
-            "probseg_WM",
+            "VBM_CSF",
+            "VBM_GM",
+            "VBM_WM",
         ]
 
         for t in types:
@@ -45,12 +45,12 @@ def test_JuselessUCLA() -> None:
         "BOLD",
         "BOLD_confounds",
         "T1w",
-        "probseg_CSF",
-        "probseg_GM",
-        "probseg_WM",
+        "VBM_CSF",
+        "VBM_GM",
+        "VBM_WM",
         ["BOLD", "BOLD_confounds"],
-        ["T1w", "probseg_CSF"],
-        ["probseg_GM", "probseg_WM"],
+        ["T1w", "VBM_CSF"],
+        ["VBM_GM", "VBM_WM"],
         ["BOLD", "T1w"],
     ],
 )

junifer/configs/juseless/datagrabbers/ucla.py

@@ -23,8 +23,8 @@ class JuselessUCLA(PatternDataGrabber):
     datadir : str or Path, optional
         The directory where the dataset is stored.
         (default "/data/project/psychosis_thalamus/data/fmriprep").
-    types: {"BOLD", "BOLD_confounds", "T1w", "probseg_CSF", "probseg_GM", \
-           "probseg_WM"} or a list of the options, optional
+    types: {"BOLD", "BOLD_confounds", "T1w", "VBM_CSF", "VBM_GM", \
+           "VBM_WM"} or a list of the options, optional
         UCLA data types. If None, all available data types are selected.
         (default None).
     tasks : {"rest", "bart", "bht", "pamenc", "pamret", \
@@ -91,21 +91,21 @@ class JuselessUCLA(PatternDataGrabber):
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_CSF": {
+            "VBM_CSF": {
                 "pattern": (
                     "sub-{subject}/anat/sub-{subject}_T1w_space-"
                     "MNI152NLin2009cAsym_class-CSF_probtissue.nii.gz"
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_GM": {
+            "VBM_GM": {
                 "pattern": (
                     "sub-{subject}/anat/sub-{subject}_T1w_space-"
                     "MNI152NLin2009cAsym_class-GM_probtissue.nii.gz"
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_WM": {
+            "VBM_WM": {
                 "pattern": (
                     "sub-{subject}/anat/sub-{subject}_T1w_space"
                     "-MNI152NLin2009cAsym_class-WM_probtissue.nii.gz"

junifer/datagrabber/aomic/id1000.py

@@ -24,8 +24,8 @@ class DataladAOMICID1000(PatternDataladDataGrabber):
         The directory where the datalad dataset will be cloned. If None,
         the datalad dataset will be cloned into a temporary directory
         (default None).
-    types: {"BOLD", "BOLD_confounds", "T1w", "probseg_CSF", "probseg_GM", \
-           "probseg_WM", "DWI"} or a list of the options, optional
+    types: {"BOLD", "BOLD_confounds", "T1w", "VBM_CSF", "VBM_GM", \
+           "VBM_WM", "DWI"} or a list of the options, optional
         AOMIC data types. If None, all available data types are selected.
         (default None).
     native_t1w : bool, optional
@@ -84,7 +84,7 @@ class DataladAOMICID1000(PatternDataladDataGrabber):
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_CSF": {
+            "VBM_CSF": {
                 "pattern": (
                     "derivatives/fmriprep/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-"
@@ -92,7 +92,7 @@ class DataladAOMICID1000(PatternDataladDataGrabber):
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_GM": {
+            "VBM_GM": {
                 "pattern": (
                     "derivatives/fmriprep/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-"
@@ -100,7 +100,7 @@ class DataladAOMICID1000(PatternDataladDataGrabber):
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_WM": {
+            "VBM_WM": {
                 "pattern": (
                     "derivatives/fmriprep/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-"

junifer/datagrabber/aomic/piop1.py

@@ -26,8 +26,8 @@ class DataladAOMICPIOP1(PatternDataladDataGrabber):
         The directory where the datalad dataset will be cloned. If None,
         the datalad dataset will be cloned into a temporary directory
         (default None).
-    types: {"BOLD", "BOLD_confounds", "T1w", "probseg_CSF", "probseg_GM", \
-           "probseg_WM", "DWI"} or a list of the options, optional
+    types: {"BOLD", "BOLD_confounds", "T1w", "VBM_CSF", "VBM_GM", \
+           "VBM_WM", "DWI"} or a list of the options, optional
         AOMIC data types. If None, all available data types are selected.
         (default None).
     tasks : {"restingstate", "anticipation", "emomatching", "faces", \
@@ -119,7 +119,7 @@ class DataladAOMICPIOP1(PatternDataladDataGrabber):
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_CSF": {
+            "VBM_CSF": {
                 "pattern": (
                     "derivatives/fmriprep/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-"
@@ -127,7 +127,7 @@ class DataladAOMICPIOP1(PatternDataladDataGrabber):
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_GM": {
+            "VBM_GM": {
                 "pattern": (
                     "derivatives/fmriprep/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-"
@@ -135,7 +135,7 @@ class DataladAOMICPIOP1(PatternDataladDataGrabber):
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_WM": {
+            "VBM_WM": {
                 "pattern": (
                     "derivatives/fmriprep/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-"

junifer/datagrabber/aomic/piop2.py

@@ -26,8 +26,8 @@ class DataladAOMICPIOP2(PatternDataladDataGrabber):
         The directory where the datalad dataset will be cloned. If None,
         the datalad dataset will be cloned into a temporary directory
         (default None).
-    types: {"BOLD", "BOLD_confounds", "T1w", "probseg_CSF", "probseg_GM", \
-           "probseg_WM", "DWI"} or a list of the options, optional
+    types: {"BOLD", "BOLD_confounds", "T1w", "VBM_CSF", "VBM_GM", \
+           "VBM_WM", "DWI"} or a list of the options, optional
         AOMIC data types. If None, all available data types are selected.
         (default None).
     tasks : {"restingstate", "stopsignal", "workingmemory"} \
@@ -116,7 +116,7 @@ class DataladAOMICPIOP2(PatternDataladDataGrabber):
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_CSF": {
+            "VBM_CSF": {
                 "pattern": (
                     "derivatives/fmriprep/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-"
@@ -124,7 +124,7 @@ class DataladAOMICPIOP2(PatternDataladDataGrabber):
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_GM": {
+            "VBM_GM": {
                 "pattern": (
                     "derivatives/fmriprep/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-"
@@ -132,7 +132,7 @@ class DataladAOMICPIOP2(PatternDataladDataGrabber):
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_WM": {
+            "VBM_WM": {
                 "pattern": (
                     "derivatives/fmriprep/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-"

junifer/datagrabber/aomic/tests/test_id1000.py

@@ -71,41 +71,41 @@ def test_DataladAOMICID1000() -> None:
         # asserts T1w_mask
         assert out["T1w_mask"]["path"].exists()
 
-        # asserts type "probseg_CSF"
-        assert "probseg_CSF" in out
+        # asserts type "VBM_CSF"
+        assert "VBM_CSF" in out
 
         assert (
-            out["probseg_CSF"]["path"].name
+            out["VBM_CSF"]["path"].name
             == f"sub-{test_element}_space-MNI152NLin2009cAsym_label-"
             "CSF_probseg.nii.gz"
         )
 
-        assert out["probseg_CSF"]["path"].exists()
-        assert out["probseg_CSF"]["path"].is_file()
+        assert out["VBM_CSF"]["path"].exists()
+        assert out["VBM_CSF"]["path"].is_file()
 
-        # asserts type "probseg_GM"
-        assert "probseg_GM" in out
+        # asserts type "VBM_GM"
+        assert "VBM_GM" in out
 
         assert (
-            out["probseg_GM"]["path"].name
+            out["VBM_GM"]["path"].name
             == f"sub-{test_element}_space-MNI152NLin2009cAsym_label-"
             "GM_probseg.nii.gz"
         )
 
-        assert out["probseg_GM"]["path"].exists()
-        assert out["probseg_GM"]["path"].is_file()
+        assert out["VBM_GM"]["path"].exists()
+        assert out["VBM_GM"]["path"].is_file()
 
-        # asserts type "probseg_WM"
-        assert "probseg_WM" in out
+        # asserts type "VBM_WM"
+        assert "VBM_WM" in out
 
         assert (
-            out["probseg_WM"]["path"].name
+            out["VBM_WM"]["path"].name
             == f"sub-{test_element}_space-MNI152NLin2009cAsym_label-"
             "WM_probseg.nii.gz"
         )
 
-        assert out["probseg_WM"]["path"].exists()
-        assert out["probseg_WM"]["path"].is_file()
+        assert out["VBM_WM"]["path"].exists()
+        assert out["VBM_WM"]["path"].is_file()
 
         # asserts type "DWI"
         assert "DWI" in out
@@ -132,13 +132,13 @@ def test_DataladAOMICID1000() -> None:
         "BOLD",
         "BOLD_confounds",
         "T1w",
-        "probseg_CSF",
-        "probseg_GM",
-        "probseg_WM",
+        "VBM_CSF",
+        "VBM_GM",
+        "VBM_WM",
         "DWI",
         ["BOLD", "BOLD_confounds"],
-        ["T1w", "probseg_CSF"],
-        ["probseg_GM", "probseg_WM"],
+        ["T1w", "VBM_CSF"],
+        ["VBM_GM", "VBM_WM"],
         ["DWI", "BOLD"],
     ],
 )

junifer/datagrabber/aomic/tests/test_piop1.py

@@ -91,41 +91,41 @@ def test_DataladAOMICPIOP1(tasks: Optional[str]) -> None:
         # asserts T1w_mask
         assert out["T1w_mask"]["path"].exists()
 
-        # asserts type "probseg_CSF"
-        assert "probseg_CSF" in out
+        # asserts type "VBM_CSF"
+        assert "VBM_CSF" in out
 
         assert (
-            out["probseg_CSF"]["path"].name
+            out["VBM_CSF"]["path"].name
             == f"sub-{sub}_space-MNI152NLin2009cAsym_label-"
             "CSF_probseg.nii.gz"
         )
 
-        assert out["probseg_CSF"]["path"].exists()
-        assert out["probseg_CSF"]["path"].is_file()
+        assert out["VBM_CSF"]["path"].exists()
+        assert out["VBM_CSF"]["path"].is_file()
 
-        # asserts type "probseg_GM"
-        assert "probseg_GM" in out
+        # asserts type "VBM_GM"
+        assert "VBM_GM" in out
 
         assert (
-            out["probseg_GM"]["path"].name
+            out["VBM_GM"]["path"].name
             == f"sub-{sub}_space-MNI152NLin2009cAsym_label-"
             "GM_probseg.nii.gz"
         )
 
-        assert out["probseg_GM"]["path"].exists()
-        assert out["probseg_GM"]["path"].is_file()
+        assert out["VBM_GM"]["path"].exists()
+        assert out["VBM_GM"]["path"].is_file()
 
-        # asserts type "probseg_WM"
-        assert "probseg_WM" in out
+        # asserts type "VBM_WM"
+        assert "VBM_WM" in out
 
         assert (
-            out["probseg_WM"]["path"].name
+            out["VBM_WM"]["path"].name
             == f"sub-{sub}_space-MNI152NLin2009cAsym_label-"
             "WM_probseg.nii.gz"
         )
 
-        assert out["probseg_WM"]["path"].exists()
-        assert out["probseg_WM"]["path"].is_file()
+        assert out["VBM_WM"]["path"].exists()
+        assert out["VBM_WM"]["path"].is_file()
 
         # asserts type "DWI"
         assert "DWI" in out
@@ -149,13 +149,13 @@ def test_DataladAOMICPIOP1(tasks: Optional[str]) -> None:
         "BOLD",
         "BOLD_confounds",
         "T1w",
-        "probseg_CSF",
-        "probseg_GM",
-        "probseg_WM",
+        "VBM_CSF",
+        "VBM_GM",
+        "VBM_WM",
         "DWI",
         ["BOLD", "BOLD_confounds"],
-        ["T1w", "probseg_CSF"],
-        ["probseg_GM", "probseg_WM"],
+        ["T1w", "VBM_CSF"],
+        ["VBM_GM", "VBM_WM"],
         ["DWI", "BOLD"],
     ],
 )

junifer/datagrabber/aomic/tests/test_piop2.py

@@ -85,41 +85,41 @@ def test_DataladAOMICPIOP2(tasks: Optional[str]) -> None:
         # asserts T1w_mask
         assert out["T1w_mask"]["path"].exists()
 
-        # asserts type "probseg_CSF"
-        assert "probseg_CSF" in out
+        # asserts type "VBM_CSF"
+        assert "VBM_CSF" in out
 
         assert (
-            out["probseg_CSF"]["path"].name
+            out["VBM_CSF"]["path"].name
             == f"sub-{sub}_space-MNI152NLin2009cAsym_label-"
             "CSF_probseg.nii.gz"
         )
 
-        assert out["probseg_CSF"]["path"].exists()
-        assert out["probseg_CSF"]["path"].is_file()
+        assert out["VBM_CSF"]["path"].exists()
+        assert out["VBM_CSF"]["path"].is_file()
 
-        # asserts type "probseg_GM"
-        assert "probseg_GM" in out
+        # asserts type "VBM_GM"
+        assert "VBM_GM" in out
 
         assert (
-            out["probseg_GM"]["path"].name
+            out["VBM_GM"]["path"].name
             == f"sub-{sub}_space-MNI152NLin2009cAsym_label-"
             "GM_probseg.nii.gz"
         )
 
-        assert out["probseg_GM"]["path"].exists()
-        assert out["probseg_GM"]["path"].is_file()
+        assert out["VBM_GM"]["path"].exists()
+        assert out["VBM_GM"]["path"].is_file()
 
-        # asserts type "probseg_WM"
-        assert "probseg_WM" in out
+        # asserts type "VBM_WM"
+        assert "VBM_WM" in out
 
         assert (
-            out["probseg_WM"]["path"].name
+            out["VBM_WM"]["path"].name
             == f"sub-{sub}_space-MNI152NLin2009cAsym_label-"
             "WM_probseg.nii.gz"
         )
 
-        assert out["probseg_WM"]["path"].exists()
-        assert out["probseg_WM"]["path"].is_file()
+        assert out["VBM_WM"]["path"].exists()
+        assert out["VBM_WM"]["path"].is_file()
 
         # asserts type "DWI"
         assert "DWI" in out
@@ -143,13 +143,13 @@ def test_DataladAOMICPIOP2(tasks: Optional[str]) -> None:
         "BOLD",
         "BOLD_confounds",
         "T1w",
-        "probseg_CSF",
-        "probseg_GM",
-        "probseg_WM",
+        "VBM_CSF",
+        "VBM_GM",
+        "VBM_WM",
         "DWI",
         ["BOLD", "BOLD_confounds"],
-        ["T1w", "probseg_CSF"],
-        ["probseg_GM", "probseg_WM"],
+        ["T1w", "VBM_CSF"],
+        ["VBM_GM", "VBM_WM"],
         ["DWI", "BOLD"],
     ],
 )

junifer/datagrabber/dmcc13_benchmark.py

@@ -25,8 +25,8 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
         The directory where the datalad dataset will be cloned. If None,
         the datalad dataset will be cloned into a temporary directory
         (default None).
-    types: {"BOLD", "BOLD_confounds", "T1w", "probseg_CSF", "probseg_GM", \
-           "probseg_WM"} or a list of the options, optional
+    types: {"BOLD", "BOLD_confounds", "T1w", "VBM_CSF", "VBM_GM", \
+           "VBM_WM"} or a list of the options, optional
         DMCC data types. If None, all available data types are selected.
         (default None).
     sessions: {"wave1bas", "wave1pro", "wave1rea"} or list of the options, \
@@ -181,21 +181,21 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_CSF": {
+            "VBM_CSF": {
                 "pattern": (
                     "derivatives/fmriprep-1.3.2/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz"
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_GM": {
+            "VBM_GM": {
                 "pattern": (
                     "derivatives/fmriprep-1.3.2/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz"
                 ),
                 "space": "MNI152NLin2009cAsym",
             },
-            "probseg_WM": {
+            "VBM_WM": {
                 "pattern": (
                     "derivatives/fmriprep-1.3.2/sub-{subject}/anat/"
                     "sub-{subject}_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz"

junifer/datagrabber/tests/test_dmcc13_benchmark.py

@@ -95,9 +95,9 @@ def test_DMCC13Benchmark(
             "BOLD",
             "BOLD_confounds",
             "BOLD_mask",
-            "probseg_CSF",
-            "probseg_GM",
-            "probseg_WM",
+            "VBM_CSF",
+            "VBM_GM",
+            "VBM_WM",
             "T1w",
             "T1w_mask",
         ]
@@ -159,18 +159,18 @@ def test_DMCC13Benchmark(
         ("BOLD", False),
         ("T1w", True),
         ("T1w", False),
-        ("probseg_CSF", True),
-        ("probseg_CSF", False),
-        ("probseg_GM", True),
-        ("probseg_GM", False),
-        ("probseg_WM", True),
-        ("probseg_WM", False),
+        ("VBM_CSF", True),
+        ("VBM_CSF", False),
+        ("VBM_GM", True),
+        ("VBM_GM", False),
+        ("VBM_WM", True),
+        ("VBM_WM", False),
         (["BOLD", "BOLD_confounds"], True),
         (["BOLD", "BOLD_confounds"], False),
-        (["T1w", "probseg_CSF"], True),
-        (["T1w", "probseg_CSF"], False),
-        (["probseg_GM", "probseg_WM"], True),
-        (["probseg_GM", "probseg_WM"], False),
+        (["T1w", "VBM_CSF"], True),
+        (["T1w", "VBM_CSF"], False),
+        (["VBM_GM", "VBM_WM"], True),
+        (["VBM_GM", "VBM_WM"], False),
     ],
 )
 def test_DMCC13Benchmark_partial_data_access(

junifer/datagrabber/utils.py

@@ -51,15 +51,7 @@ PATTERNS_SCHEMA = {
         "mandatory": ["pattern", "space"],
         "optional": [],
     },
-    "probseg_CSF": {
-        "mandatory": ["pattern", "space"],
-        "optional": [],
-    },
-    "probseg_GM": {
-        "mandatory": ["pattern", "space"],
-        "optional": [],
-    },
-    "probseg_WM": {
+    "VBM_CSF": {
         "mandatory": ["pattern", "space"],
         "optional": [],
     },

junifer/markers/parcel_aggregation.py

@@ -42,8 +42,8 @@ class ParcelAggregation(BaseMarker):
         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).
-    on : {"T1w", "BOLD", "VBM_GM", "VBM_WM", "fALFF", "GCOR", "LCOR"} \
-         or list of the options, optional
+    on : {"T1w", "T2w", "BOLD", "VBM_GM", "VBM_WM", "VBM_CSF", "fALFF", \
+        "GCOR", "LCOR"} or list of the options, optional
         The data types to apply the marker to. If None, will work on all
         available data (default None).
     name : str, optional
@@ -102,7 +102,17 @@ class ParcelAggregation(BaseMarker):
             The list of data types that can be used as input for this marker.
 
         """
-        return ["T1w", "BOLD", "VBM_GM", "VBM_WM", "fALFF", "GCOR", "LCOR"]
+        return [
+            "T1w",
+            "T2w",
+            "BOLD",
+            "VBM_GM",
+            "VBM_WM",
+            "VBM_CSF",
+            "fALFF",
+            "GCOR",
+            "LCOR",
+        ]
 
     def get_output_type(self, input_type: str) -> str:
         """Get output type.
@@ -124,7 +134,14 @@ class ParcelAggregation(BaseMarker):
 
         """
 
-        if input_type in ["VBM_GM", "VBM_WM", "fALFF", "GCOR", "LCOR"]:
+        if input_type in [
+            "VBM_GM",
+            "VBM_WM",
+            "VBM_CSF",
+            "fALFF",
+            "GCOR",
+            "LCOR",
+        ]:
             return "vector"
         elif input_type == "BOLD":
             return "timeseries"

junifer/markers/sphere_aggregation.py

@@ -47,8 +47,8 @@ class SphereAggregation(BaseMarker):
         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).
-    on : {"T1w", "BOLD", "VBM_GM", "VBM_WM", "fALFF", "GCOR", "LCOR"} or \
-         list of the options, optional
+    on : {"T1w", "T2w", "BOLD", "VBM_GM", "VBM_WM", "VBM_CSF", "fALFF", \
+        "GCOR", "LCOR"} or list of the options, optional
         The data types to apply the marker to. If None, will work on all
         available data (default None).
     name : str, optional
@@ -109,7 +109,17 @@ class SphereAggregation(BaseMarker):
             The list of data types that can be used as input for this marker.
 
         """
-        return ["T1w", "BOLD", "VBM_GM", "VBM_WM", "fALFF", "GCOR", "LCOR"]
+        return [
+            "T1w",
+            "T2w",
+            "BOLD",
+            "VBM_GM",
+            "VBM_WM",
+            "VBM_CSF",
+            "fALFF",
+            "GCOR",
+            "LCOR",
+        ]
 
     def get_output_type(self, input_type: str) -> str:
         """Get output type.
@@ -131,7 +141,14 @@ class SphereAggregation(BaseMarker):
 
         """
 
-        if input_type in ["VBM_GM", "VBM_WM", "fALFF", "GCOR", "LCOR"]:
+        if input_type in [
+            "VBM_GM",
+            "VBM_WM",
+            "VBM_CSF",
+            "fALFF",
+            "GCOR",
+            "LCOR",
+        ]:
             return "vector"
         elif input_type == "BOLD":
             return "timeseries"

junifer/preprocess/warping/space_warper.py

@@ -34,8 +34,8 @@ class SpaceWarper(BasePreprocessor):
         type like ``"T1w"`` or a template space like ``"MNI152NLin2009cAsym"``.
         Use ``"T1w"`` for native space warping and named templates for
         template space warping.
-    on : {"T1w", "BOLD", "VBM_GM", "VBM_WM", "fALFF", "GCOR", "LCOR"} or list \
-         of the options
+    on : {"T1w", "T2w", "BOLD", "VBM_GM", "VBM_WM", "VBM_CSF", "fALFF", \
+        "GCOR", "LCOR"} or list of the options
         The data type to warp.
 
     Raises
@@ -98,7 +98,17 @@ class SpaceWarper(BasePreprocessor):
             preprocessor.
 
         """
-        return ["T1w", "BOLD", "VBM_GM", "VBM_WM", "fALFF", "GCOR", "LCOR"]
+        return [
+            "T1w",
+            "T2w",
+            "BOLD",
+            "VBM_GM",
+            "VBM_WM",
+            "VBM_CSF",
+            "fALFF",
+            "GCOR",
+            "LCOR",
+        ]
 
     def get_output_type(self, input_type: str) -> str:
         """Get output type.

{junifer-0.0.4.dev810.dist-info → junifer-0.0.4.dev821.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.4.dev810
+Version: 0.0.4.dev821
 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.4.dev810.dist-info → junifer-0.0.4.dev821.dist-info}/RECORD

@@ -1,10 +1,10 @@
 junifer/__init__.py,sha256=x1UR2jUcrUdm2HNl-3Qvyi4UUrU6ms5qm2qcmNY7zZk,391
-junifer/_version.py,sha256=wpjRI9-VO7PV-1Clwfc-ELqAdZFl5dG37458e4_wpfA,428
+junifer/_version.py,sha256=7R70gnPY70g1d5z-hP_oxweFmYhsTV8C7iLa_yffnkI,428
 junifer/stats.py,sha256=sU5IZ2qFZWbzgSutQS_z42miIVItpSGmQYBn6KkD5fA,6162
 junifer/api/__init__.py,sha256=YILu9M7SC0Ri4CVd90fELH2OnK_gvCYAXCoqBNCFE8E,257
 junifer/api/cli.py,sha256=auw38tIH7ipTnaADM7on0or7zauY-BFII8nd-eRUEJs,13664
 junifer/api/decorators.py,sha256=8bnwHPAe7VgzKxl--M_e0umdAlTVSzaJQHEJZ5kof5k,2580
-junifer/api/functions.py,sha256=bH8tkbkpZmU8jiQqvSsbIRp-B__Uie0BNZy_yVwRzs8,11579
+junifer/api/functions.py,sha256=N59KM2GqxIwMU2tXc44oYCqogclgqD45qI_ULrfGYDQ,11616
 junifer/api/parser.py,sha256=a3SSC2xO-PF1pqXZXFq8Sh9aVd-dmHolJbCkGyOUTAM,4416
 junifer/api/utils.py,sha256=dyjTdPMwX9qeCrn8SQT2Pjshfnu-y1FEyujV7lCzvm0,3333
 junifer/api/queue_context/__init__.py,sha256=x0fT0ax-jPI0Fefg2quJ6VCIwhJ9rUQEjCNqxDXw7WM,287
@@ -42,12 +42,12 @@ junifer/configs/juseless/datagrabbers/__init__.py,sha256=tqCLmelWqB1xfElvknnaJ5o
 junifer/configs/juseless/datagrabbers/aomic_id1000_vbm.py,sha256=HNyfxjU_D7hkwnaeSW1r_PllOlc3phBq2LP25zZGziE,1474
 junifer/configs/juseless/datagrabbers/camcan_vbm.py,sha256=PtzjrfL2b6nxXLQ4TU8cKftHnD4g7nk4bf2ib6WLqGg,1505
 junifer/configs/juseless/datagrabbers/ixi_vbm.py,sha256=OE2D311Sfey0DrfoKqWB_hFIBApzP3-r1M9sliKZPC4,2309
-junifer/configs/juseless/datagrabbers/ucla.py,sha256=44T9JMJ4usowRib9V6EqdTRQy_2xkAWZpEmmoFWF4Mg,4915
+junifer/configs/juseless/datagrabbers/ucla.py,sha256=QtCA1X2JGv3EJE7kDbmSwkEvAjTm5XwpACPazBXhFqQ,4891
 junifer/configs/juseless/datagrabbers/ukb_vbm.py,sha256=lb9pLXFnlMOeQUX-BBFD9dKECdaU2bEIHA-iD9KkOAQ,1489
 junifer/configs/juseless/datagrabbers/tests/test_aomic_id1000_vbm.py,sha256=Y_npFmmj0MN0TYv8jaxVMgFHLMQLZ8vXl8lWQKvOYbc,1001
 junifer/configs/juseless/datagrabbers/tests/test_camcan_vbm.py,sha256=o0dzptS97pxrWaY7I1m0dpJtsnAwmIXNqdU9ABTWCqI,975
 junifer/configs/juseless/datagrabbers/tests/test_ixi_vbm.py,sha256=8jxpNZelXwpJGvA5LOfpso2X8yt1chvERAYmv76hS_g,1252
-junifer/configs/juseless/datagrabbers/tests/test_ucla.py,sha256=e-jdvcZ9B0mka6_573JJU_cGwSaUV54U8X_n0UadtJY,3351
+junifer/configs/juseless/datagrabbers/tests/test_ucla.py,sha256=fFxllR0yvt7hiQYdSXJkl9_05UwemKfcp1vC6xf0X-U,3315
 junifer/configs/juseless/datagrabbers/tests/test_ukb_vbm.py,sha256=b9hjc1mgO--PSRC3id2EzzfE2yWNsuZ2UI47a6sfGZU,1025
 junifer/data/__init__.py,sha256=1E6JtzpnjjA0IutkJkarEik9NhCP9PPI6K0-37XDZVg,602
 junifer/data/coordinates.py,sha256=Y_-gGCvIqxjArGf-E6LmYzz6ZIbG0ugw5NjgIeirXuA,12850
@@ -85,18 +85,18 @@ junifer/data/tests/test_template_spaces.py,sha256=PJulN7xHpAcSOTY-UzTG_WPywZEBSl
 junifer/datagrabber/__init__.py,sha256=pZHJIY8nAlbVngsyRScE6a6GKbytiwjJB7SdJNqIbl4,680
 junifer/datagrabber/base.py,sha256=KgMSKfkwd4yLW4PhoJDoWMgcDkGmDoIs6jkgKyOJd9A,6303
 junifer/datagrabber/datalad_base.py,sha256=SsGUJdefdDgAJARBG5kHcbLK2CvvnoEto0TpGZUgnWE,10659
-junifer/datagrabber/dmcc13_benchmark.py,sha256=ybgjJbl_4MD70FzhWUr_LvUZyjEft2_FYvLXI2kW64I,12896
+junifer/datagrabber/dmcc13_benchmark.py,sha256=vXpMWSFbqAIUm9tNCSrpMZeOzOEjls6YAyoCR0kLZlA,12872
 junifer/datagrabber/multiple.py,sha256=eXQIsvSNvD8GuEITjMaMoi1GwoeyWXXbQMRi-f2qgc4,4923
 junifer/datagrabber/pattern.py,sha256=5XQe0k3iiTID5fbUsShjFKaqkueuPU34ZpzOi1JzFEw,12700
 junifer/datagrabber/pattern_datalad.py,sha256=y9ptDZEhSj41pf05WNySrj8j4kbi5uIXveFXv4dkKpk,4092
-junifer/datagrabber/utils.py,sha256=aiaWMBAGsZ5VPgOXeUHralLnAoI3fs0inyHbv8K2Km8,7157
+junifer/datagrabber/utils.py,sha256=NseewPJvhc0h7Ueyfi_KRUwFfs2V7HspBtYL2Xr9Dik,6965
 junifer/datagrabber/aomic/__init__.py,sha256=R7yrRVBWsBW25CH0fw-KHpFwb_EC-MlPKDzssGfj5A0,281
-junifer/datagrabber/aomic/id1000.py,sha256=qO2WRq8CcK-cwohigqRewKHjAB75QZIhlqwK1hXWAs0,6125
-junifer/datagrabber/aomic/piop1.py,sha256=kYdDbDqSj-pQ12JY7RfD0OtUEkQS1YNivnzAjOaGaF8,8544
-junifer/datagrabber/aomic/piop2.py,sha256=ZHd3smD0pibBGbU170pDufLa1-TM7JlBVzWPjX1Uaq4,8163
-junifer/datagrabber/aomic/tests/test_id1000.py,sha256=eejuGiNQdX_s_8klGROd8OD8O5OprQywWN6O-JU3jD4,4824
-junifer/datagrabber/aomic/tests/test_piop1.py,sha256=Trp905MCT4jhnCg1leP0PzpEVc_icoKJZrI0TwVCwSE,5578
-junifer/datagrabber/aomic/tests/test_piop2.py,sha256=KAMU8eoQbKV3n9qRWbpZ24g-qN9uzZ55ZlofcSB9BIA,5377
+junifer/datagrabber/aomic/id1000.py,sha256=9gRd90joMg9hrgE8b8MCCuelD4IUK8hAVAB4hLxLkC4,6101
+junifer/datagrabber/aomic/piop1.py,sha256=O4NIjohmAMrlm2lniVVUOkIDLq8eSnVA85wA2hek7FY,8520
+junifer/datagrabber/aomic/piop2.py,sha256=grIz2-a4ZjbrejLk5OysOr-0ydKYkBAj6GkxGnu4kIY,8139
+junifer/datagrabber/aomic/tests/test_id1000.py,sha256=JdHxnJOX4xdXzxrICUXcs0w3T4NvCr4HL9vqz9Yvoh0,4740
+junifer/datagrabber/aomic/tests/test_piop1.py,sha256=7_GT1GEItIISiTv2XjY80BtXFw6JsI_5ZjSdQD6y24M,5494
+junifer/datagrabber/aomic/tests/test_piop2.py,sha256=E2F-jAVFUYcJLoUZ7mfw8ittBhk_KwxzBKSONnVsFuw,5293
 junifer/datagrabber/hcp1200/__init__.py,sha256=zy4Qq1_m3vECEhioG-UDteco2b5cni_8xuElICaRtt4,189
 junifer/datagrabber/hcp1200/datalad_hcp1200.py,sha256=p5Bbg09qoM46km9eFSlspwLwOe6LMJFSIZ9NC9E2lmc,2432
 junifer/datagrabber/hcp1200/hcp1200.py,sha256=ohXHmrQHWjqRZSEXI6E5zla1d_t6LZTbv-cAj79w3PU,6091
@@ -104,7 +104,7 @@ junifer/datagrabber/hcp1200/tests/test_hcp1200.py,sha256=KJ-Jq01l0a6TaboG898qjBd
 junifer/datagrabber/tests/test_base.py,sha256=fZdVhNhvfht9lpTHrAUf5E6mAfNNUP7OTQ5KLaBQ1gI,3506
 junifer/datagrabber/tests/test_datagrabber_utils.py,sha256=SR2Zc9DJaCtuULhqCz10JCK7zc4VGnAcKT2pxloM1ys,6311
 junifer/datagrabber/tests/test_datalad_base.py,sha256=SYxUB9_4YPMfrb7iJM-aJCWbGa3EJfYz31wAUCNa03s,16285
-junifer/datagrabber/tests/test_dmcc13_benchmark.py,sha256=24T2ioumTTWC2xMrt7hbuasOY_KfFrJ61ztDxa23TFU,8123
+junifer/datagrabber/tests/test_dmcc13_benchmark.py,sha256=5aTfsjfOK1cvhDm2Qb9UtHdkFJbzOezB7czCX6xjsg0,8063
 junifer/datagrabber/tests/test_multiple.py,sha256=Mx3xfDrQiWG2W5MW24P5L2XiSeALpJ2-jFlzWkKtu9w,5659
 junifer/datagrabber/tests/test_pattern.py,sha256=Zmwg79f-qs6AEPVoFpooOquK7rm1hsmgkzuo11BG5PE,8019
 junifer/datagrabber/tests/test_pattern_datalad.py,sha256=hxw_aXBwHjUo-aUrHescBA2dn1bSJxh-0oV8495iIEA,6483
@@ -124,8 +124,8 @@ junifer/markers/__init__.py,sha256=exUUmpDsPkoNa9FK6Y7pDusOYv56_zoci8hiOaxyswE,7
 junifer/markers/base.py,sha256=Af8TyoNAIHWREZkIgi2su6PUqoloJXVGT-KW13WlWUM,6370
 junifer/markers/collection.py,sha256=eD6_IJ3y-9lcN4r0ORZqgr2ICjHyTvlAKyh0HKPYqzk,5247
 junifer/markers/ets_rss.py,sha256=7fr6mmbMM5NKIDV6bUyyu-pwHJH56GwYv6oozK4EX6k,4557
-junifer/markers/parcel_aggregation.py,sha256=F059dbrow2v8MREm2l29mbPg2_PcSwfNalbUJOwaFsE,8420
-junifer/markers/sphere_aggregation.py,sha256=bnX9aiHf8pon47QVA0BiFOZV1Bgpyy4doPh2K0Nl9OA,8027
+junifer/markers/parcel_aggregation.py,sha256=e0RM8-8Z5G7gdVdkB6GbreRLY2jvrM8rcTDzq65sv5g,8668
+junifer/markers/sphere_aggregation.py,sha256=3gC8-Z0qbX2y_q-YbwpnPll6lmKZY5V-DdQQA7tFzWc,8275
 junifer/markers/utils.py,sha256=b6Bt_isqsOD2OF7oHvEpHyilauxYZzyz8YcbGWq6J4A,3833
 junifer/markers/complexity/__init__.py,sha256=nzL6GpVlFhMDaWyJ-ZtpPx940LUSAUmYcyqLoQ7K1-E,818
 junifer/markers/complexity/complexity_base.py,sha256=Lb8UnWoeplZg1-SdS5GLMq_pY5Qow3JSciQMtZRNhAo,4405
@@ -217,7 +217,7 @@ junifer/preprocess/tests/test_preprocess_base.py,sha256=-0rpe8QjqYES36H6MHuDs3cv
 junifer/preprocess/warping/__init__.py,sha256=zW4DVt_RPJWT0-AsylGmh9wgFBDPkU-hx4VzV_qPayU,154
 junifer/preprocess/warping/_ants_warper.py,sha256=Y1UzZ5jy1TvlLEkaQKW7jCNvEHufZMdQFbg2JpY3UaM,5690
 junifer/preprocess/warping/_fsl_warper.py,sha256=eELmS44LYYANQaWR3VDKv8iwpEC2qnF9kbTYRanR2mE,3204
-junifer/preprocess/warping/space_warper.py,sha256=honyMD9e2kK72oBWb4loA6lKZFs5kIjr1AYB4HU3eDQ,6435
+junifer/preprocess/warping/space_warper.py,sha256=BW7ymZdr4h7lJRtPLi3RT7qwgmu-HFJFqzZNUl341YU,6589
 junifer/preprocess/warping/tests/test_space_warper.py,sha256=ph92dIDOr9ih9tkqT0yo5tnQL3UkOgQRXG3WzP5QLSE,5586
 junifer/storage/__init__.py,sha256=QlzBw9UrRhmg_f7zQVas9h313u3sfZIBicA3_0Skm4M,337
 junifer/storage/base.py,sha256=UxDvj81gSmqqHspbSs1X_i9HvW5wXysDippI7HWM7aM,9654
@@ -248,10 +248,10 @@ junifer/utils/logging.py,sha256=furcU3XIUpUvnpe4PEwzWWIWgmH4j2ZA4MQdvSGWjj0,9216
 junifer/utils/tests/test_fs.py,sha256=WQS7cKlKEZ742CIuiOYYpueeAhY9PqlastfDVpVVtvE,923
 junifer/utils/tests/test_helpers.py,sha256=k5qqfxK8dFyuewTJyR1Qn6-nFaYNuVr0ysc18bfPjyU,929
 junifer/utils/tests/test_logging.py,sha256=l8oo-AiBV7H6_IzlsNcj__cLeZBUvgIGoaMszD9VaJg,7754
-junifer-0.0.4.dev810.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.4.dev810.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.4.dev810.dist-info/METADATA,sha256=njCeW4AU5kfCwCxw8Soc3CYj3RqDpMHua3pvOrjTNBs,8235
-junifer-0.0.4.dev810.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-junifer-0.0.4.dev810.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
-junifer-0.0.4.dev810.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.4.dev810.dist-info/RECORD,,
+junifer-0.0.4.dev821.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.4.dev821.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.4.dev821.dist-info/METADATA,sha256=AFPNBFGNbtVc-0SIzHhTdNHAJQAQtq38g9KvCua_CmQ,8235
+junifer-0.0.4.dev821.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+junifer-0.0.4.dev821.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
+junifer-0.0.4.dev821.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.4.dev821.dist-info/RECORD,,