fix(workflow): move validation of SBRefs to an earlier point, ensuring the node is conditionally created

Author: oesteban

fmriprep/workflows/bold/base.py

@@ -346,7 +346,12 @@ def init_func_preproc_wf(bold_file, ignore, freesurfer,
         name='inputnode')
     inputnode.inputs.bold_file = bold_file
     if sbref_file is not None:
-        inputnode.inputs.sbref_file = sbref_file
+        from niworkflows.interfaces.images import ValidateImage
+        val_sbref = pe.Node(ValidateImage(), name='val_sbref')
+        val_sbref.inputs.in_file = sbref_file
+        workflow.connect([
+            (val_sbref, inputnode, [('out_file', 'sbref_file')]),
+        ])
 
     outputnode = pe.Node(niu.IdentityInterface(
         fields=['bold_t1', 'bold_t1_ref', 'bold_mask_t1', 'bold_aseg_t1', 'bold_aparc_t1',

fmriprep/workflows/bold/util.py

@@ -112,7 +112,6 @@ def init_bold_reference_wf(omp_nthreads, bold_file=None, pre_mask=False,
         inputnode.inputs.bold_file = bold_file
 
     validate = pe.Node(ValidateImage(), name='validate', mem_gb=DEFAULT_MEMORY_MIN_GB)
-    val_sbref = pe.Node(ValidateImage(), name='val_sbref')
 
     gen_ref = pe.Node(EstimateReferenceImage(), name="gen_ref",
                       mem_gb=1)  # OE: 128x128x128x50 * 64 / 8 ~ 900MB.
@@ -124,9 +123,8 @@ def init_bold_reference_wf(omp_nthreads, bold_file=None, pre_mask=False,
     workflow.connect([
         (inputnode, enhance_and_skullstrip_bold_wf, [('bold_mask', 'inputnode.pre_mask')]),
         (inputnode, validate, [('bold_file', 'in_file')]),
-        (inputnode, val_sbref, [('sbref_file', 'in_file')]),
+        (inputnode, gen_ref, [('sbref_file', 'sbref_file')]),
         (validate, gen_ref, [('out_file', 'in_file')]),
-        (val_sbref, gen_ref, [('out_file', 'sbref_file')]),
         (gen_ref, validate_ref, [('ref_image', 'in_file')]),
         (validate_ref, enhance_and_skullstrip_bold_wf, [('out_file', 'inputnode.in_file')]),
         (validate, outputnode, [('out_file', 'bold_file'),