Merge pull request #1524 from satra/fix/fast

Fix/fast

Author: satra

nipype/interfaces/fsl/preprocess.py

@@ -1571,7 +1571,7 @@ def _gen_fname(self, name):
         path, outname, ext = split_filename(self.inputs.out_file)
 
         method = 'none'
-        if isdefined(self.inputs.method) and self.inputs.method == 'fast':
+        if isdefined(self.inputs.method) and self.inputs.method != 'none':
             method = 'fast'
 
         if isdefined(self.inputs.method_as_numerical_threshold):

nipype/interfaces/fsl/tests/test_preprocess.py

@@ -10,7 +10,7 @@
                             skipif)
 
 from nipype.utils.filemanip import split_filename
-import nipype.interfaces.fsl.preprocess as fsl
+from .. import preprocess as fsl
 from nipype.interfaces.fsl import Info
 from nipype.interfaces.base import File, TraitError, Undefined, isdefined
 from nipype.interfaces.fsl import no_fsl
@@ -564,3 +564,18 @@ def test_fugue():
         yield assert_equal, op.basename(res.outputs.unwarped_file), out_name
 
     teardown_fugue(tmpdir)
+
+
+@skipif(no_fsl)
+def test_first_genfname():
+    first = fsl.FIRST()
+    first.inputs.out_file = 'segment.nii'
+    first.inputs.output_type = "NIFTI_GZ"
+
+    value = first._gen_fname(name='original_segmentations')
+    expected_value = os.path.abspath('segment_all_fast_origsegs.nii.gz')
+    yield assert_equal, value, expected_value
+    first.inputs.method = 'none'
+    value = first._gen_fname(name='original_segmentations')
+    expected_value = os.path.abspath('segment_all_none_origsegs.nii.gz')
+    yield assert_equal, value, expected_value