Skip to content

[ENH] add -dsort option to TProject #2623

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 3 commits into from
Jun 28, 2018
Merged

[ENH] add -dsort option to TProject #2623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb96c1e
add -dsort option to TProject
mattcieslak Jun 20, 2018
76203b2
modified to handle multiple dsort files
mattcieslak Jun 21, 2018
264f0e4
Use correct argstr for multiple dsorts
mattcieslak Jun 27, 2018
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: 12 additions & 1 deletion nipype/interfaces/afni/preprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
from ...utils.filemanip import (load_json, save_json, split_filename,
fname_presuffix)
from ..base import (CommandLineInputSpec, CommandLine, TraitedSpec, traits,
isdefined, File, InputMultiPath, Undefined, Str)
isdefined, File, InputMultiPath, Undefined, Str,
InputMultiObject)

from .base import (AFNICommandBase, AFNICommand, AFNICommandInputSpec,
AFNICommandOutputSpec, AFNIPythonCommandInputSpec,
Expand Down Expand Up @@ -2492,6 +2493,15 @@ class TProjectInputSpec(AFNICommandInputSpec):
even if -ort contains constant terms, as all means are
removed.""",
argstr="-polort %d")
dsort = InputMultiObject(
File(
exists=True,
copyfile=False),
argstr="-dsort %s...",
desc="""Remove the 3D+time time series in dataset fset.
++ That is, 'fset' contains a different nuisance time
series for each voxel (e.g., from AnatICOR).
++ Multiple -dsort options are allowed.""")
bandpass = traits.Tuple(
traits.Float, traits.Float,
desc="""Remove all frequencies EXCEPT those in the range""",
Expand Down Expand Up @@ -2559,6 +2569,7 @@ class TProject(AFNICommand):
_cmd = '3dTproject'
input_spec = TProjectInputSpec
output_spec = AFNICommandOutputSpec


class TShiftInputSpec(AFNICommandInputSpec):
in_file = File(
Expand Down
1 change: 1 addition & 0 deletions nipype/interfaces/afni/tests/test_auto_TProject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def test_TProject_inputs():
censor=dict(argstr='-censor %s', ),
censortr=dict(argstr='-CENSORTR %s', ),
concat=dict(argstr='-concat %s', ),
dsort=dict(argstr='-dsort %s...', ),
environ=dict(
nohash=True,
usedefault=True,
Expand Down
4 changes: 2 additions & 2 deletions nipype/interfaces/ants/tests/test_auto_AntsJointFusion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ def test_AntsJointFusion_inputs():
hash_files=False,
),
out_label_post_prob_name_format=dict(
requires=['out_label_fusion', 'out_intensity_fusion_name_format'],
),
requires=['out_label_fusion',
'out_intensity_fusion_name_format'], ),
patch_metric=dict(argstr='-m %s', ),
patch_radius=dict(
argstr='-p %s',
Expand Down