Merge pull request #2125 from djarecka/fnirt_indensity

fix to #2124

Author: effigies

nipype/interfaces/fsl/preprocess.py

@@ -877,7 +877,7 @@ class FNIRTInputSpec(FSLCommandInputSpec):
         desc=('If true, ref image is used to calculate derivatives. '
               'Default false'))
     intensity_mapping_model = traits.Enum(
-        'none', 'global_linear', 'global_non_linear'
+        'none', 'global_linear', 'global_non_linear',
         'local_linear', 'global_non_linear_with_bias',
         'local_non_linear', argstr='--intmod=%s',
         desc='Model for intensity-mapping')

nipype/interfaces/fsl/tests/test_preprocess.py

@@ -393,7 +393,8 @@ def test_fnirt(setup_flirt):
               ('in_fwhm', '--infwhm', [4, 2, 2, 0], '4,2,2,0'),
               ('apply_refmask', '--applyrefmask', [0, 0, 1, 1], '0,0,1,1'),
               ('apply_inmask', '--applyinmask', [0, 0, 0, 1], '0,0,0,1'),
-              ('regularization_lambda', '--lambda', [0.5, 0.75], '0.5,0.75')]
+              ('regularization_lambda', '--lambda', [0.5, 0.75], '0.5,0.75'),
+              ('intensity_mapping_model', '--intmod', 'global_non_linear', 'global_non_linear')]
     for item, flag, val, strval in params:
         fnirt = fsl.FNIRT(in_file=infile,
                           ref_file=reffile,
@@ -406,7 +407,7 @@ def test_fnirt(setup_flirt):
                   ' %s=%s --ref=%s'\
                   ' --iout=%s' % (infile, log,
                                   flag, strval, reffile, iout)
-        elif item in ('in_fwhm'):
+        elif item in ('in_fwhm', 'intensity_mapping_model'):
             cmd = 'fnirt --in=%s %s=%s --logout=%s '\
                   '--ref=%s --iout=%s' % (infile, flag,
                                           strval, log, reffile, iout)