Changeset dbfd307 in sasview

Timestamp:

Mar 5, 2019 4:21:09 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1249

Children:

7af652d

Parents:

4cbb2f5

Message:

use np ≥ 1.14.0 default for lstsq rcond, but compatible with np < 1.14.0

Location:

src/sas/sascalc

Files:

• corfunc/corfunc_calculator.py (modified) (1 diff)
• invariant/invariant.py (modified) (1 diff)
• pr/invertor.py (modified) (1 diff)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -245 +245 @@
         """Fit the Guinier region of the curve"""
         A = np.vstack([q**2, np.ones(q.shape)]).T
-        return lstsq(A, np.log(iq), rcond=None)
+        # CRUFT: numpy>=1.14.0 allows rcond=None for the following default
+        rcond = np.finfo(float).eps * max(A.shape)
+        return lstsq(A, np.log(iq), rcond=rcond)
 
     def _fit_porod(self, q, iq):

src/sas/sascalc/invariant/invariant.py

@@ -344 +344 @@
         else:
             A = np.vstack([linearized_data.x / linearized_data.dy, 1.0 / linearized_data.dy]).T
+            # CRUFT: numpy>=1.14.0 allows rcond=None for the following default
+            rcond = np.finfo(float).eps * max(A.shape)
             p, residuals, _, _ = np.linalg.lstsq(A, linearized_data.y / linearized_data.dy,
-                                                 rcond=None)
+                                                 rcond=rcond)
 
             # Get the covariance matrix, defined as inv_cov = a_transposed * a

src/sas/sascalc/pr/invertor.py

@@ -473 +473 @@
 
         # Perform the inversion (least square fit)
-        c, chi2, _, _ = lstsq(a, b)
+        # CRUFT: numpy>=1.14.0 allows rcond=None for the following default
+        rcond = np.finfo(float).eps * max(a.shape)
+        c, chi2, _, _ = lstsq(a, b, rcond=rcond)
         # Sanity check
         try: