name template for XfmAvg

Author: carlohamalainen

nipype/interfaces/minc/minc.py

@@ -3284,7 +3284,11 @@ class XfmAvgInputSpec(CommandLineInputSpec):
         desc='output file',
         genfile=True,
         argstr='%s',
-        position=-1,)
+        position=-1,
+        name_source=['input_files'],
+        hash_files=False,
+        name_template='%s_xfmavg.xfm',
+        keep_extension=False)
 
     verbose = traits.Bool(
         desc='Print out log messages. Default: False.',
@@ -3314,7 +3318,6 @@ class XfmAvgInputSpec(CommandLineInputSpec):
 
 class XfmAvgOutputSpec(TraitedSpec):
     output_file = File(desc='output file', exists=True)
-    # FIXME is exists=True always correct?
     output_grid = File(desc='output grid file', exists=True)
 
 
@@ -3343,32 +3346,13 @@ class XfmAvg(CommandLine):
     output_spec = XfmAvgOutputSpec
     _cmd = 'xfmavg'
 
-    def _gen_filename(self, name):
-        if name == 'output_file':
-            output_file = self.inputs.output_file
-
-            if isdefined(output_file):
-                return os.path.abspath(output_file)
-            else:
-                return aggregate_filename(
-                    self.inputs.input_files, 'xfmavg_output') + '.xfm'
-        else:
-            raise NotImplemented
-
-    def _gen_outfilename(self):
-        return self._gen_filename('output_file')
-
     def _list_outputs(self):
-        outputs = self.output_spec().get()
-        outputs['output_file'] = os.path.abspath(self._gen_outfilename())
+        outputs = super(XfmAvg, self)._list_outputs()
 
-        # FIXME Is this the sensible? No other way to tell if the grid files
-        # were produced.
-        # FIXME This is safe to assume?
-        assert os.path.exists(outputs['output_file'])
-        if 'grid' in open(outputs['output_file'], 'r').read():
-            outputs['output_grid'] = re.sub(
-                '.(nlxfm|xfm)$', '_grid_0.mnc', outputs['output_file'])
+        if os.path.exists(outputs['output_file']):
+            if 'grid' in open(outputs['output_file'], 'r').read():
+                outputs['output_grid'] = re.sub(
+                    '.(nlxfm|xfm)$', '_grid_0.mnc', outputs['output_file'])
 
         return outputs