Skip to content

Commit cdf1f9d

Browse files
oestebanoesteban
committed
[skip ci] Merge remote-tracking branch 'upstream/master' into add_aroma_mask
2 parents 235aa1c + c6a7405 commit cdf1f9d

File tree

8 files changed

+133
-126
lines changed

8 files changed

+133
-126
lines changed

‎.circleci/config.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,10 @@ jobs:
354354
at: /tmp
355355
- restore_cache:
356356
keys:
357-
- ds005-anat-v8-{{ .Branch }}-{{ epoch }}
358-
- ds005-anat-v8-{{ .Branch }}
359-
- ds005-anat-v8-master
360-
- ds005-anat-v8-
357+
- ds005-anat-v9-{{ .Branch }}-{{ epoch }}
358+
- ds005-anat-v9-{{ .Branch }}
359+
- ds005-anat-v9-master
360+
- ds005-anat-v9-
361361
- run:
362362
name: Setting up test
363363
command: |
@@ -391,7 +391,7 @@ jobs:
391391
--debug --write-graph --mem_mb 4096 \
392392
--nthreads 2 --anat-only -vv
393393
- save_cache:
394-
key: ds005-anat-v8-{{ .Branch }}-{{ epoch }}
394+
key: ds005-anat-v9-{{ .Branch }}-{{ epoch }}
395395
paths:
396396
- /tmp/ds005/work
397397
- /tmp/ds005/derivatives/fmriprep
@@ -483,10 +483,10 @@ jobs:
483483
at: /tmp
484484
- restore_cache:
485485
keys:
486-
- ds054-anat-v6-{{ .Branch }}-{{ epoch }}
487-
- ds054-anat-v6-{{ .Branch }}
488-
- ds054-anat-v6-master
489-
- ds054-anat-v6-
486+
- ds054-anat-v7-{{ .Branch }}-{{ epoch }}
487+
- ds054-anat-v7-{{ .Branch }}
488+
- ds054-anat-v7-master
489+
- ds054-anat-v7-
490490
- run:
491491
name: Setting up test
492492
command: |
@@ -520,7 +520,7 @@ jobs:
520520
--fs-no-reconall --debug --write-graph \
521521
--mem_mb 4096 --nthreads 2 --anat-only -vv
522522
- save_cache:
523-
key: ds054-anat-v6-{{ .Branch }}-{{ epoch }}
523+
key: ds054-anat-v7-{{ .Branch }}-{{ epoch }}
524524
paths:
525525
- /tmp/ds054/work
526526
- /tmp/ds054/derivatives
@@ -601,8 +601,8 @@ jobs:
601601
at: /tmp
602602
- restore_cache:
603603
keys:
604-
- ds210-anat-v3-{{ epoch }}
605-
- ds210-anat-v3-
604+
- ds210-anat-v4-{{ epoch }}
605+
- ds210-anat-v4-
606606
- run:
607607
name: Setting up test
608608
command: |
@@ -636,7 +636,7 @@ jobs:
636636
--fs-no-reconall --debug --write-graph \
637637
--mem_mb 4096 --nthreads 2 --anat-only -vv
638638
- save_cache:
639-
key: ds210-anat-v3-{{ epoch }}
639+
key: ds210-anat-v4-{{ epoch }}
640640
paths:
641641
- /tmp/ds210/work
642642
- /tmp/ds210/derivatives

‎.circleci/ds005_outputs.txt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,32 @@ fmriprep/logs/CITATION.md
66
fmriprep/logs/CITATION.tex
77
fmriprep/sub-01
88
fmriprep/sub-01/anat
9-
fmriprep/sub-01/anat/sub-01_brainmask.nii.gz
10-
fmriprep/sub-01/anat/sub-01_class-CSF_probtissue.nii.gz
11-
fmriprep/sub-01/anat/sub-01_class-GM_probtissue.nii.gz
12-
fmriprep/sub-01/anat/sub-01_class-WM_probtissue.nii.gz
13-
fmriprep/sub-01/anat/sub-01_dtissue.nii.gz
14-
fmriprep/sub-01/anat/sub-01_inflated.L.surf.gii
15-
fmriprep/sub-01/anat/sub-01_inflated.R.surf.gii
16-
fmriprep/sub-01/anat/sub-01_label-aparcaseg_roi.nii.gz
17-
fmriprep/sub-01/anat/sub-01_label-aseg_roi.nii.gz
18-
fmriprep/sub-01/anat/sub-01_midthickness.L.surf.gii
19-
fmriprep/sub-01/anat/sub-01_midthickness.R.surf.gii
20-
fmriprep/sub-01/anat/sub-01_pial.L.surf.gii
21-
fmriprep/sub-01/anat/sub-01_pial.R.surf.gii
22-
fmriprep/sub-01/anat/sub-01_preproc.nii.gz
23-
fmriprep/sub-01/anat/sub-01_smoothwm.L.surf.gii
24-
fmriprep/sub-01/anat/sub-01_smoothwm.R.surf.gii
25-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_brainmask.nii.gz
26-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_class-CSF_probtissue.nii.gz
27-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_class-GM_probtissue.nii.gz
28-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_class-WM_probtissue.nii.gz
29-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_dtissue.nii.gz
30-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_preproc.nii.gz
31-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_target-T1w_warp.h5
32-
fmriprep/sub-01/anat/sub-01_space-orig_target-T1w_affine.txt
33-
fmriprep/sub-01/anat/sub-01_target-fsnative_affine.txt
34-
fmriprep/sub-01/anat/sub-01_target-MNI152NLin2009cAsym_warp.h5
9+
fmriprep/sub-01/anat/sub-01_desc-brain_mask.nii.gz
10+
fmriprep/sub-01/anat/sub-01_desc-preproc_T1w.nii.gz
11+
fmriprep/sub-01/anat/sub-01_dseg.nii.gz
12+
fmriprep/sub-01/anat/sub-01_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
13+
fmriprep/sub-01/anat/sub-01_from-orig_to-T1w_mode-image_xfm.txt
14+
fmriprep/sub-01/anat/sub-01_from-T1w_to-fsnative_mode-image_xfm.txt
15+
fmriprep/sub-01/anat/sub-01_from-T1w_to-MNI152NLin2009cAsym_mode-image_xfm.h5
16+
fmriprep/sub-01/anat/sub-01_hemi-L_inflated.surf.gii
17+
fmriprep/sub-01/anat/sub-01_hemi-L_midthickness.surf.gii
18+
fmriprep/sub-01/anat/sub-01_hemi-L_pial.surf.gii
19+
fmriprep/sub-01/anat/sub-01_hemi-L_smoothwm.surf.gii
20+
fmriprep/sub-01/anat/sub-01_hemi-R_inflated.surf.gii
21+
fmriprep/sub-01/anat/sub-01_hemi-R_midthickness.surf.gii
22+
fmriprep/sub-01/anat/sub-01_hemi-R_pial.surf.gii
23+
fmriprep/sub-01/anat/sub-01_hemi-R_smoothwm.surf.gii
24+
fmriprep/sub-01/anat/sub-01_label-aparcaseg_dseg.nii.gz
25+
fmriprep/sub-01/anat/sub-01_label-aseg_dseg.nii.gz
26+
fmriprep/sub-01/anat/sub-01_label-CSF_probseg.nii.gz
27+
fmriprep/sub-01/anat/sub-01_label-GM_probseg.nii.gz
28+
fmriprep/sub-01/anat/sub-01_label-WM_probseg.nii.gz
29+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
30+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-preproc_T1w.nii.gz
31+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_dseg.nii.gz
32+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
33+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
34+
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
3737
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_confounds.tsv
@@ -46,8 +46,8 @@ fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAs
4646
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_variant-smoothAROMAnonaggr_preproc.nii.gz
4747
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_boldref.nii.gz
4848
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_brainmask.nii.gz
49-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aparcaseg_roi.nii.gz
50-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aseg_roi.nii.gz
49+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aparcaseg_dseg.nii.gz
50+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aseg_dseg.nii.gz
5151
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
5353
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_confounds.tsv
@@ -62,8 +62,8 @@ fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAs
6262
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_variant-smoothAROMAnonaggr_preproc.nii.gz
6363
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_boldref.nii.gz
6464
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_brainmask.nii.gz
65-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_label-aparcaseg_roi.nii.gz
66-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_label-aseg_roi.nii.gz
65+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_label-aparcaseg_dseg.nii.gz
66+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_label-aseg_dseg.nii.gz
6767
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: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,32 @@ fmriprep/logs/CITATION.md
66
fmriprep/logs/CITATION.tex
77
fmriprep/sub-01
88
fmriprep/sub-01/anat
9-
fmriprep/sub-01/anat/sub-01_brainmask.nii.gz
10-
fmriprep/sub-01/anat/sub-01_class-CSF_probtissue.nii.gz
11-
fmriprep/sub-01/anat/sub-01_class-GM_probtissue.nii.gz
12-
fmriprep/sub-01/anat/sub-01_class-WM_probtissue.nii.gz
13-
fmriprep/sub-01/anat/sub-01_dtissue.nii.gz
14-
fmriprep/sub-01/anat/sub-01_inflated.L.surf.gii
15-
fmriprep/sub-01/anat/sub-01_inflated.R.surf.gii
16-
fmriprep/sub-01/anat/sub-01_label-aparcaseg_roi.nii.gz
17-
fmriprep/sub-01/anat/sub-01_label-aseg_roi.nii.gz
18-
fmriprep/sub-01/anat/sub-01_midthickness.L.surf.gii
19-
fmriprep/sub-01/anat/sub-01_midthickness.R.surf.gii
20-
fmriprep/sub-01/anat/sub-01_pial.L.surf.gii
21-
fmriprep/sub-01/anat/sub-01_pial.R.surf.gii
22-
fmriprep/sub-01/anat/sub-01_preproc.nii.gz
23-
fmriprep/sub-01/anat/sub-01_smoothwm.L.surf.gii
24-
fmriprep/sub-01/anat/sub-01_smoothwm.R.surf.gii
25-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_brainmask.nii.gz
26-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_class-CSF_probtissue.nii.gz
27-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_class-GM_probtissue.nii.gz
28-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_class-WM_probtissue.nii.gz
29-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_dtissue.nii.gz
30-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_preproc.nii.gz
31-
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_target-T1w_warp.h5
32-
fmriprep/sub-01/anat/sub-01_space-orig_target-T1w_affine.txt
33-
fmriprep/sub-01/anat/sub-01_target-fsnative_affine.txt
34-
fmriprep/sub-01/anat/sub-01_target-MNI152NLin2009cAsym_warp.h5
9+
fmriprep/sub-01/anat/sub-01_desc-brain_mask.nii.gz
10+
fmriprep/sub-01/anat/sub-01_desc-preproc_T1w.nii.gz
11+
fmriprep/sub-01/anat/sub-01_dseg.nii.gz
12+
fmriprep/sub-01/anat/sub-01_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
13+
fmriprep/sub-01/anat/sub-01_from-orig_to-T1w_mode-image_xfm.txt
14+
fmriprep/sub-01/anat/sub-01_from-T1w_to-fsnative_mode-image_xfm.txt
15+
fmriprep/sub-01/anat/sub-01_from-T1w_to-MNI152NLin2009cAsym_mode-image_xfm.h5
16+
fmriprep/sub-01/anat/sub-01_hemi-L_inflated.surf.gii
17+
fmriprep/sub-01/anat/sub-01_hemi-L_midthickness.surf.gii
18+
fmriprep/sub-01/anat/sub-01_hemi-L_pial.surf.gii
19+
fmriprep/sub-01/anat/sub-01_hemi-L_smoothwm.surf.gii
20+
fmriprep/sub-01/anat/sub-01_hemi-R_inflated.surf.gii
21+
fmriprep/sub-01/anat/sub-01_hemi-R_midthickness.surf.gii
22+
fmriprep/sub-01/anat/sub-01_hemi-R_pial.surf.gii
23+
fmriprep/sub-01/anat/sub-01_hemi-R_smoothwm.surf.gii
24+
fmriprep/sub-01/anat/sub-01_label-aparcaseg_dseg.nii.gz
25+
fmriprep/sub-01/anat/sub-01_label-aseg_dseg.nii.gz
26+
fmriprep/sub-01/anat/sub-01_label-CSF_probseg.nii.gz
27+
fmriprep/sub-01/anat/sub-01_label-GM_probseg.nii.gz
28+
fmriprep/sub-01/anat/sub-01_label-WM_probseg.nii.gz
29+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
30+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-preproc_T1w.nii.gz
31+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_dseg.nii.gz
32+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
33+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
34+
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
3737
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_confounds.tsv
@@ -46,8 +46,8 @@ fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAs
4646
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_variant-smoothAROMAnonaggr_preproc.nii.gz
4747
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_boldref.nii.gz
4848
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_brainmask.nii.gz
49-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aparcaseg_roi.nii.gz
50-
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aseg_roi.nii.gz
49+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aparcaseg_dseg.nii.gz
50+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_label-aseg_dseg.nii.gz
5151
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: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ fmriprep/logs/CITATION.md
66
fmriprep/logs/CITATION.tex
77
fmriprep/sub-100185
88
fmriprep/sub-100185/anat
9-
fmriprep/sub-100185/anat/sub-100185_brainmask.nii.gz
10-
fmriprep/sub-100185/anat/sub-100185_class-CSF_probtissue.nii.gz
11-
fmriprep/sub-100185/anat/sub-100185_class-GM_probtissue.nii.gz
12-
fmriprep/sub-100185/anat/sub-100185_class-WM_probtissue.nii.gz
13-
fmriprep/sub-100185/anat/sub-100185_dtissue.nii.gz
14-
fmriprep/sub-100185/anat/sub-100185_preproc.nii.gz
15-
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_brainmask.nii.gz
16-
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_class-CSF_probtissue.nii.gz
17-
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_class-GM_probtissue.nii.gz
18-
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_class-WM_probtissue.nii.gz
19-
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_dtissue.nii.gz
20-
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_preproc.nii.gz
21-
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_target-T1w_warp.h5
22-
fmriprep/sub-100185/anat/sub-100185_space-orig_target-T1w_affine.txt
23-
fmriprep/sub-100185/anat/sub-100185_target-MNI152NLin2009cAsym_warp.h5
9+
fmriprep/sub-100185/anat/sub-100185_desc-brain_mask.nii.gz
10+
fmriprep/sub-100185/anat/sub-100185_desc-preproc_T1w.nii.gz
11+
fmriprep/sub-100185/anat/sub-100185_dseg.nii.gz
12+
fmriprep/sub-100185/anat/sub-100185_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
13+
fmriprep/sub-100185/anat/sub-100185_from-orig_to-T1w_mode-image_xfm.txt
14+
fmriprep/sub-100185/anat/sub-100185_from-T1w_to-MNI152NLin2009cAsym_mode-image_xfm.h5
15+
fmriprep/sub-100185/anat/sub-100185_label-CSF_probseg.nii.gz
16+
fmriprep/sub-100185/anat/sub-100185_label-GM_probseg.nii.gz
17+
fmriprep/sub-100185/anat/sub-100185_label-WM_probseg.nii.gz
18+
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
19+
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_desc-preproc_T1w.nii.gz
20+
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_dseg.nii.gz
21+
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
22+
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
23+
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
2424
fmriprep/sub-100185/func
2525
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_confounds.tsv
2626
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-MNI152NLin2009cAsym_boldref.nii.gz

‎.circleci/ds210_outputs.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ fmriprep/logs/CITATION.md
66
fmriprep/logs/CITATION.tex
77
fmriprep/sub-02
88
fmriprep/sub-02/anat
9-
fmriprep/sub-02/anat/sub-02_brainmask.nii.gz
10-
fmriprep/sub-02/anat/sub-02_class-CSF_probtissue.nii.gz
11-
fmriprep/sub-02/anat/sub-02_class-GM_probtissue.nii.gz
12-
fmriprep/sub-02/anat/sub-02_class-WM_probtissue.nii.gz
13-
fmriprep/sub-02/anat/sub-02_dtissue.nii.gz
14-
fmriprep/sub-02/anat/sub-02_preproc.nii.gz
15-
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_brainmask.nii.gz
16-
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_class-CSF_probtissue.nii.gz
17-
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_class-GM_probtissue.nii.gz
18-
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_class-WM_probtissue.nii.gz
19-
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_dtissue.nii.gz
20-
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_preproc.nii.gz
21-
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_target-T1w_warp.h5
22-
fmriprep/sub-02/anat/sub-02_space-orig_target-T1w_affine.txt
23-
fmriprep/sub-02/anat/sub-02_target-MNI152NLin2009cAsym_warp.h5
9+
fmriprep/sub-02/anat/sub-02_desc-brain_mask.nii.gz
10+
fmriprep/sub-02/anat/sub-02_desc-preproc_T1w.nii.gz
11+
fmriprep/sub-02/anat/sub-02_dseg.nii.gz
12+
fmriprep/sub-02/anat/sub-02_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
13+
fmriprep/sub-02/anat/sub-02_from-orig_to-T1w_mode-image_xfm.txt
14+
fmriprep/sub-02/anat/sub-02_from-T1w_to-MNI152NLin2009cAsym_mode-image_xfm.h5
15+
fmriprep/sub-02/anat/sub-02_label-CSF_probseg.nii.gz
16+
fmriprep/sub-02/anat/sub-02_label-GM_probseg.nii.gz
17+
fmriprep/sub-02/anat/sub-02_label-WM_probseg.nii.gz
18+
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
19+
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_desc-preproc_T1w.nii.gz
20+
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_dseg.nii.gz
21+
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
22+
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
23+
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
2424
fmriprep/sub-02/func
2525
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_confounds.tsv
2626
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_space-MNI152NLin2009cAsym_boldref.nii.gz

‎fmriprep/interfaces/bids.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,10 @@ class DerivativesDataSinkInputSpec(BaseInterfaceInputSpec):
163163
in_file = InputMultiPath(File(exists=True), mandatory=True,
164164
desc='the object to be saved')
165165
source_file = File(exists=False, mandatory=True, desc='the input func file')
166+
space = traits.Str('', usedefault=True, desc='Label for space field')
167+
desc = traits.Str('', usedefault=True, desc='Label for description field')
168+
suffix = traits.Str('', usedefault=True, desc='suffix appended to source_file')
166169
keep_dtype = traits.Bool(False, usedefault=True, desc='keep datatype suffix')
167-
suffix = traits.Str('', mandatory=True, desc='suffix appended to source_file')
168170
extra_values = traits.List(traits.Str)
169171
compress = traits.Bool(desc="force compression (True) or uncompression (False)"
170172
" of the output file (default: same as input)")
@@ -244,17 +246,24 @@ def _run_interface(self, runtime):
244246

245247
base_fname = op.join(out_path, src_fname)
246248

247-
formatstr = '{bname}_{suffix}{dtype}{ext}'
249+
formatstr = '{bname}{space}{desc}{suffix}{dtype}{ext}'
248250
if len(self.inputs.in_file) > 1 and not isdefined(self.inputs.extra_values):
249-
formatstr = '{bname}_{suffix}{i:04d}{dtype}{ext}'
251+
formatstr = '{bname}{space}{desc}{suffix}{i:04d}{dtype}{ext}'
252+
253+
space = '_space-{}'.format(self.inputs.space) if self.inputs.space else ''
254+
desc = '_desc-{}'.format(self.inputs.desc) if self.inputs.desc else ''
255+
suffix = '_{}'.format(self.inputs.suffix) if self.inputs.suffix else ''
256+
dtype = '' if not self.inputs.keep_dtype else ('_%s' % dtype)
250257

251258
self._results['compression'] = []
252259
for i, fname in enumerate(self.inputs.in_file):
253260
out_file = formatstr.format(
254261
bname=base_fname,
255-
suffix=self.inputs.suffix,
262+
space=space,
263+
desc=desc,
264+
suffix=suffix,
256265
i=i,
257-
dtype='' if not self.inputs.keep_dtype else ('_%s' % dtype),
266+
dtype=dtype,
258267
ext=ext)
259268
if isdefined(self.inputs.extra_values):
260269
out_file = out_file.format(extra_value=self.inputs.extra_values[i])

0 commit comments

Comments
 (0)