Changeset f205d3a in sasview for src/sas/sascalc/pr/invertor.py

Timestamp:

Mar 6, 2019 5:06:24 PM (5 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

e66f9c1, 9a1204d, 3c680c1, 1342f6a

Parents:

8c9e65c (diff), 7af652d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (03/06/19 17:06:24)

git-committer:

GitHub <noreply@…> (03/06/19 17:06:24)

Message:

Merge pull request #207 from SasView?/py37-sascalc

File:

• src/sas/sascalc/pr/invertor.py (modified) (1 diff)

src/sas/sascalc/pr/invertor.py

@@ -474 +474 @@
 
         # Perform the inversion (least square fit)
-        c, chi2, _, _ = lstsq(a, b, rcond=-1)
+        # 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: