fix(workflow): update to use new boolean trait, fix querying templates

for resolution == 'native'.

Author: oesteban

fmriprep/workflows/bold/confounds.py

@@ -33,8 +33,6 @@
     FMRISummary, DerivativesDataSink
 )
 
-from .resampling import init_bold_std_trans_wf
-
 DEFAULT_MEMORY_MIN_GB = 0.01
 
 

fmriprep/workflows/bold/registration.py

@@ -275,7 +275,7 @@ def init_bold_t1_trans_wf(freesurfer, mem_gb, omp_nthreads, multiecho=False, use
         name='outputnode'
     )
 
-    gen_ref = pe.Node(GenerateSamplingReference(resolution='native'), name='gen_ref',
+    gen_ref = pe.Node(GenerateSamplingReference(keep_native=True), name='gen_ref',
                       mem_gb=0.3)  # 256x256x256 * 64 / 8 ~ 150MB
 
     mask_t1w_tfm = pe.Node(

fmriprep/workflows/bold/resampling.py

@@ -332,9 +332,9 @@ def init_bold_std_trans_wf(
         (inputnode, gen_ref, [(('bold_split', _first), 'moving_image')]),
         (inputnode, mask_merge_tfms, [(('itk_bold_to_t1', _aslist), 'in2')]),
         (select_std, select_tpl, [('key', 'template')]),
-        (select_std, select_tpl, [('resolution', 'resolution')]),
+        (select_std, select_tpl, [(('resolution', _tpl_res), 'resolution')]),
         (select_std, mask_merge_tfms, [('anat2std_xfm', 'in1')]),
-        (select_std, gen_ref, [('resolution', 'resolution')]),
+        (select_std, gen_ref, [(('resolution', _is_native), 'keep_native')]),
         (select_tpl, gen_ref, [('out', 'fixed_image')]),
         (mask_merge_tfms, mask_std_tfm, [('out', 'transforms')]),
         (gen_ref, mask_std_tfm, [('out_file', 'reference_image')]),
@@ -646,7 +646,10 @@ def _aslist(in_value):
     return [in_value]
 
 
-def _res(in_value):
+def _is_native(in_value):
+    return in_value == 'native'
+
+
+def _tpl_res(in_value):
     if in_value == 'native':
         return 2
-    return in_value