Skip to content

[ENH] Update mrtrix reconst.py EstimateFOD max_sh to be able to accept list #2990

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

Merged
merged 5 commits into from
Aug 17, 2019
Merged

[ENH] Update mrtrix reconst.py EstimateFOD max_sh to be able to accept list #2990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c1a4cd
Update reconst.py
lucindasisk Aug 6, 2019
26bf3af
Revert argstr to use %d
lucindasisk Aug 13, 2019
847b423
TEST: Update EstimateFOD autotest
lucindasisk Aug 16, 2019
4d2d260
Update nipype/interfaces/mrtrix3/reconst.py - change back to %s
lucindasisk Aug 17, 2019
3b1b62a
Update nipype/interfaces/mrtrix3/tests/test_auto_EstimateFOD.py
lucindasisk Aug 17, 2019
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
13 changes: 8 additions & 5 deletions nipype/interfaces/mrtrix3/reconst.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import os.path as op

from ..base import traits, TraitedSpec, File, Undefined
from ..base import traits, TraitedSpec, File, Undefined, InputMultiObject
from .base import MRTrix3BaseInputSpec, MRTrix3Base


Expand Down Expand Up @@ -115,10 +115,13 @@ class EstimateFODInputSpec(MRTrix3BaseInputSpec):
sep=',',
argstr='-shell %s',
desc='specify one or more dw gradient shells')
max_sh = traits.Int(
8, usedefault=True,
argstr='-lmax %d',
desc='maximum harmonic degree of response function')
max_sh = InputMultiObject(
traits.Int,
value=[8],
usedefault=True,
argstr='-lmax %s',
sep=',',
desc=('maximum harmonic degree of response function - single value for single-shell response, list for multi-shell response'))
in_dirs = File(
exists=True,
argstr='-directions %s',
Expand Down
9 changes: 7 additions & 2 deletions nipype/interfaces/mrtrix3/tests/test_auto_EstimateFOD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,12 @@ def test_EstimateFOD_inputs():
grad_file=dict(
argstr='-grad %s',
extensions=None,
xor=['grad_fsl'],
),
grad_fsl=dict(
argstr='-fslgrad %s %s',
xor=['grad_file'],
),
grad_fsl=dict(argstr='-fslgrad %s %s', ),
in_bval=dict(extensions=None, ),
in_bvec=dict(
argstr='-fslgrad %s %s',
Expand All @@ -63,7 +67,8 @@ def test_EstimateFOD_inputs():
extensions=None,
),
max_sh=dict(
argstr='-lmax %d',
argstr='-lmax %s',
sep=',',
usedefault=True,
),
nthreads=dict(
Expand Down