Skip to content

Commit 117fe8a

Browse files
effigieseffigies
committed
Functional derivatives
1 parent 05f445f commit 117fe8a

File tree

2 files changed

+25
-20
lines changed

2 files changed

+25
-20
lines changed

‎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 = '.dtseries'
277277
if 'hcp' in self.inputs.variant:
278-
suffix = 'space-hcp_preproc.dtseries'
278+
suffix = 'space-hcp.dtseries'
279279
self._results['out_name'] = suffix
280280
return runtime

‎fmriprep/workflows/bold/base.py

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
827827
variant_suffix_fmt = 'space-{}_variant-{}_{}'.format
828828

829829
ds_confounds = pe.Node(DerivativesDataSink(
830-
base_directory=output_dir, suffix='confounds'),
830+
base_directory=output_dir, desc='confounds', suffix='regressors'),
831831
name="ds_confounds", run_without_submitting=True,
832832
mem_gb=DEFAULT_MEMORY_MIN_GB)
833833
workflow.connect([
@@ -837,17 +837,19 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
837837

838838
# Resample to T1w space
839839
if 'T1w' in output_spaces:
840-
ds_bold_t1 = pe.Node(DerivativesDataSink(
841-
base_directory=output_dir, suffix=suffix_fmt('T1w', 'preproc'), compress=True),
840+
ds_bold_t1 = pe.Node(
841+
DerivativesDataSink(base_directory=output_dir, space='T1w', desc='preproc',
842+
keep_dtype=True, compress=True),
842843
name='ds_bold_t1', run_without_submitting=True,
843844
mem_gb=DEFAULT_MEMORY_MIN_GB)
844-
ds_bold_t1_ref = pe.Node(DerivativesDataSink(
845-
base_directory=output_dir, suffix=suffix_fmt('T1w', 'boldref')),
845+
ds_bold_t1_ref = pe.Node(
846+
DerivativesDataSink(base_directory=output_dir, space='T1w', suffix='boldref'),
846847
name='ds_bold_t1_ref', run_without_submitting=True,
847848
mem_gb=DEFAULT_MEMORY_MIN_GB)
848849

849-
ds_bold_mask_t1 = pe.Node(DerivativesDataSink(
850-
base_directory=output_dir, suffix=suffix_fmt('T1w', 'brainmask')),
850+
ds_bold_mask_t1 = pe.Node(
851+
DerivativesDataSink(base_directory=output_dir, space='T1w', desc='brain',
852+
suffix='mask'),
851853
name='ds_bold_mask_t1', run_without_submitting=True,
852854
mem_gb=DEFAULT_MEMORY_MIN_GB)
853855
workflow.connect([
@@ -861,17 +863,19 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
861863

862864
# Resample to template (default: MNI)
863865
if 'template' in output_spaces:
864-
ds_bold_mni = pe.Node(DerivativesDataSink(
865-
base_directory=output_dir, suffix=suffix_fmt(template, 'preproc'), compress=True),
866+
ds_bold_mni = pe.Node(
867+
DerivativesDataSink(base_directory=output_dir, space=template, desc='preproc',
868+
keep_dtype=True, compress=True),
866869
name='ds_bold_mni', run_without_submitting=True,
867870
mem_gb=DEFAULT_MEMORY_MIN_GB)
868-
ds_bold_mni_ref = pe.Node(DerivativesDataSink(
869-
base_directory=output_dir, suffix=suffix_fmt(template, 'boldref')),
871+
ds_bold_mni_ref = pe.Node(
872+
DerivativesDataSink(base_directory=output_dir, space=template, suffix='boldref'),
870873
name='ds_bold_mni_ref', run_without_submitting=True,
871874
mem_gb=DEFAULT_MEMORY_MIN_GB)
872875

873-
ds_bold_mask_mni = pe.Node(DerivativesDataSink(
874-
base_directory=output_dir, suffix=suffix_fmt(template, 'brainmask')),
876+
ds_bold_mask_mni = pe.Node(
877+
DerivativesDataSink(base_directory=output_dir, space=template, desc='brain',
878+
suffix='mask'),
875879
name='ds_bold_mask_mni', run_without_submitting=True,
876880
mem_gb=DEFAULT_MEMORY_MIN_GB)
877881
workflow.connect([
@@ -885,11 +889,11 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
885889

886890
if freesurfer:
887891
ds_bold_aseg_t1 = pe.Node(DerivativesDataSink(
888-
base_directory=output_dir, suffix='space-T1w_label-aseg_dseg'),
892+
base_directory=output_dir, space='T1w', suffix='label-aseg_dseg'),
889893
name='ds_bold_aseg_t1', run_without_submitting=True,
890894
mem_gb=DEFAULT_MEMORY_MIN_GB)
891895
ds_bold_aparc_t1 = pe.Node(DerivativesDataSink(
892-
base_directory=output_dir, suffix='space-T1w_label-aparcaseg_dseg'),
896+
base_directory=output_dir, space='T1w', suffix='label-aparcaseg_dseg'),
893897
name='ds_bold_aparc_t1', run_without_submitting=True,
894898
mem_gb=DEFAULT_MEMORY_MIN_GB)
895899
workflow.connect([
@@ -902,7 +906,7 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
902906
# fsaverage space
903907
if freesurfer and any(space.startswith('fs') for space in output_spaces):
904908
name_surfs = pe.MapNode(GiftiNameSource(
905-
pattern=r'(?P<LR>[lr])h.(?P<space>\w+).gii', template='space-{space}.{LR}.func'),
909+
pattern=r'(?P<LR>[lr])h.(?P<space>\w+).gii', template='space-{space}_hemi-{LR}.func'),
906910
iterfield='in_file', name='name_surfs', mem_gb=DEFAULT_MEMORY_MIN_GB,
907911
run_without_submitting=True)
908912
ds_bold_surfs = pe.MapNode(DerivativesDataSink(base_directory=output_dir),
@@ -922,8 +926,9 @@ def init_func_derivatives_wf(output_dir, output_spaces, template, freesurfer,
922926
name_cifti = pe.MapNode(
923927
CiftiNameSource(), iterfield=['variant'], name='name_cifti',
924928
mem_gb=DEFAULT_MEMORY_MIN_GB, run_without_submitting=True)
925-
cifti_bolds = pe.MapNode(DerivativesDataSink(
926-
base_directory=output_dir, compress=False),
929+
cifti_bolds = pe.MapNode(
930+
DerivativesDataSink(base_directory=output_dir, desc='preproc',
931+
keep_dtype=True, compress=False),
927932
iterfield=['in_file', 'suffix'], name='cifti_bolds',
928933
run_without_submitting=True, mem_gb=DEFAULT_MEMORY_MIN_GB)
929934
cifti_key = pe.MapNode(DerivativesDataSink(

0 commit comments

Comments
 (0)