temp fix composexfm naming (still a problem)

Author: kesshijordan

nipype/interfaces/dtitk/registration.py

@@ -165,7 +165,8 @@ class ComposeXfmInputSpec(CommandLineInputSpec):
                   argstr="-aff %s", mandatory=True)
     out_file = File(desc='output path',
                     argstr="-out %s",  name_source="in_df",
-                    name_template="%s_aff.df", keep_extension=True)
+                    name_template="%s_affdf.nii")
+    # keep_extension is keeping the .df but not .nii; need to figure out
 
 
 class ComposeXfmOutputSpec(TraitedSpec):
@@ -184,7 +185,8 @@ class ComposeXfm(CommandLineDtitk):
     >>> node.inputs.in_df = 'im_warp.df.nii'
     >>> node.inputs.in_aff= 'im_affine.aff'
     >>> node.cmdline
-    'dfRightComposeAffine -aff im_affine.aff -df im_warp.df.nii -out im_warp.df_aff.df'
+    'dfRightComposeAffine -aff im_affine.aff -df im_warp.df.nii -out\
+     im_warp.df_affdf.nii'
     >>> node.run() # doctest: +SKIP
     """
     input_spec = ComposeXfmInputSpec
@@ -241,7 +243,8 @@ class affSymTensor3DVol(CommandLineDtitk):
     >>> node.inputs.in_file = 'im1.nii'
     >>> node.inputs.transform = 'im_affine.aff'
     >>> node.cmdline
-    'affineSymTensor3DVolume -in im1.nii -interp LEI -out im1_affxfmd.nii -reorient PPD -trans im_affine.aff'
+    'affineSymTensor3DVolume -in im1.nii -interp LEI -out im1_affxfmd.nii\
+     -reorient PPD -trans im_affine.aff'
     >>> node.run() # doctest: +SKIP
     """
     input_spec = affSymTensor3DVolInputSpec
@@ -295,7 +298,8 @@ class affScalarVol(CommandLineDtitk):
     >>> node.inputs.in_file = 'im1.nii'
     >>> node.inputs.transform = 'im_affine.aff'
     >>> node.cmdline
-    'affineScalarVolume -in im1.nii -interp 0 -out im1_affxfmd.nii -trans im_affine.aff'
+    'affineScalarVolume -in im1.nii -interp 0 -out im1_affxfmd.nii -trans\
+     im_affine.aff'
     >>> node.run() # doctest: +SKIP
     """
     input_spec = affScalarVolInputSpec
@@ -353,7 +357,8 @@ class diffeoSymTensor3DVol(CommandLineDtitk):
     >>> node.inputs.in_file = 'im1.nii'
     >>> node.inputs.transform = 'im_warp.df.nii'
     >>> node.cmdline
-    'deformationSymTensor3DVolume -df FD -in im1.nii -interp LEI -out im1_diffeoxfmd.nii -reorient PPD -trans im_warp.df.nii'
+    'deformationSymTensor3DVolume -df FD -in im1.nii -interp LEI -out\
+     im1_diffeoxfmd.nii -reorient PPD -trans im_warp.df.nii'
     >>> node.run() # doctest: +SKIP
     """
 
@@ -408,7 +413,8 @@ class diffeoScalarVol(CommandLineDtitk):
     >>> node.inputs.in_file = 'im1.nii'
     >>> node.inputs.transform = 'im_warp.df.nii'
     >>> node.cmdline
-    'deformationScalarVolume -in im1.nii -interp 0 -out im1_diffeoxfmd.nii -trans im_warp.df.nii'
+    'deformationScalarVolume -in im1.nii -interp 0 -out im1_diffeoxfmd.nii\
+     -trans im_warp.df.nii'
     >>> node.run() # doctest: +SKIP
     """
 

nipype/interfaces/dtitk/tests/test_auto_ComposeXfm.py

@@ -26,9 +26,8 @@ def test_ComposeXfm_inputs():
         ),
         out_file=dict(
             argstr='-out %s',
-            keep_extension=True,
             name_source='in_df',
-            name_template='%s_aff.df',
+            name_template='%s_affdf.nii',
         ),
         terminal_output=dict(
             deprecated='1.0.0',