Skip to content

Commit b719546

Browse files
committed
update get_template calls to new templateflow interface
1 parent 2c49300 commit b719546

File tree

3 files changed

+25
-15
lines changed

3 files changed

+25
-15
lines changed

fmriprep/workflows/bold/confounds.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,9 @@ def init_carpetplot_wf(mem_gb, metadata, name="bold_carpet_wf"):
360360
# Warp segmentation into EPI space
361361
resample_parc = pe.Node(ApplyTransforms(
362362
float=True,
363-
input_image=get_template('MNI152NLin2009cAsym',
364-
'_res-01_desc-carpet_dseg.nii.gz'),
363+
input_image=str(get_template(
364+
'MNI152NLin2009cAsym', resolution=1, desc='carpet',
365+
suffix='dseg', extensions=['.nii', '.nii.gz'])),
365366
dimension=3, default_value=0, interpolation='MultiLabel'),
366367
name='resample_parc')
367368

@@ -536,7 +537,9 @@ def init_ica_aroma_wf(template, metadata, mem_gb, omp_nthreads,
536537
freesurfer=False,
537538
mem_gb=mem_gb,
538539
omp_nthreads=omp_nthreads,
539-
template_out_grid=get_template('MNI152Lin', 'res-02_T1w.nii.gz'),
540+
template_out_grid=str(get_template(
541+
'MNI152Lin', resolution=2, desc=None, suffix='T1w',
542+
extensions=['.nii', '.nii.gz'])),
540543
use_compression=False,
541544
use_fieldwarp=use_fieldwarp,
542545
name='bold_mni_trans_wf'

fmriprep/workflows/bold/resampling.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,9 @@ def _aslist(in_value):
282282

283283
gen_ref = pe.Node(GenerateSamplingReference(), name='gen_ref',
284284
mem_gb=0.3) # 256x256x256 * 64 / 8 ~ 150MB)
285-
gen_ref.inputs.fixed_image = get_template(template, '_res-01_T1w.nii.gz')
285+
gen_ref.inputs.fixed_image = str(get_template(
286+
template, resolution=1, desc=None, suffix='T1w',
287+
extensions=['.nii', '.nii.gz']))
286288

287289
mask_mni_tfm = pe.Node(
288290
ApplyTransforms(interpolation='MultiLabel', float=True),
@@ -342,10 +344,11 @@ def _aslist(in_value):
342344
])
343345
elif template_out_grid in ['1mm', '2mm']:
344346
res = int(template_out_grid[0])
345-
mask_mni_tfm.inputs.reference_image = get_template(
346-
template, '_res-%02d_desc-brain_mask.nii.gz' % res)
347-
bold_to_mni_transform.inputs.reference_image = get_template(
348-
template, '_res-%02d_T1w.nii.gz' % res)
347+
mask_mni_tfm.inputs.reference_image = str(get_template(
348+
template, resolution=res, desc='brain', suffix='mask'))
349+
bold_to_mni_transform.inputs.reference_image = str(get_template(
350+
template, resolution=res, desc=None, suffix='T1w',
351+
extensions=['.nii', '.nii.gz']))
349352
else:
350353
mask_mni_tfm.inputs.reference_image = template_out_grid
351354
bold_to_mni_transform.inputs.reference_image = template_out_grid
@@ -373,11 +376,13 @@ def _aslist(in_value):
373376
(gen_ref, aparc_mni_tfm, [('out_file', 'reference_image')]),
374377
])
375378
elif template_out_grid in ['1mm', '2mm']:
376-
res = int(template_out_grid[0])
377-
aseg_mni_tfm.inputs.reference_image = get_template(
378-
template, '_res-%02d_desc-brain_mask.nii.gz' % res)
379-
aparc_mni_tfm.inputs.reference_image = get_template(
380-
template, '_res-%02d_desc-brain_mask.nii.gz' % res)
379+
entities = {'resolution': int(template_out_grid[0]),
380+
'desc': 'brain', 'suffix': 'mask',
381+
'extensions': ['.nii', '.nii.gz']}
382+
aseg_mni_tfm.inputs.reference_image = str(
383+
get_template(template, **entities))
384+
aparc_mni_tfm.inputs.reference_image = str(
385+
get_template(template, **entities))
381386
else:
382387
aseg_mni_tfm.inputs.reference_image = template_out_grid
383388
aparc_mni_tfm.inputs.reference_image = template_out_grid

fmriprep/workflows/bold/util.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,10 @@ def init_enhance_and_skullstrip_bold_wf(
275275
apply_mask = pe.Node(fsl.ApplyMask(), name='apply_mask')
276276

277277
if not pre_mask:
278-
bold_template = get_template('MNI152NLin2009cAsym', 'res-02_desc-fMRIPrep_boldref.nii.gz')
279-
brain_mask = get_template('MNI152NLin2009cAsym', 'res-02_desc-brain_mask.nii.gz')
278+
bold_template = get_template(
279+
'MNI152NLin2009cAsym', resolution=2, desc='fMRIPrep', suffix='boldref')
280+
brain_mask = get_template(
281+
'MNI152NLin2009cAsym', resolution=2, desc='brain', suffix='mask')
280282

281283
# Initialize transforms with antsAI
282284
init_aff = pe.Node(AI(

0 commit comments

Comments
 (0)