Skip to content

Commit 16609f2

Browse files
authored
Add ASL support (#839)
* Add "asl" to list of non-standard spaces. * Add "asl" to data collection. * Add ASL-related filename patterns to config. * Drop m0scan from fmap pattern.
1 parent a5a85a3 commit 16609f2

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

niworkflows/data/nipreps.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
},
8888
{
8989
"name": "datatype",
90-
"pattern": "[/\\\\]+(func|anat|fmap|dwi|meg|eeg|figures)[/\\\\]+"
90+
"pattern": "[/\\\\]+(func|anat|fmap|dwi|meg|eeg|perf|figures)[/\\\\]+"
9191
},
9292
{
9393
"name": "extension",
@@ -172,6 +172,10 @@
172172
"sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_rec-{reconstruction}][_dir-{direction}][_run-{run}][_space-{space}][_cohort-{cohort}][_res-{resolution}]_desc-{desc}_{suffix<mask>}{extension<.json|.nii.gz|.nii>|.nii.gz}",
173173
"sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_rec-{reconstruction}][_dir-{direction}][_run-{run}][_space-{space}][_cohort-{cohort}][_res-{resolution}][_desc-{desc}]_{suffix<dwi>}{extension<.tsv|.bval|.bvec|.b>|.tsv}",
174174
"sub-{subject}[/ses-{session}]/{datatype<dwi>|dwi}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_rec-{reconstruction}][_dir-{direction}][_run-{run}]_from-{from}_to-{to}_mode-{mode<image|points>|image}[_desc-{desc}]_{suffix<xfm>|xfm}{extension<.txt|.h5>}",
175+
"sub-{subject}[/ses-{session}]/{datatype<perf>|perf}/sub-{subject}[_ses-{session}][_task-{task}][_acq-{acquisition}][_rec-{reconstruction}][_dir-{direction}][_run-{run}]_{suffix<aslcontext>}{extension<.tsv|.json>|.tsv}",
176+
"sub-{subject}[/ses-{session}]/{datatype<perf>|perf}/sub-{subject}[_ses-{session}][_task-{task}][_acq-{acquisition}][_ce-{ceagent}][_rec-{reconstruction}][_dir-{direction}][_run-{run}]_from-{from}_to-{to}_mode-{mode<image|points>|image}_{suffix<xfm>|xfm}{extension<.txt|.h5>}",
177+
"sub-{subject}[/ses-{session}]/{datatype<perf>|perf}/sub-{subject}[_ses-{session}][_task-{task}][_acq-{acquisition}][_ce-{ceagent}][_rec-{reconstruction}][_dir-{direction}][_run-{run}][_space-{space}][_atlas-{atlas}][_cohort-{cohort}][_desc-{desc}]_{suffix<timeseries>}{extension<.json|.tsv>|.tsv}",
178+
"sub-{subject}[/ses-{session}]/{datatype<perf>|perf}/sub-{subject}[_ses-{session}][_task-{task}][_acq-{acquisition}][_ce-{ceagent}][_rec-{reconstruction}][_dir-{direction}][_run-{run}][_space-{space}][_atlas-{atlas}][_cohort-{cohort}][_desc-{desc}]_{suffix<asl|aslref|att|cbf|coverage|mask>}{extension<.nii|.nii.gz|.json|.tsv>|.tsv}",
175179
"sub-{subject}[/ses-{session}]/{datatype<fmap>|fmap}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_dir-{direction}][_run-{run}][_part-{part}][_space-{space}][_cohort-{cohort}][_res-{resolution}][_fmapid-{fmapid}][_desc-{desc}]_{suffix<fieldmap>}{extension<.nii|.nii.gz|.json>|.nii.gz}",
176180
"sub-{subject}/{datatype<figures>}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_desc-{desc}]_{suffix<T1w|T2w|T1rho|T1map|T2map|T2star|FLAIR|FLASH|PDmap|PD|PDT2|inplaneT[12]|angio|dseg|mask|T2starw|MTw|TSE>}{extension<.html|.svg>|.svg}",
177181
"sub-{subject}/{datatype<figures>}/sub-{subject}[_ses-{session}][_acq-{acquisition}][_ce-{ceagent}][_rec-{reconstruction}][_run-{run}][_space-{space}][_cohort-{cohort}][_fmapid-{fmapid}][_desc-{desc}]_{suffix<fieldmap>}{extension<.html|.svg>|.svg}",

niworkflows/interfaces/bids.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ class _BIDSDataGrabberOutputSpec(TraitedSpec):
227227
flair = OutputMultiObject(desc="output FLAIR images")
228228
pet = OutputMultiObject(desc="output PET images")
229229
dwi = OutputMultiObject(desc="output DWI images")
230+
asl = OutputMultiObject(desc="output ASL images")
230231

231232

232233
class BIDSDataGrabber(SimpleInterface):
@@ -278,7 +279,7 @@ def _run_interface(self, runtime):
278279
)
279280
)
280281

281-
for imtype in ["bold", "t2w", "flair", "fmap", "sbref", "roi", "pet"]:
282+
for imtype in ["bold", "t2w", "flair", "fmap", "sbref", "roi", "pet", "asl"]:
282283
if not bids_dict[imtype]:
283284
LOGGER.info(
284285
'No "%s" images found for sub-%s', imtype, self.inputs.subject_id

niworkflows/utils/bids.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"sbref": {"datatype": "func", "suffix": "sbref", "part": ["mag", None]},
4141
"t1w": {"datatype": "anat", "suffix": "T1w", "part": ["mag", None]},
4242
"t2w": {"datatype": "anat", "suffix": "T2w", "part": ["mag", None]},
43+
"asl": {"datatype": "perf", "suffix": "asl"},
4344
}
4445

4546

niworkflows/utils/spaces.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"session",
3939
"individual",
4040
"dwi",
41+
"asl",
4142
]
4243
"""List of supported nonstandard reference spaces."""
4344

0 commit comments

Comments
 (0)