Skip to content

Commit

Permalink
Whoops.
Browse files Browse the repository at this point in the history
  • Loading branch information
tsalo committed Oct 10, 2023
1 parent e6395c3 commit b96b9c4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion xcp_d/workflows/cifti.py
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ def init_postprocess_cifti_wf(
# fmt:off
workflow.connect([
(inputnode, postproc_derivatives_wf, [
("fmriprep_confounds_file", "fmriprep_confounds_file"),
("fmriprep_confounds_file", "inputnode.fmriprep_confounds_file"),
("atlas_names", "inputnode.atlas_names"),
]),
(denoise_bold_wf, postproc_derivatives_wf, [
Expand Down
14 changes: 12 additions & 2 deletions xcp_d/workflows/outputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@ def init_postproc_derivatives_wf(
inputnode = pe.Node(
niu.IdentityInterface(
fields=[
# preprocessing files to use as sources
"fmriprep_confounds_file",
# postprocessed outputs
"atlas_names",
"confounds_file",
"coverage",
Expand Down Expand Up @@ -312,7 +315,7 @@ def init_postproc_derivatives_wf(
run_without_submitting=True,
mem_gb=1,
)
preprocessed_confounds_sources.inputs.in1 = name_source
workflow.connect([inputnode, preprocessed_confounds_sources, "fmriprep_confounds_file", "in1"])

ds_temporal_mask = pe.Node(
DerivativesDataSink(
Expand All @@ -333,6 +336,7 @@ def init_postproc_derivatives_wf(
("temporal_mask_metadata", "meta_dict"),
("temporal_mask", "in_file"),
]),
(preprocessed_confounds_sources, ds_temporal_mask, [("bids_uris", "Sources")]),
(ds_temporal_mask, outputnode, [("out_file", "temporal_mask")]),
])
# fmt:on
Expand All @@ -357,6 +361,7 @@ def init_postproc_derivatives_wf(
("motion_metadata", "meta_dict"),
("filtered_motion", "in_file"),
]),
(preprocessed_confounds_sources, ds_filtered_motion, [("bids_uris", "Sources")]),
(ds_filtered_motion, outputnode, [("out_file", "filtered_motion")]),
])
# fmt:on
Expand All @@ -374,7 +379,12 @@ def init_postproc_derivatives_wf(
name="ds_confounds",
run_without_submitting=False,
)
workflow.connect([(inputnode, ds_confounds, [("confounds_file", "in_file")])])
# fmt:off
workflow.connect([
(inputnode, ds_confounds, [("confounds_file", "in_file")]),
(preprocessed_confounds_sources, ds_confounds, [("bids_uris", "Sources")]),
])
# fmt:on

ds_coverage_files = pe.MapNode(
DerivativesDataSink(
Expand Down

0 comments on commit b96b9c4

Please sign in to comment.