Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ENH: Multiplex fieldmap estimation outputs into a single outputnode #149

Merged
merged 2 commits into from
Dec 11, 2020
Merged

ENH: Multiplex fieldmap estimation outputs into a single outputnode #149

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8ac4fc
ENH: Multiplex fieldmap estimation outputs into a single ``outputnode``
oesteban Dec 11, 2020
afd4a00
fix: multiplicity of connections
oesteban Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions sdcflows/workflows/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,25 @@ def init_fmap_preproc_wf(
from .outputs import init_fmap_derivatives_wf, init_fmap_reports_wf

workflow = Workflow(name=name)
for estimator in estimators:

out_fields = ("fmap", "fmap_ref", "fmap_coeff", "fmap_mask")
out_merge = {
f: pe.Node(niu.Merge(len(estimators)), name=f"out_merge_{f}")
for f in out_fields
}
outputnode = pe.Node(niu.IdentityInterface(fields=out_fields), name="outputnode")

workflow.connect([
(mergenode, outputnode, [("out", field)])
for field, mergenode in out_merge.items()
])

for n, estimator in enumerate(estimators):
est_wf = estimator.get_workflow(omp_nthreads=omp_nthreads, debug=debug)
source_files = [str(f.path) for f in estimator.sources]

outputnode = pe.Node(
niu.IdentityInterface(
fields=["fmap", "fmap_ref", "fmap_coeff", "fmap_mask"]
),
name=f"out_{estimator.bids_id}",
out_map = pe.Node(
niu.IdentityInterface(fields=out_fields), name=f"out_{estimator.bids_id}"
)

fmap_derivatives_wf = init_fmap_derivatives_wf(
Expand Down Expand Up @@ -116,7 +126,7 @@ def init_fmap_preproc_wf(
(est_wf, fmap_reports_wf, [
("outputnode.fmap_mask", "inputnode.fmap_mask"),
]),
(est_wf, outputnode, [("outputnode.fmap_mask", "fmap_mask")]),
(est_wf, out_map, [("outputnode.fmap_mask", "fmap_mask")]),
])
# fmt:on

Expand All @@ -131,11 +141,15 @@ def init_fmap_preproc_wf(
("outputnode.fmap", "inputnode.fieldmap"),
("outputnode.fmap_ref", "inputnode.fmap_ref"),
]),
(est_wf, outputnode, [
(est_wf, out_map, [
("outputnode.fmap", "fmap"),
("outputnode.fmap_ref", "fmap_ref"),
("outputnode.fmap_coeff", "fmap_coeff"),
]),
])
# fmt:on

for field, mergenode in out_merge.items():
workflow.connect(out_map, field, mergenode, f"in{n}")

return workflow