- Timestamp:
- Mar 6, 2019 5:06:24 PM (6 years ago)
- 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)
- Location:
- src/sas/sascalc
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/corfunc/corfunc_calculator.py
re090ba90 rdbfd307 245 245 """Fit the Guinier region of the curve""" 246 246 A = np.vstack([q**2, np.ones(q.shape)]).T 247 return lstsq(A, np.log(iq), rcond=None) 247 # CRUFT: numpy>=1.14.0 allows rcond=None for the following default 248 rcond = np.finfo(float).eps * max(A.shape) 249 return lstsq(A, np.log(iq), rcond=rcond) 248 250 249 251 def _fit_porod(self, q, iq): -
src/sas/sascalc/invariant/invariant.py
re090ba90 rdbfd307 344 344 else: 345 345 A = np.vstack([linearized_data.x / linearized_data.dy, 1.0 / linearized_data.dy]).T 346 # CRUFT: numpy>=1.14.0 allows rcond=None for the following default 347 rcond = np.finfo(float).eps * max(A.shape) 346 348 p, residuals, _, _ = np.linalg.lstsq(A, linearized_data.y / linearized_data.dy, 347 rcond= None)349 rcond=rcond) 348 350 349 351 # Get the covariance matrix, defined as inv_cov = a_transposed * a -
src/sas/sascalc/pr/invertor.py
r57e48ca r7af652d 474 474 475 475 # 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) 477 479 # Sanity check 478 480 try:
Note: See TracChangeset
for help on using the changeset viewer.