Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
tsalo committed Oct 9, 2024
1 parent 4abb7e2 commit d4db0b5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
10 changes: 4 additions & 6 deletions src/fmripost_rapidtide/tests/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,17 @@
from fmripost_rapidtide import config


def test_init_rapidtide_wf(tmp_path_factory):
from fmripost_rapidtide.workflows.base import init_rapidtide_wf
def test_init_rapidtide_fit_wf(tmp_path_factory):
from fmripost_rapidtide.workflows.rapidtide import init_rapidtide_fit_wf

tempdir = tmp_path_factory.mktemp('test_init_rapidtide_wf')
tempdir = tmp_path_factory.mktemp('test_init_rapidtide_fit_wf')

with mock_config():
config.execution.output_dir = tempdir / 'out'
config.execution.work_dir = tempdir / 'work'
config.workflow.denoise_method = ['nonaggr', 'orthaggr']
config.workflow.melodic_dim = -200
config.workflow.err_on_warn = False

wf = init_rapidtide_wf(
wf = init_rapidtide_fit_wf(
bold_file='sub-01_task-rest_bold.nii.gz',
metadata={'RepetitionTime': 2.0},
mem_gb={
Expand Down
4 changes: 2 additions & 2 deletions src/fmripost_rapidtide/workflows/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def init_fit_single_run_wf(*, bold_file):
from fmripost_rapidtide.interfaces.misc import ApplyTransforms

Check warning on line 329 in src/fmripost_rapidtide/workflows/base.py

View check run for this annotation

Codecov / codecov/patch

src/fmripost_rapidtide/workflows/base.py#L329

Added line #L329 was not covered by tests
from fmripost_rapidtide.utils.bids import collect_derivatives, extract_entities
from fmripost_rapidtide.workflows.outputs import init_func_fit_reports_wf
from fmripost_rapidtide.workflows.rapidtide import init_rapidtide_wf
from fmripost_rapidtide.workflows.rapidtide import init_rapidtide_fit_wf

Check warning on line 332 in src/fmripost_rapidtide/workflows/base.py

View check run for this annotation

Codecov / codecov/patch

src/fmripost_rapidtide/workflows/base.py#L332

Added line #L332 was not covered by tests

spaces = config.workflow.spaces
omp_nthreads = config.nipype.omp_nthreads
Expand Down Expand Up @@ -410,7 +410,7 @@ def init_fit_single_run_wf(*, bold_file):
skip_vols = get_nss(functional_cache['confounds'])

# Run rapidtide
rapidtide_wf = init_rapidtide_wf(bold_file=bold_file, metadata=bold_metadata, mem_gb=mem_gb)
rapidtide_wf = init_rapidtide_fit_wf(bold_file=bold_file, metadata=bold_metadata, mem_gb=mem_gb)

Check warning on line 413 in src/fmripost_rapidtide/workflows/base.py

View check run for this annotation

Codecov / codecov/patch

src/fmripost_rapidtide/workflows/base.py#L413

Added line #L413 was not covered by tests
rapidtide_wf.inputs.inputnode.confounds = functional_cache['confounds']
rapidtide_wf.inputs.inputnode.skip_vols = skip_vols

Expand Down

0 comments on commit d4db0b5

Please sign in to comment.