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


Ignore:
Timestamp:
Mar 6, 2019 6:18:09 PM (6 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249
Children:
f923967
Parents:
cb64d86 (diff), f205d3a (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.
Message:

Merge branch 'master' into py37-sasgui

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sascalc/pr/invertor.py

    r57e48ca r7af652d  
    474474 
    475475        # Perform the inversion (least square fit) 
    476         c, chi2, _, _ = lstsq(a, b, rcond=-1) 
     476        # CRUFT: numpy>=1.14.0 allows rcond=None for the following default 
     477        rcond = np.finfo(float).eps * max(a.shape) 
     478        c, chi2, _, _ = lstsq(a, b, rcond=rcond) 
    477479        # Sanity check 
    478480        try: 
Note: See TracChangeset for help on using the changeset viewer.