junifer 0.0.4.dev821__py3-none-any.whl → 0.0.4.dev829__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- junifer/_version.py +2 -2
- junifer/api/cli.py +3 -4
- junifer/api/tests/test_cli.py +15 -0
- junifer/configs/juseless/datagrabbers/aomic_id1000_vbm.py +1 -1
- junifer/configs/juseless/datagrabbers/camcan_vbm.py +1 -1
- junifer/configs/juseless/datagrabbers/ixi_vbm.py +1 -1
- junifer/configs/juseless/datagrabbers/ucla.py +6 -6
- junifer/configs/juseless/datagrabbers/ukb_vbm.py +1 -1
- junifer/data/tests/test_masks.py +2 -2
- junifer/datagrabber/aomic/id1000.py +24 -24
- junifer/datagrabber/aomic/piop1.py +25 -25
- junifer/datagrabber/aomic/piop2.py +25 -25
- junifer/datagrabber/aomic/tests/test_id1000.py +7 -7
- junifer/datagrabber/aomic/tests/test_piop1.py +7 -7
- junifer/datagrabber/aomic/tests/test_piop2.py +7 -7
- junifer/datagrabber/dmcc13_benchmark.py +45 -45
- junifer/datagrabber/tests/test_dmcc13_benchmark.py +33 -33
- junifer/preprocess/ants/tests/test_ants_apply_transforms_warper.py +2 -2
- junifer/preprocess/tests/test_bold_warper.py +6 -6
- junifer/preprocess/warping/tests/test_space_warper.py +6 -6
- {junifer-0.0.4.dev821.dist-info → junifer-0.0.4.dev829.dist-info}/METADATA +1 -1
- {junifer-0.0.4.dev821.dist-info → junifer-0.0.4.dev829.dist-info}/RECORD +27 -27
- {junifer-0.0.4.dev821.dist-info → junifer-0.0.4.dev829.dist-info}/AUTHORS.rst +0 -0
- {junifer-0.0.4.dev821.dist-info → junifer-0.0.4.dev829.dist-info}/LICENSE.md +0 -0
- {junifer-0.0.4.dev821.dist-info → junifer-0.0.4.dev829.dist-info}/WHEEL +0 -0
- {junifer-0.0.4.dev821.dist-info → junifer-0.0.4.dev829.dist-info}/entry_points.txt +0 -0
- {junifer-0.0.4.dev821.dist-info → junifer-0.0.4.dev829.dist-info}/top_level.txt +0 -0
@@ -56,7 +56,7 @@ def test_DataladAOMICPIOP1(tasks: Optional[str]) -> None:
|
|
56
56
|
acq = task_acqs[task]
|
57
57
|
new_task = f"{task}_acq-{acq}"
|
58
58
|
assert (
|
59
|
-
out["BOLD"]["path"].name == f"
|
59
|
+
out["BOLD"]["path"].name == f"{sub}_task-{new_task}_"
|
60
60
|
"space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz"
|
61
61
|
)
|
62
62
|
|
@@ -67,7 +67,7 @@ def test_DataladAOMICPIOP1(tasks: Optional[str]) -> None:
|
|
67
67
|
assert "BOLD_confounds" in out
|
68
68
|
|
69
69
|
assert (
|
70
|
-
out["BOLD_confounds"]["path"].name == f"
|
70
|
+
out["BOLD_confounds"]["path"].name == f"{sub}_task-{new_task}_"
|
71
71
|
"desc-confounds_regressors.tsv"
|
72
72
|
)
|
73
73
|
|
@@ -81,7 +81,7 @@ def test_DataladAOMICPIOP1(tasks: Optional[str]) -> None:
|
|
81
81
|
assert "T1w" in out
|
82
82
|
|
83
83
|
assert (
|
84
|
-
out["T1w"]["path"].name == f"
|
84
|
+
out["T1w"]["path"].name == f"{sub}_space-MNI152NLin2009cAsym_"
|
85
85
|
"desc-preproc_T1w.nii.gz"
|
86
86
|
)
|
87
87
|
|
@@ -96,7 +96,7 @@ def test_DataladAOMICPIOP1(tasks: Optional[str]) -> None:
|
|
96
96
|
|
97
97
|
assert (
|
98
98
|
out["VBM_CSF"]["path"].name
|
99
|
-
== f"
|
99
|
+
== f"{sub}_space-MNI152NLin2009cAsym_label-"
|
100
100
|
"CSF_probseg.nii.gz"
|
101
101
|
)
|
102
102
|
|
@@ -108,7 +108,7 @@ def test_DataladAOMICPIOP1(tasks: Optional[str]) -> None:
|
|
108
108
|
|
109
109
|
assert (
|
110
110
|
out["VBM_GM"]["path"].name
|
111
|
-
== f"
|
111
|
+
== f"{sub}_space-MNI152NLin2009cAsym_label-"
|
112
112
|
"GM_probseg.nii.gz"
|
113
113
|
)
|
114
114
|
|
@@ -120,7 +120,7 @@ def test_DataladAOMICPIOP1(tasks: Optional[str]) -> None:
|
|
120
120
|
|
121
121
|
assert (
|
122
122
|
out["VBM_WM"]["path"].name
|
123
|
-
== f"
|
123
|
+
== f"{sub}_space-MNI152NLin2009cAsym_label-"
|
124
124
|
"WM_probseg.nii.gz"
|
125
125
|
)
|
126
126
|
|
@@ -130,7 +130,7 @@ def test_DataladAOMICPIOP1(tasks: Optional[str]) -> None:
|
|
130
130
|
# asserts type "DWI"
|
131
131
|
assert "DWI" in out
|
132
132
|
|
133
|
-
assert out["DWI"]["path"].name == f"
|
133
|
+
assert out["DWI"]["path"].name == f"{sub}_desc-preproc_dwi.nii.gz"
|
134
134
|
|
135
135
|
assert out["DWI"]["path"].exists()
|
136
136
|
assert out["DWI"]["path"].is_file()
|
@@ -50,7 +50,7 @@ def test_DataladAOMICPIOP2(tasks: Optional[str]) -> None:
|
|
50
50
|
|
51
51
|
new_task = f"{task}_acq-seq"
|
52
52
|
assert (
|
53
|
-
out["BOLD"]["path"].name == f"
|
53
|
+
out["BOLD"]["path"].name == f"{sub}_task-{new_task}_"
|
54
54
|
"space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz"
|
55
55
|
)
|
56
56
|
|
@@ -61,7 +61,7 @@ def test_DataladAOMICPIOP2(tasks: Optional[str]) -> None:
|
|
61
61
|
assert "BOLD_confounds" in out
|
62
62
|
|
63
63
|
assert (
|
64
|
-
out["BOLD_confounds"]["path"].name == f"
|
64
|
+
out["BOLD_confounds"]["path"].name == f"{sub}_task-{new_task}_"
|
65
65
|
"desc-confounds_regressors.tsv"
|
66
66
|
)
|
67
67
|
|
@@ -75,7 +75,7 @@ def test_DataladAOMICPIOP2(tasks: Optional[str]) -> None:
|
|
75
75
|
assert "T1w" in out
|
76
76
|
|
77
77
|
assert (
|
78
|
-
out["T1w"]["path"].name == f"
|
78
|
+
out["T1w"]["path"].name == f"{sub}_space-MNI152NLin2009cAsym_"
|
79
79
|
"desc-preproc_T1w.nii.gz"
|
80
80
|
)
|
81
81
|
|
@@ -90,7 +90,7 @@ def test_DataladAOMICPIOP2(tasks: Optional[str]) -> None:
|
|
90
90
|
|
91
91
|
assert (
|
92
92
|
out["VBM_CSF"]["path"].name
|
93
|
-
== f"
|
93
|
+
== f"{sub}_space-MNI152NLin2009cAsym_label-"
|
94
94
|
"CSF_probseg.nii.gz"
|
95
95
|
)
|
96
96
|
|
@@ -102,7 +102,7 @@ def test_DataladAOMICPIOP2(tasks: Optional[str]) -> None:
|
|
102
102
|
|
103
103
|
assert (
|
104
104
|
out["VBM_GM"]["path"].name
|
105
|
-
== f"
|
105
|
+
== f"{sub}_space-MNI152NLin2009cAsym_label-"
|
106
106
|
"GM_probseg.nii.gz"
|
107
107
|
)
|
108
108
|
|
@@ -114,7 +114,7 @@ def test_DataladAOMICPIOP2(tasks: Optional[str]) -> None:
|
|
114
114
|
|
115
115
|
assert (
|
116
116
|
out["VBM_WM"]["path"].name
|
117
|
-
== f"
|
117
|
+
== f"{sub}_space-MNI152NLin2009cAsym_label-"
|
118
118
|
"WM_probseg.nii.gz"
|
119
119
|
)
|
120
120
|
|
@@ -124,7 +124,7 @@ def test_DataladAOMICPIOP2(tasks: Optional[str]) -> None:
|
|
124
124
|
# asserts type "DWI"
|
125
125
|
assert "DWI" in out
|
126
126
|
|
127
|
-
assert out["DWI"]["path"].name == f"
|
127
|
+
assert out["DWI"]["path"].name == f"{sub}_desc-preproc_dwi.nii.gz"
|
128
128
|
|
129
129
|
assert out["DWI"]["path"].exists()
|
130
130
|
assert out["DWI"]["path"].is_file()
|
@@ -29,8 +29,8 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
|
|
29
29
|
"VBM_WM"} or a list of the options, optional
|
30
30
|
DMCC data types. If None, all available data types are selected.
|
31
31
|
(default None).
|
32
|
-
sessions: {"wave1bas", "wave1pro", "wave1rea"} or list of
|
33
|
-
|
32
|
+
sessions: {"ses-wave1bas", "ses-wave1pro", "ses-wave1rea"} or list of \
|
33
|
+
the options, optional
|
34
34
|
DMCC sessions. If None, all available sessions are selected
|
35
35
|
(default None).
|
36
36
|
tasks: {"Rest", "Axcpt", "Cuedts", "Stern", "Stroop"} or \
|
@@ -68,9 +68,9 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
|
|
68
68
|
) -> None:
|
69
69
|
# Declare all sessions
|
70
70
|
all_sessions = [
|
71
|
-
"wave1bas",
|
72
|
-
"wave1pro",
|
73
|
-
"wave1rea",
|
71
|
+
"ses-wave1bas",
|
72
|
+
"ses-wave1pro",
|
73
|
+
"ses-wave1rea",
|
74
74
|
]
|
75
75
|
# Set default sessions
|
76
76
|
if sessions is None:
|
@@ -141,8 +141,8 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
|
|
141
141
|
patterns = {
|
142
142
|
"BOLD": {
|
143
143
|
"pattern": (
|
144
|
-
"derivatives/fmriprep-1.3.2/
|
145
|
-
"func/
|
144
|
+
"derivatives/fmriprep-1.3.2/{subject}/{session}/"
|
145
|
+
"func/{subject}_{session}_task-{task}_acq-mb4"
|
146
146
|
"{phase_encoding}_run-{run}_"
|
147
147
|
"space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz"
|
148
148
|
),
|
@@ -151,16 +151,16 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
|
|
151
151
|
},
|
152
152
|
"BOLD_confounds": {
|
153
153
|
"pattern": (
|
154
|
-
"derivatives/fmriprep-1.3.2/
|
155
|
-
"func/
|
154
|
+
"derivatives/fmriprep-1.3.2/{subject}/{session}/"
|
155
|
+
"func/{subject}_{session}_task-{task}_acq-mb4"
|
156
156
|
"{phase_encoding}_run-{run}_desc-confounds_regressors.tsv"
|
157
157
|
),
|
158
158
|
"format": "fmriprep",
|
159
159
|
},
|
160
160
|
"BOLD_mask": {
|
161
161
|
"pattern": (
|
162
|
-
"derivatives/fmriprep-1.3.2/
|
163
|
-
"/func/
|
162
|
+
"derivatives/fmriprep-1.3.2/{subject}/{session}/"
|
163
|
+
"/func/{subject}_{session}_task-{task}_acq-mb4"
|
164
164
|
"{phase_encoding}_run-{run}_"
|
165
165
|
"space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz"
|
166
166
|
),
|
@@ -168,37 +168,37 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
|
|
168
168
|
},
|
169
169
|
"T1w": {
|
170
170
|
"pattern": (
|
171
|
-
"derivatives/fmriprep-1.3.2/
|
172
|
-
"
|
171
|
+
"derivatives/fmriprep-1.3.2/{subject}/anat/"
|
172
|
+
"{subject}_space-MNI152NLin2009cAsym_desc-preproc_T1w.nii.gz"
|
173
173
|
),
|
174
174
|
"space": "MNI152NLin2009cAsym",
|
175
175
|
"mask_item": "T1w_mask",
|
176
176
|
},
|
177
177
|
"T1w_mask": {
|
178
178
|
"pattern": (
|
179
|
-
"derivatives/fmriprep-1.3.2/
|
180
|
-
"
|
179
|
+
"derivatives/fmriprep-1.3.2/{subject}/anat/"
|
180
|
+
"{subject}_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz"
|
181
181
|
),
|
182
182
|
"space": "MNI152NLin2009cAsym",
|
183
183
|
},
|
184
184
|
"VBM_CSF": {
|
185
185
|
"pattern": (
|
186
|
-
"derivatives/fmriprep-1.3.2/
|
187
|
-
"
|
186
|
+
"derivatives/fmriprep-1.3.2/{subject}/anat/"
|
187
|
+
"{subject}_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz"
|
188
188
|
),
|
189
189
|
"space": "MNI152NLin2009cAsym",
|
190
190
|
},
|
191
191
|
"VBM_GM": {
|
192
192
|
"pattern": (
|
193
|
-
"derivatives/fmriprep-1.3.2/
|
194
|
-
"
|
193
|
+
"derivatives/fmriprep-1.3.2/{subject}/anat/"
|
194
|
+
"{subject}_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz"
|
195
195
|
),
|
196
196
|
"space": "MNI152NLin2009cAsym",
|
197
197
|
},
|
198
198
|
"VBM_WM": {
|
199
199
|
"pattern": (
|
200
|
-
"derivatives/fmriprep-1.3.2/
|
201
|
-
"
|
200
|
+
"derivatives/fmriprep-1.3.2/{subject}/anat/"
|
201
|
+
"{subject}_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz"
|
202
202
|
),
|
203
203
|
"space": "MNI152NLin2009cAsym",
|
204
204
|
},
|
@@ -211,23 +211,23 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
|
|
211
211
|
{
|
212
212
|
"T1w": {
|
213
213
|
"pattern": (
|
214
|
-
"derivatives/fmriprep-1.3.2/
|
215
|
-
"
|
214
|
+
"derivatives/fmriprep-1.3.2/{subject}/anat/"
|
215
|
+
"{subject}_desc-preproc_T1w.nii.gz"
|
216
216
|
),
|
217
217
|
"space": "native",
|
218
218
|
"mask_item": "T1w_mask",
|
219
219
|
},
|
220
220
|
"T1w_mask": {
|
221
221
|
"pattern": (
|
222
|
-
"derivatives/fmriprep-1.3.2/
|
223
|
-
"
|
222
|
+
"derivatives/fmriprep-1.3.2/{subject}/anat/"
|
223
|
+
"{subject}_desc-brain_mask.nii.gz"
|
224
224
|
),
|
225
225
|
"space": "native",
|
226
226
|
},
|
227
227
|
"Warp": {
|
228
228
|
"pattern": (
|
229
|
-
"derivatives/fmriprep-1.3.2/
|
230
|
-
"
|
229
|
+
"derivatives/fmriprep-1.3.2/{subject}/anat/"
|
230
|
+
"{subject}_from-MNI152NLin2009cAsym_to-T1w_"
|
231
231
|
"mode-image_xfm.h5"
|
232
232
|
),
|
233
233
|
"src": "MNI152NLin2009cAsym",
|
@@ -268,7 +268,7 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
|
|
268
268
|
----------
|
269
269
|
subject : str
|
270
270
|
The subject ID.
|
271
|
-
session : {"wave1bas", "wave1pro", "wave1rea"}
|
271
|
+
session : {"ses-wave1bas", "ses-wave1pro", "ses-wave1rea"}
|
272
272
|
The session to get.
|
273
273
|
task : {"Rest", "Axcpt", "Cuedts", "Stern", "Stroop"}
|
274
274
|
The task to get.
|
@@ -323,25 +323,25 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
|
|
323
323
|
|
324
324
|
"""
|
325
325
|
subjects = [
|
326
|
-
"f1031ax",
|
327
|
-
"f1552xo",
|
328
|
-
"f1659oa",
|
329
|
-
"f1670rz",
|
330
|
-
"f1951tt",
|
331
|
-
"f3300jh",
|
332
|
-
"f3720ca",
|
333
|
-
"f5004cr",
|
334
|
-
"f5407sl",
|
335
|
-
"f5416zj",
|
336
|
-
"f8113do",
|
337
|
-
"f8570ui",
|
338
|
-
"f9057kp",
|
326
|
+
"sub-f1031ax",
|
327
|
+
"sub-f1552xo",
|
328
|
+
"sub-f1659oa",
|
329
|
+
"sub-f1670rz",
|
330
|
+
"sub-f1951tt",
|
331
|
+
"sub-f3300jh",
|
332
|
+
"sub-f3720ca",
|
333
|
+
"sub-f5004cr",
|
334
|
+
"sub-f5407sl",
|
335
|
+
"sub-f5416zj",
|
336
|
+
"sub-f8113do",
|
337
|
+
"sub-f8570ui",
|
338
|
+
"sub-f9057kp",
|
339
339
|
]
|
340
340
|
elems = []
|
341
341
|
# For wave1bas session
|
342
342
|
for subject, session, task, phase_encoding in product(
|
343
343
|
subjects,
|
344
|
-
["wave1bas"],
|
344
|
+
["ses-wave1bas"],
|
345
345
|
self.tasks,
|
346
346
|
self.phase_encodings,
|
347
347
|
):
|
@@ -350,13 +350,13 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
|
|
350
350
|
else:
|
351
351
|
run = "2"
|
352
352
|
# Bypass for f1951tt not having run 2 for Rest
|
353
|
-
if subject == "f1951tt" and task == "Rest" and run == "2":
|
353
|
+
if subject == "sub-f1951tt" and task == "Rest" and run == "2":
|
354
354
|
continue
|
355
355
|
elems.append((subject, session, task, phase_encoding, run))
|
356
356
|
# For other sessions
|
357
357
|
for subject, session, task, phase_encoding in product(
|
358
358
|
subjects,
|
359
|
-
["wave1pro", "wave1rea"],
|
359
|
+
["ses-wave1pro", "ses-wave1rea"],
|
360
360
|
["Rest"],
|
361
361
|
self.phase_encodings,
|
362
362
|
):
|
@@ -365,7 +365,7 @@ class DMCC13Benchmark(PatternDataladDataGrabber):
|
|
365
365
|
else:
|
366
366
|
run = "2"
|
367
367
|
# Bypass for f5416zj for not having wave1rea session
|
368
|
-
if subject == "f5416zj" and session == "wave1rea":
|
368
|
+
if subject == "sub-f5416zj" and session == "ses-wave1rea":
|
369
369
|
continue
|
370
370
|
elems.append((subject, session, task, phase_encoding, run))
|
371
371
|
|
@@ -17,34 +17,34 @@ URI = "https://gin.g-node.org/synchon/datalad-example-dmcc13-benchmark"
|
|
17
17
|
"sessions, tasks, phase_encodings, runs, native_t1w",
|
18
18
|
[
|
19
19
|
(None, None, None, None, False),
|
20
|
-
("wave1bas", "Rest", "AP", "1", False),
|
21
|
-
("wave1bas", "Axcpt", "AP", "1", False),
|
22
|
-
("wave1bas", "Cuedts", "AP", "1", False),
|
23
|
-
("wave1bas", "Stern", "AP", "1", False),
|
24
|
-
("wave1bas", "Stroop", "AP", "1", False),
|
25
|
-
("wave1bas", "Rest", "PA", "2", False),
|
26
|
-
("wave1bas", "Axcpt", "PA", "2", False),
|
27
|
-
("wave1bas", "Cuedts", "PA", "2", False),
|
28
|
-
("wave1bas", "Stern", "PA", "2", False),
|
29
|
-
("wave1bas", "Stroop", "PA", "2", False),
|
30
|
-
("wave1bas", "Rest", "AP", "1", True),
|
31
|
-
("wave1bas", "Axcpt", "AP", "1", True),
|
32
|
-
("wave1bas", "Cuedts", "AP", "1", True),
|
33
|
-
("wave1bas", "Stern", "AP", "1", True),
|
34
|
-
("wave1bas", "Stroop", "AP", "1", True),
|
35
|
-
("wave1bas", "Rest", "PA", "2", True),
|
36
|
-
("wave1bas", "Axcpt", "PA", "2", True),
|
37
|
-
("wave1bas", "Cuedts", "PA", "2", True),
|
38
|
-
("wave1bas", "Stern", "PA", "2", True),
|
39
|
-
("wave1bas", "Stroop", "PA", "2", True),
|
40
|
-
("wave1pro", "Rest", "AP", "1", False),
|
41
|
-
("wave1pro", "Rest", "PA", "2", False),
|
42
|
-
("wave1pro", "Rest", "AP", "1", True),
|
43
|
-
("wave1pro", "Rest", "PA", "2", True),
|
44
|
-
("wave1rea", "Rest", "AP", "1", False),
|
45
|
-
("wave1rea", "Rest", "PA", "2", False),
|
46
|
-
("wave1rea", "Rest", "AP", "1", True),
|
47
|
-
("wave1rea", "Rest", "PA", "2", True),
|
20
|
+
("ses-wave1bas", "Rest", "AP", "1", False),
|
21
|
+
("ses-wave1bas", "Axcpt", "AP", "1", False),
|
22
|
+
("ses-wave1bas", "Cuedts", "AP", "1", False),
|
23
|
+
("ses-wave1bas", "Stern", "AP", "1", False),
|
24
|
+
("ses-wave1bas", "Stroop", "AP", "1", False),
|
25
|
+
("ses-wave1bas", "Rest", "PA", "2", False),
|
26
|
+
("ses-wave1bas", "Axcpt", "PA", "2", False),
|
27
|
+
("ses-wave1bas", "Cuedts", "PA", "2", False),
|
28
|
+
("ses-wave1bas", "Stern", "PA", "2", False),
|
29
|
+
("ses-wave1bas", "Stroop", "PA", "2", False),
|
30
|
+
("ses-wave1bas", "Rest", "AP", "1", True),
|
31
|
+
("ses-wave1bas", "Axcpt", "AP", "1", True),
|
32
|
+
("ses-wave1bas", "Cuedts", "AP", "1", True),
|
33
|
+
("ses-wave1bas", "Stern", "AP", "1", True),
|
34
|
+
("ses-wave1bas", "Stroop", "AP", "1", True),
|
35
|
+
("ses-wave1bas", "Rest", "PA", "2", True),
|
36
|
+
("ses-wave1bas", "Axcpt", "PA", "2", True),
|
37
|
+
("ses-wave1bas", "Cuedts", "PA", "2", True),
|
38
|
+
("ses-wave1bas", "Stern", "PA", "2", True),
|
39
|
+
("ses-wave1bas", "Stroop", "PA", "2", True),
|
40
|
+
("ses-wave1pro", "Rest", "AP", "1", False),
|
41
|
+
("ses-wave1pro", "Rest", "PA", "2", False),
|
42
|
+
("ses-wave1pro", "Rest", "AP", "1", True),
|
43
|
+
("ses-wave1pro", "Rest", "PA", "2", True),
|
44
|
+
("ses-wave1rea", "Rest", "AP", "1", False),
|
45
|
+
("ses-wave1rea", "Rest", "PA", "2", False),
|
46
|
+
("ses-wave1rea", "Rest", "AP", "1", True),
|
47
|
+
("ses-wave1rea", "Rest", "PA", "2", True),
|
48
48
|
],
|
49
49
|
)
|
50
50
|
def test_DMCC13Benchmark(
|
@@ -88,7 +88,7 @@ def test_DMCC13Benchmark(
|
|
88
88
|
# Get test element's access values
|
89
89
|
_, ses, task, phase, run = test_element
|
90
90
|
# Access data
|
91
|
-
out = dg[("01", ses, task, phase, run)]
|
91
|
+
out = dg[("sub-01", ses, task, phase, run)]
|
92
92
|
|
93
93
|
# Available data types
|
94
94
|
data_types = [
|
@@ -108,15 +108,15 @@ def test_DMCC13Benchmark(
|
|
108
108
|
# Data type file name formats
|
109
109
|
data_file_names = [
|
110
110
|
(
|
111
|
-
f"sub-
|
111
|
+
f"sub-01_{ses}_task-{task}_acq-mb4{phase}_run-{run}_"
|
112
112
|
"space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz"
|
113
113
|
),
|
114
114
|
(
|
115
|
-
f"sub-
|
115
|
+
f"sub-01_{ses}_task-{task}_acq-mb4{phase}_run-{run}_"
|
116
116
|
"desc-confounds_regressors.tsv"
|
117
117
|
),
|
118
118
|
(
|
119
|
-
f"sub-
|
119
|
+
f"sub-01_{ses}_task-{task}_acq-mb4{phase}_run-{run}_"
|
120
120
|
"space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz"
|
121
121
|
),
|
122
122
|
"sub-01_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz",
|
@@ -199,7 +199,7 @@ def test_DMCC13Benchmark_partial_data_access(
|
|
199
199
|
# Get test element's access values
|
200
200
|
_, ses, task, phase, run = test_element
|
201
201
|
# Access data
|
202
|
-
out = dg[("01", ses, task, phase, run)]
|
202
|
+
out = dg[("sub-01", ses, task, phase, run)]
|
203
203
|
# Assert data type
|
204
204
|
if isinstance(types, list):
|
205
205
|
for type_ in types:
|
@@ -35,7 +35,7 @@ def test_AntsApplyTransformsWarper_preprocess() -> None:
|
|
35
35
|
"""Test AntsApplyTransformsWarper preprocess."""
|
36
36
|
with DMCC13Benchmark(
|
37
37
|
types=["BOLD", "T1w", "Warp"],
|
38
|
-
sessions=["wave1bas"],
|
38
|
+
sessions=["ses-wave1bas"],
|
39
39
|
tasks=["Rest"],
|
40
40
|
phase_encodings=["AP"],
|
41
41
|
runs=["1"],
|
@@ -43,7 +43,7 @@ def test_AntsApplyTransformsWarper_preprocess() -> None:
|
|
43
43
|
) as dg:
|
44
44
|
# Read data
|
45
45
|
element_data = DefaultDataReader().fit_transform(
|
46
|
-
dg[("f9057kp", "wave1bas", "Rest", "AP", "1")]
|
46
|
+
dg[("sub-f9057kp", "ses-wave1bas", "Rest", "AP", "1")]
|
47
47
|
)
|
48
48
|
# Preprocess data
|
49
49
|
data_type, data = _AntsApplyTransformsWarper(
|
@@ -43,13 +43,13 @@ def test_BOLDWarper_get_output_type() -> None:
|
|
43
43
|
[
|
44
44
|
DMCC13Benchmark(
|
45
45
|
types=["BOLD", "T1w", "Warp"],
|
46
|
-
sessions=["wave1bas"],
|
46
|
+
sessions=["ses-wave1bas"],
|
47
47
|
tasks=["Rest"],
|
48
48
|
phase_encodings=["AP"],
|
49
49
|
runs=["1"],
|
50
50
|
native_t1w=True,
|
51
51
|
),
|
52
|
-
("f9057kp", "wave1bas", "Rest", "AP", "1"),
|
52
|
+
("sub-f9057kp", "ses-wave1bas", "Rest", "AP", "1"),
|
53
53
|
],
|
54
54
|
[
|
55
55
|
DataladHCP1200(
|
@@ -99,25 +99,25 @@ def test_BOLDWarper_preprocess_to_native(
|
|
99
99
|
[
|
100
100
|
DMCC13Benchmark(
|
101
101
|
types=["BOLD"],
|
102
|
-
sessions=["wave1bas"],
|
102
|
+
sessions=["ses-wave1bas"],
|
103
103
|
tasks=["Rest"],
|
104
104
|
phase_encodings=["AP"],
|
105
105
|
runs=["1"],
|
106
106
|
native_t1w=False,
|
107
107
|
),
|
108
|
-
("f9057kp", "wave1bas", "Rest", "AP", "1"),
|
108
|
+
("sub-f9057kp", "ses-wave1bas", "Rest", "AP", "1"),
|
109
109
|
"MNI152NLin2009aAsym",
|
110
110
|
],
|
111
111
|
[
|
112
112
|
DMCC13Benchmark(
|
113
113
|
types=["BOLD"],
|
114
|
-
sessions=["wave1bas"],
|
114
|
+
sessions=["ses-wave1bas"],
|
115
115
|
tasks=["Rest"],
|
116
116
|
phase_encodings=["AP"],
|
117
117
|
runs=["1"],
|
118
118
|
native_t1w=False,
|
119
119
|
),
|
120
|
-
("f9057kp", "wave1bas", "Rest", "AP", "1"),
|
120
|
+
("sub-f9057kp", "ses-wave1bas", "Rest", "AP", "1"),
|
121
121
|
"MNI152NLin6Asym",
|
122
122
|
],
|
123
123
|
],
|
@@ -70,13 +70,13 @@ def test_SpaceWarper_errors(
|
|
70
70
|
[
|
71
71
|
DMCC13Benchmark(
|
72
72
|
types=["BOLD", "T1w", "Warp"],
|
73
|
-
sessions=["wave1bas"],
|
73
|
+
sessions=["ses-wave1bas"],
|
74
74
|
tasks=["Rest"],
|
75
75
|
phase_encodings=["AP"],
|
76
76
|
runs=["1"],
|
77
77
|
native_t1w=True,
|
78
78
|
),
|
79
|
-
("f9057kp", "wave1bas", "Rest", "AP", "1"),
|
79
|
+
("sub-f9057kp", "ses-wave1bas", "Rest", "AP", "1"),
|
80
80
|
"ants",
|
81
81
|
],
|
82
82
|
[
|
@@ -135,25 +135,25 @@ def test_SpaceWarper_native(
|
|
135
135
|
[
|
136
136
|
DMCC13Benchmark(
|
137
137
|
types=["T1w"],
|
138
|
-
sessions=["wave1bas"],
|
138
|
+
sessions=["ses-wave1bas"],
|
139
139
|
tasks=["Rest"],
|
140
140
|
phase_encodings=["AP"],
|
141
141
|
runs=["1"],
|
142
142
|
native_t1w=False,
|
143
143
|
),
|
144
|
-
("f9057kp", "wave1bas", "Rest", "AP", "1"),
|
144
|
+
("sub-f9057kp", "ses-wave1bas", "Rest", "AP", "1"),
|
145
145
|
"MNI152NLin2009aAsym",
|
146
146
|
],
|
147
147
|
[
|
148
148
|
DMCC13Benchmark(
|
149
149
|
types=["T1w"],
|
150
|
-
sessions=["wave1bas"],
|
150
|
+
sessions=["ses-wave1bas"],
|
151
151
|
tasks=["Rest"],
|
152
152
|
phase_encodings=["AP"],
|
153
153
|
runs=["1"],
|
154
154
|
native_t1w=False,
|
155
155
|
),
|
156
|
-
("f9057kp", "wave1bas", "Rest", "AP", "1"),
|
156
|
+
("sub-f9057kp", "ses-wave1bas", "Rest", "AP", "1"),
|
157
157
|
"MNI152NLin6Asym",
|
158
158
|
],
|
159
159
|
],
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: junifer
|
3
|
-
Version: 0.0.4.
|
3
|
+
Version: 0.0.4.dev829
|
4
4
|
Summary: JUelich NeuroImaging FEature extractoR
|
5
5
|
Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
|
6
6
|
Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
|