Merge pull request #2623 from mattcieslak/master

[ENH] add -dsort option to TProject

Author: mgxd

nipype/interfaces/afni/preprocess.py

@@ -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,
@@ -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""",
@@ -2559,6 +2569,7 @@ class TProject(AFNICommand):
     _cmd = '3dTproject'
     input_spec = TProjectInputSpec
     output_spec = AFNICommandOutputSpec
+    
 
 class TShiftInputSpec(AFNICommandInputSpec):
     in_file = File(

nipype/interfaces/afni/tests/test_auto_TProject.py

@@ -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,

nipype/interfaces/ants/tests/test_auto_AntsJointFusion.py

@@ -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',