Merge pull request #740 from chrisfilo/fix/volreg

fixed #722

Author: chrisgorgo

nipype/interfaces/afni/preprocess.py

@@ -560,9 +560,9 @@ class VolregInputSpec(AFNICommandInputSpec):
                       ' by \'n\' voxels during rotations',
                       argstr='-zpad %d',
                       position=-5)
-    md1dfile = File(desc='max displacement output file',
-                    argstr='-maxdisp1D %s',
-                    position=-4)
+    md1d_file = File(name_template='%s_md.1D', desc='max displacement output file',
+                    argstr='-maxdisp1D %s', name_source="in_file",
+                    keep_extension=True, position=-4)
     oned_file = File(name_template='%s.1D', desc='1D movement parameters output file',
                      argstr='-1Dfile %s',
                      name_source="in_file",
@@ -597,7 +597,7 @@ class Volreg(AFNICommand):
     >>> volreg.inputs.zpad = 4
     >>> volreg.inputs.outputtype = "NIFTI"
     >>> volreg.cmdline #doctest: +ELLIPSIS
-    '3dvolreg -Fourier -twopass -1Dfile functional.1D -prefix functional_volreg.nii -zpad 4 functional.nii'
+    '3dvolreg -Fourier -twopass -1Dfile functional.1D -prefix functional_volreg.nii -zpad 4 -maxdisp1D functional_md.1D functional.nii'
     >>> res = volreg.run() # doctest: +SKIP
 
     """

nipype/interfaces/afni/tests/test_auto_Volreg.py

@@ -20,24 +20,27 @@ def test_Volreg_inputs():
     args=dict(argstr='%s',
     ),
     outputtype=dict(),
-    md1dfile=dict(position=-4,
-    argstr='-maxdisp1D %s',
-    ),
     zpad=dict(position=-5,
     argstr='-zpad %d',
     ),
     terminal_output=dict(mandatory=True,
     nohash=True,
     ),
-    environ=dict(nohash=True,
-    usedefault=True,
+    md1d_file=dict(name_source='in_file',
+    keep_extension=True,
+    position=-4,
+    name_template='%s_md.1D',
+    argstr='-maxdisp1D %s',
     ),
     in_file=dict(position=-1,
     mandatory=True,
     argstr='%s',
     ),
     copyorigin=dict(argstr='-twodup',
     ),
+    environ=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(name_source='in_file',
     name_template='%s_volreg',
     argstr='-prefix %s',