fix: datasink before passing to buffer

Author: mgxd

nibabies/workflows/anatomical/fit.py

@@ -1276,13 +1276,13 @@ def init_infant_anat_fit_wf(
             (fsnative_buffer, gifti_surfaces_wf, [
                 ('fsnative2anat_xfm', 'inputnode.fsnative2anat_xfm'),
             ]),
-            (gifti_surfaces_wf, surfaces_buffer, [
-                (f'outputnode.{surf}', surf) for surf in surfs
-            ]),
             (sourcefile_buffer, ds_surfaces_wf, [('anat_source_files', 'inputnode.source_files')]),
             (gifti_surfaces_wf, ds_surfaces_wf, [
                 (f'outputnode.{surf}', f'inputnode.{surf}') for surf in surfs
             ]),
+            (ds_surfaces_wf, surfaces_buffer, [
+                (f'outputnode.{surf}', surf) for surf in surfs
+            ]),
         ])  # fmt:skip
     if spheres:
         gifti_spheres_wf = init_gifti_surfaces_wf(
@@ -1300,13 +1300,13 @@ def init_infant_anat_fit_wf(
                 ('outputnode.subjects_dir', 'inputnode.subjects_dir'),
                 # No transform for spheres, following HCP pipelines' lead
             ]),
-            (gifti_spheres_wf, surfaces_buffer, [
-                (f'outputnode.{sphere}', sphere) for sphere in spheres
-            ]),
             (sourcefile_buffer, ds_spheres_wf, [('anat_source_files', 'inputnode.source_files')]),
             (gifti_spheres_wf, ds_spheres_wf, [
                 (f'outputnode.{sphere}', f'inputnode.{sphere}') for sphere in spheres
             ]),
+            (ds_spheres_wf, surfaces_buffer, [
+                (f'outputnode.{sphere}', sphere) for sphere in spheres
+            ]),
         ])  # fmt:skip
     metrics = [metric for metric in needed_metrics if metric not in found_surfs]
     if metrics:
@@ -1324,13 +1324,13 @@ def init_infant_anat_fit_wf(
                 ('outputnode.subject_id', 'inputnode.subject_id'),
                 ('outputnode.subjects_dir', 'inputnode.subjects_dir'),
             ]),
-            (gifti_morph_wf, surfaces_buffer, [
-                (f'outputnode.{metric}', metric) for metric in metrics
-            ]),
             (sourcefile_buffer, ds_morph_wf, [('anat_source_files', 'inputnode.source_files')]),
             (gifti_morph_wf, ds_morph_wf, [
                 (f'outputnode.{metric}', f'inputnode.{metric}') for metric in metrics
             ]),
+            (ds_morph_wf, surfaces_buffer, [
+                (f'outputnode.{metric}', metric) for metric in metrics
+            ]),
         ])  # fmt:skip
 
     if 'anat_ribbon' not in precomputed:
@@ -2232,13 +2232,13 @@ def init_infant_single_anat_fit_wf(
             (fsnative_buffer, gifti_surfaces_wf, [
                 ('fsnative2anat_xfm', 'inputnode.fsnative2anat_xfm'),
             ]),
-            (gifti_surfaces_wf, surfaces_buffer, [
-                (f'outputnode.{surf}', surf) for surf in surfs
-            ]),
             (sourcefile_buffer, ds_surfaces_wf, [('anat_source_files', 'inputnode.source_files')]),
             (gifti_surfaces_wf, ds_surfaces_wf, [
                 (f'outputnode.{surf}', f'inputnode.{surf}') for surf in surfs
             ]),
+            (ds_surfaces_wf, surfaces_buffer, [
+                (f'outputnode.{surf}', surf) for surf in surfs
+            ]),
         ])  # fmt:skip
     if spheres:
         gifti_spheres_wf = init_gifti_surfaces_wf(
@@ -2256,13 +2256,13 @@ def init_infant_single_anat_fit_wf(
                 ('outputnode.subjects_dir', 'inputnode.subjects_dir'),
                 # No transform for spheres, following HCP pipelines' lead
             ]),
-            (gifti_spheres_wf, surfaces_buffer, [
-                (f'outputnode.{sphere}', sphere) for sphere in spheres
-            ]),
             (sourcefile_buffer, ds_spheres_wf, [('anat_source_files', 'inputnode.source_files')]),
             (gifti_spheres_wf, ds_spheres_wf, [
                 (f'outputnode.{sphere}', f'inputnode.{sphere}') for sphere in spheres
             ]),
+            (ds_spheres_wf, surfaces_buffer, [
+                (f'outputnode.{sphere}', sphere) for sphere in spheres
+            ]),
         ])  # fmt:skip
     metrics = [metric for metric in needed_metrics if metric not in found_surfs]
     if metrics:
@@ -2280,13 +2280,13 @@ def init_infant_single_anat_fit_wf(
                 ('outputnode.subject_id', 'inputnode.subject_id'),
                 ('outputnode.subjects_dir', 'inputnode.subjects_dir'),
             ]),
-            (gifti_morph_wf, surfaces_buffer, [
-                (f'outputnode.{metric}', metric) for metric in metrics
-            ]),
             (sourcefile_buffer, ds_morph_wf, [('anat_source_files', 'inputnode.source_files')]),
             (gifti_morph_wf, ds_morph_wf, [
                 (f'outputnode.{metric}', f'inputnode.{metric}') for metric in metrics
             ]),
+            (ds_morph_wf, surfaces_buffer, [
+                (f'outputnode.{metric}', metric) for metric in metrics
+            ]),
         ])  # fmt:skip
 
     if 'anat_ribbon' not in precomputed: