testing file naming

Author: kesshijordan

nipype/interfaces/dtitk/registration.py

@@ -39,14 +39,23 @@ class RigidTask(CommandLineDtitk):
     output_spec = RigidOutputSpec
     _cmd = 'dti_rigid_sn'
 
+    def _gen_outfilename(self):
+        out_file = self.inputs.out_file
+        if not isdefined(out_file) and isdefined(self.inputs.in_file):
+            out_file = self._gen_fname(self.inputs.in_file,
+                                       suffix='.aff', change_ext=False)
+
     def _list_outputs(self):
         outputs = self.output_spec().get()
-        outputs['out_file_xfm'] = self.inputs.in_file.replace('.nii.gz',
-                                                              '.aff')
+        outputs['out_file_xfm'] = self._gen_outfilename()
         outputs['out_file'] = self.inputs.in_file.replace('.nii.gz',
                                                           '_aff.nii.gz')
         return outputs
 
+    def _gen_fname(self, name):
+        if name == 'out_file':
+            return self._gen_outfilename()
+
 
 class AffineInputSpec(CommandLineInputSpec):
     in_fixed_tensor = traits.Str(desc="fixed diffusion tensor image",

nipype/interfaces/dtitk/utils.py

@@ -117,7 +117,7 @@ class SVAdjustVoxSpInputSpec(CommandLineInputSpec):
                            position=2, argstr="-target %s")
     in_voxsz = traits.Str(desc='resampled voxel size', exists=True,
                           mandatory=False, position=3, argstr="-vsize %s")
-    out_path = traits.Str(desc='output path', exists=True, mandatory=False,
+    out_file = traits.Str(desc='output path', exists=True, mandatory=False,
                           position=1, argstr="-out %s",
                           name_source="in_file",
                           name_template='%s_origmvd.nii.gz')
@@ -146,23 +146,23 @@ class SVAdjustVoxSpTask(CommandLineDtitk):
     _cmd = 'SVAdjustVoxelspace'
     _suffix = '_reslice'
 
+    def _gen_filename(self, name):
+        if name == "out_file":
+            return self._list_outputs()["out_file"]
+        return None
+
     def _list_outputs(self):
         outputs = self.output_spec().get()
         outputs['out_file'] = self.inputs.out_file
         if not isdefined(self.inputs.out_file):
-            outputs["out_file"] = self._gen_fname(self.inputs.in_file,
+            outputs["out_file"] = self._gen_filename(self.inputs.in_file,
                                                   suffix=self._suffix,
                                                   ext='.' + '.'.join(
                                                       self.inputs.in_file.
-                                                      plit(".")[1:]))
+                                                      split(".")[1:]))
         outputs["out_file"] = os.path.abspath(outputs["out_file"])
         return outputs
 
-    def _gen_filename(self, name):
-        if name == "out_file":
-            return self._list_outputs()["out_file"]
-        return None
-
 
 class TVResampleInputSpec(CommandLineInputSpec):
     in_file = traits.Str(desc="image to resample", exists=True,