Skip to content

Commit a0460f9

Browse files
oestebanoesteban
authored
Merge pull request #1333 from effigies/bids/derivatives_rc1
[RF] Update functional derivatives for RC1
2 parents a296a79 + 51a1021 commit a0460f9

File tree

6 files changed

+80
-79
lines changed

6 files changed

+80
-79
lines changed

‎.circleci/ds005_outputs.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,36 +34,36 @@ fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
3434
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
3535
fmriprep/sub-01/func
3636
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_AROMAnoiseICs.csv
37-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_confounds.tsv
38-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_MELODICmix.tsv
39-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-cifti_variant-space1_preproc.dtseries.json
40-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-cifti_variant-space1_preproc.dtseries.nii
41-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-fsaverage5.L.func.gii
42-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-fsaverage5.R.func.gii
37+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-confounds_regressors.tsv
38+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-MELODIC_mixing.tsv
39+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-preproc_bold.dtseries.json
40+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-preproc_bold.dtseries.nii
41+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-fsaverage5_hemi-L.func.gii
42+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-fsaverage5_hemi-R.func.gii
4343
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_boldref.nii.gz
44-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_brainmask.nii.gz
45-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_preproc.nii.gz
46-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_variant-smoothAROMAnonaggr_preproc.nii.gz
44+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
45+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
46+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-smoothAROMAnonaggr_bold.nii.gz
4747
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_boldref.nii.gz
48-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_brainmask.nii.gz
48+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_desc-brain_mask.nii.gz
49+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_desc-preproc_bold.nii.gz
4950
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aparcaseg_dseg.nii.gz
5051
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aseg_dseg.nii.gz
51-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_preproc.nii.gz
5252
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_AROMAnoiseICs.csv
53-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_confounds.tsv
54-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_MELODICmix.tsv
55-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-cifti_variant-space1_preproc.dtseries.json
56-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-cifti_variant-space1_preproc.dtseries.nii
57-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-fsaverage5.L.func.gii
58-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-fsaverage5.R.func.gii
53+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_regressors.tsv
54+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-MELODIC_mixing.tsv
55+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-preproc_bold.dtseries.json
56+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-preproc_bold.dtseries.nii
57+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-fsaverage5_hemi-L.func.gii
58+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-fsaverage5_hemi-R.func.gii
5959
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_boldref.nii.gz
60-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_brainmask.nii.gz
61-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_preproc.nii.gz
62-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_variant-smoothAROMAnonaggr_preproc.nii.gz
60+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
61+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
62+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-smoothAROMAnonaggr_bold.nii.gz
6363
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_boldref.nii.gz
64-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_brainmask.nii.gz
64+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-brain_mask.nii.gz
65+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-preproc_bold.nii.gz
6566
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_label-aparcaseg_dseg.nii.gz
6667
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_label-aseg_dseg.nii.gz
67-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_preproc.nii.gz
6868
fmriprep/sub-01.html
6969
/tmp/ds005/derivatives

‎.circleci/ds005_partial_outputs.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
3434
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
3535
fmriprep/sub-01/func
3636
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_AROMAnoiseICs.csv
37-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_confounds.tsv
38-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_MELODICmix.tsv
39-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-cifti_variant-space1_preproc.dtseries.json
40-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-cifti_variant-space1_preproc.dtseries.nii
41-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-fsaverage5.L.func.gii
42-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-fsaverage5.R.func.gii
37+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-confounds_regressors.tsv
38+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-MELODIC_mixing.tsv
39+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-preproc_bold.dtseries.json
40+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-preproc_bold.dtseries.nii
41+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-fsaverage5_hemi-L.func.gii
42+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-fsaverage5_hemi-R.func.gii
4343
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_boldref.nii.gz
44-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_brainmask.nii.gz
45-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_preproc.nii.gz
46-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_variant-smoothAROMAnonaggr_preproc.nii.gz
44+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
45+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
46+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-smoothAROMAnonaggr_bold.nii.gz
4747
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_boldref.nii.gz
48-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_brainmask.nii.gz
48+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_desc-brain_mask.nii.gz
49+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_desc-preproc_bold.nii.gz
4950
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aparcaseg_dseg.nii.gz
5051
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aseg_dseg.nii.gz
51-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_preproc.nii.gz
5252
fmriprep/sub-01.html
5353
/tmp/ds005/derivatives_partial

‎.circleci/ds054_outputs.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_label-CSF_probseg.
2222
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
2323
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
2424
fmriprep/sub-100185/func
25-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_confounds.tsv
25+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_desc-confounds_regressors.tsv
2626
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-MNI152NLin2009cAsym_boldref.nii.gz
27-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-MNI152NLin2009cAsym_brainmask.nii.gz
28-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-MNI152NLin2009cAsym_preproc.nii.gz
27+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
28+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
2929
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-T1w_boldref.nii.gz
30-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-T1w_brainmask.nii.gz
31-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-T1w_preproc.nii.gz
32-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_confounds.tsv
30+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-T1w_desc-brain_mask.nii.gz
31+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-T1w_desc-preproc_bold.nii.gz
32+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_desc-confounds_regressors.tsv
3333
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-MNI152NLin2009cAsym_boldref.nii.gz
34-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-MNI152NLin2009cAsym_brainmask.nii.gz
35-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-MNI152NLin2009cAsym_preproc.nii.gz
34+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
35+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
3636
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-T1w_boldref.nii.gz
37-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-T1w_brainmask.nii.gz
38-
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-T1w_preproc.nii.gz
37+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-T1w_desc-brain_mask.nii.gz
38+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-T1w_desc-preproc_bold.nii.gz
3939
fmriprep/sub-100185.html
4040
/tmp/ds054/derivatives

‎.circleci/ds210_outputs.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
2222
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
2323
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
2424
fmriprep/sub-02/func
25-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_confounds.tsv
25+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_desc-confounds_regressors.tsv
2626
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_space-MNI152NLin2009cAsym_boldref.nii.gz
27-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_space-MNI152NLin2009cAsym_brainmask.nii.gz
28-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_space-MNI152NLin2009cAsym_preproc.nii.gz
29-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-2_confounds.tsv
27+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
28+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
29+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-2_desc-confounds_regressors.tsv
3030
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-2_space-MNI152NLin2009cAsym_boldref.nii.gz
31-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-2_space-MNI152NLin2009cAsym_brainmask.nii.gz
32-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-2_space-MNI152NLin2009cAsym_preproc.nii.gz
33-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-3_confounds.tsv
31+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-2_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
32+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-2_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
33+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-3_desc-confounds_regressors.tsv
3434
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-3_space-MNI152NLin2009cAsym_boldref.nii.gz
35-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-3_space-MNI152NLin2009cAsym_brainmask.nii.gz
36-
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-3_space-MNI152NLin2009cAsym_preproc.nii.gz
35+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-3_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
36+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-3_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
3737
fmriprep/sub-02.html
3838
/tmp/ds210/derivatives

‎fmriprep/interfaces/cifti.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ class CiftiNameSource(SimpleInterface):
273273
output_spec = CiftiNameSourceOutputSpec
274274

275275
def _run_interface(self, runtime):
276-
suffix = 'space-cifti_variant-{}_preproc.dtseries'.format(self.inputs.variant)
276+
suffix = 'bold.dtseries'
277277
if 'hcp' in self.inputs.variant:
278-
suffix = 'space-hcp_preproc.dtseries'
278+
suffix = 'space-hcp_bold.dtseries'
279279
self._results['out_name'] = suffix
280280
return runtime

‎fmriprep/workflows/bold/base.py

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -823,11 +823,8 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
823823
'nonaggr_denoised_file', 'bold_cifti', 'cifti_variant']),
824824
name='inputnode')
825825

826-
suffix_fmt = 'space-{}_{}'.format
827-
variant_suffix_fmt = 'space-{}_variant-{}_{}'.format
828-
829826
ds_confounds = pe.Node(DerivativesDataSink(
830-
base_directory=output_dir, suffix='confounds'),
827+
base_directory=output_dir, desc='confounds', suffix='regressors'),
831828
name="ds_confounds", run_without_submitting=True,
832829
mem_gb=DEFAULT_MEMORY_MIN_GB)
833830
workflow.connect([
@@ -837,17 +834,19 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
837834

838835
# Resample to T1w space
839836
if 'T1w' in output_spaces:
840-
ds_bold_t1 = pe.Node(DerivativesDataSink(
841-
base_directory=output_dir, suffix=suffix_fmt('T1w', 'preproc'), compress=True),
837+
ds_bold_t1 = pe.Node(
838+
DerivativesDataSink(base_directory=output_dir, space='T1w', desc='preproc',
839+
keep_dtype=True, compress=True),
842840
name='ds_bold_t1', run_without_submitting=True,
843841
mem_gb=DEFAULT_MEMORY_MIN_GB)
844-
ds_bold_t1_ref = pe.Node(DerivativesDataSink(
845-
base_directory=output_dir, suffix=suffix_fmt('T1w', 'boldref')),
842+
ds_bold_t1_ref = pe.Node(
843+
DerivativesDataSink(base_directory=output_dir, space='T1w', suffix='boldref'),
846844
name='ds_bold_t1_ref', run_without_submitting=True,
847845
mem_gb=DEFAULT_MEMORY_MIN_GB)
848846

849-
ds_bold_mask_t1 = pe.Node(DerivativesDataSink(
850-
base_directory=output_dir, suffix=suffix_fmt('T1w', 'brainmask')),
847+
ds_bold_mask_t1 = pe.Node(
848+
DerivativesDataSink(base_directory=output_dir, space='T1w', desc='brain',
849+
suffix='mask'),
851850
name='ds_bold_mask_t1', run_without_submitting=True,
852851
mem_gb=DEFAULT_MEMORY_MIN_GB)
853852
workflow.connect([
@@ -861,17 +860,19 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
861860

862861
# Resample to template (default: MNI)
863862
if 'template' in output_spaces:
864-
ds_bold_mni = pe.Node(DerivativesDataSink(
865-
base_directory=output_dir, suffix=suffix_fmt(template, 'preproc'), compress=True),
863+
ds_bold_mni = pe.Node(
864+
DerivativesDataSink(base_directory=output_dir, space=template, desc='preproc',
865+
keep_dtype=True, compress=True),
866866
name='ds_bold_mni', run_without_submitting=True,
867867
mem_gb=DEFAULT_MEMORY_MIN_GB)
868-
ds_bold_mni_ref = pe.Node(DerivativesDataSink(
869-
base_directory=output_dir, suffix=suffix_fmt(template, 'boldref')),
868+
ds_bold_mni_ref = pe.Node(
869+
DerivativesDataSink(base_directory=output_dir, space=template, suffix='boldref'),
870870
name='ds_bold_mni_ref', run_without_submitting=True,
871871
mem_gb=DEFAULT_MEMORY_MIN_GB)
872872

873-
ds_bold_mask_mni = pe.Node(DerivativesDataSink(
874-
base_directory=output_dir, suffix=suffix_fmt(template, 'brainmask')),
873+
ds_bold_mask_mni = pe.Node(
874+
DerivativesDataSink(base_directory=output_dir, space=template, desc='brain',
875+
suffix='mask'),
875876
name='ds_bold_mask_mni', run_without_submitting=True,
876877
mem_gb=DEFAULT_MEMORY_MIN_GB)
877878
workflow.connect([
@@ -885,11 +886,11 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
885886

886887
if freesurfer:
887888
ds_bold_aseg_t1 = pe.Node(DerivativesDataSink(
888-
base_directory=output_dir, suffix='space-T1w_label-aseg_dseg'),
889+
base_directory=output_dir, space='T1w', suffix='label-aseg_dseg'),
889890
name='ds_bold_aseg_t1', run_without_submitting=True,
890891
mem_gb=DEFAULT_MEMORY_MIN_GB)
891892
ds_bold_aparc_t1 = pe.Node(DerivativesDataSink(
892-
base_directory=output_dir, suffix='space-T1w_label-aparcaseg_dseg'),
893+
base_directory=output_dir, space='T1w', suffix='label-aparcaseg_dseg'),
893894
name='ds_bold_aparc_t1', run_without_submitting=True,
894895
mem_gb=DEFAULT_MEMORY_MIN_GB)
895896
workflow.connect([
@@ -902,7 +903,7 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
902903
# fsaverage space
903904
if freesurfer and any(space.startswith('fs') for space in output_spaces):
904905
name_surfs = pe.MapNode(GiftiNameSource(
905-
pattern=r'(?P<LR>[lr])h.(?P<space>\w+).gii', template='space-{space}.{LR}.func'),
906+
pattern=r'(?P<LR>[lr])h.(?P<space>\w+).gii', template='space-{space}_hemi-{LR}.func'),
906907
iterfield='in_file', name='name_surfs', mem_gb=DEFAULT_MEMORY_MIN_GB,
907908
run_without_submitting=True)
908909
ds_bold_surfs = pe.MapNode(DerivativesDataSink(base_directory=output_dir),
@@ -922,8 +923,8 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
922923
name_cifti = pe.MapNode(
923924
CiftiNameSource(), iterfield=['variant'], name='name_cifti',
924925
mem_gb=DEFAULT_MEMORY_MIN_GB, run_without_submitting=True)
925-
cifti_bolds = pe.MapNode(DerivativesDataSink(
926-
base_directory=output_dir, compress=False),
926+
cifti_bolds = pe.MapNode(
927+
DerivativesDataSink(base_directory=output_dir, desc='preproc', compress=False),
927928
iterfield=['in_file', 'suffix'], name='cifti_bolds',
928929
run_without_submitting=True, mem_gb=DEFAULT_MEMORY_MIN_GB)
929930
cifti_key = pe.MapNode(DerivativesDataSink(
@@ -946,12 +947,12 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
946947
name="ds_aroma_noise_ics", run_without_submitting=True,
947948
mem_gb=DEFAULT_MEMORY_MIN_GB)
948949
ds_melodic_mix = pe.Node(DerivativesDataSink(
949-
base_directory=output_dir, suffix='MELODICmix'),
950+
base_directory=output_dir, desc='MELODIC', suffix='mixing'),
950951
name="ds_melodic_mix", run_without_submitting=True,
951952
mem_gb=DEFAULT_MEMORY_MIN_GB)
952-
ds_aroma_mni = pe.Node(DerivativesDataSink(
953-
base_directory=output_dir, suffix=variant_suffix_fmt(
954-
template, 'smoothAROMAnonaggr', 'preproc')),
953+
ds_aroma_mni = pe.Node(
954+
DerivativesDataSink(base_directory=output_dir, space=template,
955+
desc='smoothAROMAnonaggr', keep_dtype=True),
955956
name='ds_aroma_mni', run_without_submitting=True,
956957
mem_gb=DEFAULT_MEMORY_MIN_GB)
957958

0 commit comments

Comments
 (0)