Skip to content

Commit 604eeef

Browse files
authored
Use BIDSURI in init_ds_boldmask_wf (#3297)
Closes #3252. ## Changes proposed in this pull request - Replace `RawSources` in `init_ds_boldmask_wf` with `Sources` determined using `BIDSURI`.
1 parent d2f6869 commit 604eeef

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

fmriprep/workflows/bold/fit.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,6 @@ def init_bold_fit_wf(
474474
name='ds_coreg_boldref_wf',
475475
)
476476
ds_boldmask_wf = init_ds_boldmask_wf(
477-
bids_root=layout.root,
478477
output_dir=config.execution.fmriprep_dir,
479478
desc='brain',
480479
name='ds_boldmask_wf',

fmriprep/workflows/bold/outputs.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
from nipype.pipeline import engine as pe
3030
from niworkflows.interfaces.fixes import FixHeaderApplyTransforms as ApplyTransforms
3131
from niworkflows.utils.images import dseg_label
32-
from smriprep.workflows.outputs import _bids_relative
3332

3433
from fmriprep import config
3534
from fmriprep.config import DEFAULT_MEMORY_MIN_GB
@@ -474,7 +473,6 @@ def init_ds_boldref_wf(
474473

475474
def init_ds_boldmask_wf(
476475
*,
477-
bids_root,
478476
output_dir,
479477
desc: str,
480478
name='ds_boldmask_wf',
@@ -488,8 +486,14 @@ def init_ds_boldmask_wf(
488486
)
489487
outputnode = pe.Node(niu.IdentityInterface(fields=['boldmask']), name='outputnode')
490488

491-
raw_sources = pe.Node(niu.Function(function=_bids_relative), name='raw_sources')
492-
raw_sources.inputs.bids_root = bids_root
489+
sources = pe.Node(
490+
BIDSURI(
491+
numinputs=1,
492+
dataset_links=config.execution.dataset_links,
493+
out_dir=str(config.execution.fmriprep_dir.absolute()),
494+
),
495+
name='sources',
496+
)
493497

494498
ds_boldmask = pe.Node(
495499
DerivativesDataSink(
@@ -504,12 +508,12 @@ def init_ds_boldmask_wf(
504508
)
505509

506510
workflow.connect([
507-
(inputnode, raw_sources, [('source_files', 'in_files')]),
511+
(inputnode, sources, [('source_files', 'in1')]),
508512
(inputnode, ds_boldmask, [
509513
('boldmask', 'in_file'),
510514
('source_files', 'source_file'),
511515
]),
512-
(raw_sources, ds_boldmask, [('out', 'RawSources')]),
516+
(sources, ds_boldmask, [('out', 'Sources')]),
513517
(ds_boldmask, outputnode, [('out_file', 'boldmask')]),
514518
]) # fmt:skip
515519

0 commit comments

Comments
 (0)