Changeset 007f9b3 in sasview

Timestamp:

Nov 22, 2011 4:18:22 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

641166b

Parents:

d404f19

Message:

Re #5 Fix p(r) unit tests

Location:

pr_inversion

Files:

• src/sans/pr/c_extensions/Cinvertor.c (modified) (1 diff)
• src/sans/pr/invertor.py (modified) (3 diffs)
• test/utest_invertor.py (modified) (1 diff)

pr_inversion/src/sans/pr/c_extensions/Cinvertor.c

@@ -700 +700 @@
         if (!PyArg_ParseTuple(args, "OOd", &data_obj, &err_obj, &r)) return NULL;
         OUTVECTOR(data_obj,pars,npars);
-        OUTVECTOR(err_obj,pars_err,npars2);
-
-        pr_err(pars, pars_err, self->params.d_max, npars, r, &pr_value, &pr_err_value);
+
+        if (err_obj == Py_None) {
+                pr_value = pr(pars, self->params.d_max, npars, r);
+                pr_err_value = 0.0;
+        } else {
+                OUTVECTOR(err_obj,pars_err,npars2);
+                pr_err(pars, pars_err, self->params.d_max, npars, r, &pr_value, &pr_err_value);
+        }
         return Py_BuildValue("ff", pr_value, pr_err_value);
 }

pr_inversion/src/sans/pr/invertor.py

@@ -319 +319 @@
         t_0 = time.time()
         out, cov_x, _, _, _ = optimize.leastsq(self.residuals,
-                                                            p, full_output=1,
-                                                             warning=True)
+                                                            p, full_output=1)
         
         # Compute chi^2
@@ -333 +332 @@
         self.elapsed = time.time() - t_0
         
+        if cov_x is None:
+            cov_x = numpy.ones([nfunc,nfunc])
+            cov_x *= math.fabs(chisqr)
         return out, cov_x
     
@@ -353 +355 @@
         t_0 = time.time()
         out, cov_x, info, mesg, success = optimize.leastsq(self.pr_residuals, p,
-                                                            full_output=1,
-                                                            warning=True)
+                                                            full_output=1)
         
         # Compute chi^2

pr_inversion/test/utest_invertor.py

@@ -481 +481 @@
         self.invertor.err = err
         # Perform inversion
-        self.assertRaises(ValueError, self.invertor.invert, 10)
+        self.assertRaises(numpy.linalg.LinAlgError, self.invertor.invert, 10)