BF: fix parrec2nii scaling=off, test scaling

Scaling=off was broken; test all scalings, fix scaling=off.

Author: matthew-brett

bin/parrec2nii

@@ -136,7 +136,7 @@ def proc_file(infile, opts):
                       'overwrite it' % outfilename)
 
     # load the PAR header and data
-    scaling = None if opts.scaling == 'off' else opts.scaling
+    scaling = 'dv' if opts.scaling == 'off' else opts.scaling
     infile = fname_ext_ul_case(infile)
     pr_img = pr.load(infile,
                      permit_truncated=opts.permit_truncated,

nibabel/parrec.py

@@ -929,7 +929,7 @@ def get_data_scaling(self, method="dv"):
             slope = 1.0 / scale_slope
             intercept = rescale_intercept / (rescale_slope * scale_slope)
         else:
-            raise ValueError("Unknown scling method '%s'." % method)
+            raise ValueError("Unknown scaling method '%s'." % method)
         reorder = self.get_sorted_slice_indices()
         slope = slope[reorder]
         intercept = intercept[reorder]

nibabel/tests/test_scripts.py

@@ -20,7 +20,7 @@
 from nose.tools import (assert_true, assert_false, assert_not_equal,
                         assert_equal)
 
-from numpy.testing import assert_almost_equal
+from numpy.testing import assert_almost_equal, assert_array_equal
 
 from .scriptrunner import ScriptRunner
 from .nibabel_data import needs_nibabel_data
@@ -104,6 +104,24 @@ def test_parrec2nii():
             data = img.get_data()
             assert_data_similar(data, eg_dict)
             assert_almost_equal(img.header.get_zooms(), eg_dict['zooms'])
+            # Check scaling options
+            cmd = ['parrec2nii', '--scaling=dv', fname]
+            # Does not overwrite unless option given
+            code, stdout, stderr = run_command(cmd, check_code=False)
+            assert_equal(code, 1)
+            cmd.append('--overwrite')
+            run_command(cmd)
+            img = load(out_froot)
+            assert_data_similar(img.get_data(), eg_dict)
+            # fp scaling
+            run_command(['parrec2nii', '--scaling=fp', '--overwrite', fname])
+            pr_img = load(fname, scaling='fp')
+            img = load(out_froot)
+            assert_true(np.allclose(img.get_data(), pr_img.get_data()))
+            # no scaling
+            run_command(['parrec2nii', '--scaling=off', '--overwrite', fname])
+            img = load(out_froot)
+            assert_almost_equal(img.get_data(), pr_img.dataobj.get_unscaled())
 
 
 @script_test