Merge pull request #1525 from satra/fix/fast

fix: more fast fixes

Author: satra

nipype/interfaces/fsl/preprocess.py

@@ -1573,6 +1573,9 @@ def _gen_fname(self, name):
         method = 'none'
         if isdefined(self.inputs.method) and self.inputs.method != 'none':
             method = 'fast'
+            if self.inputs.list_of_specific_structures and \
+                self.inputs.method == 'auto':
+                method = 'none'
 
         if isdefined(self.inputs.method_as_numerical_threshold):
             thres = '%.4f' % self.inputs.method_as_numerical_threshold

nipype/interfaces/fsl/tests/test_preprocess.py

@@ -579,3 +579,8 @@ def test_first_genfname():
     value = first._gen_fname(name='original_segmentations')
     expected_value = os.path.abspath('segment_all_none_origsegs.nii.gz')
     yield assert_equal, value, expected_value
+    first.inputs.method = 'auto'
+    first.inputs.list_of_specific_structures = ['L_Hipp', 'R_Hipp']
+    value = first._gen_fname(name='original_segmentations')
+    expected_value = os.path.abspath('segment_all_none_origsegs.nii.gz')
+    yield assert_equal, value, expected_value