Changes in src/sas/sascalc/pr/invertor.py [57e48ca:dbfd307] in sasview

File:

• src/sas/sascalc/pr/invertor.py (modified) (11 diffs)

src/sas/sascalc/pr/invertor.py

@@ -6 +6 @@
 FIXME: The way the Invertor interacts with its C component should be cleaned up
 """
-from __future__ import division
 
 import numpy as np
@@ -18 +17 @@
 from numpy.linalg import lstsq
 from scipy import optimize
-from sas.sascalc.pr._pr_inversion import Cinvertor
+from sas.sascalc.pr.core.pr_inversion import Cinvertor
 
 logger = logging.getLogger(__name__)
@@ -72 +71 @@
         A[j][i] = (Fourier transformed base function for point j)
 
-    We then choose a number of r-points, n_r, to evaluate the second
+    We them choose a number of r-points, n_r, to evaluate the second
     derivative of P(r) at. This is used as our regularization term.
     For a vector r of length n_r, the following n_r rows are set to ::
@@ -145 +144 @@
         x, y, err, d_max, q_min, q_max and alpha
         """
-        if name == 'x':
+        if   name == 'x':
             if 0.0 in value:
                 msg = "Invertor: one of your q-values is zero. "
@@ -269 +268 @@
             A[i][j] = (Fourier transformed base function for point j)
 
-        We then choose a number of r-points, n_r, to evaluate the second
+        We them choose a number of r-points, n_r, to evaluate the second
         derivative of P(r) at. This is used as our regularization term.
         For a vector r of length n_r, the following n_r rows are set to ::
@@ -417 +416 @@
             A[i][j] = (Fourier transformed base function for point j)
 
-        We then choose a number of r-points, n_r, to evaluate the second
+        We them choose a number of r-points, n_r, to evaluate the second
         derivative of P(r) at. This is used as our regularization term.
         For a vector r of length n_r, the following n_r rows are set to ::
@@ -474 +473 @@
 
         # 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:
@@ -497 +498 @@
         try:
             cov = np.linalg.pinv(inv_cov)
-            err = math.fabs(chi2 / (npts - nfunc)) * cov
-        except Exception as exc:
+            err = math.fabs(chi2 / float(npts - nfunc)) * cov
+        except:
             # We were not able to estimate the errors
             # Return an empty error matrix
-            logger.error(exc)
+            logger.error(sys.exc_value)
 
         # Keep a copy of the last output
@@ -538 +539 @@
 
         """
-        from .num_term import NTermEstimator
+        from num_term import NTermEstimator
         estimator = NTermEstimator(self.clone())
         try:
             return estimator.num_terms(isquit_func)
-        except Exception as exc:
+        except:
             # If we fail, estimate alpha and return the default
             # number of terms
             best_alpha, _, _ = self.estimate_alpha(self.nfunc)
-            logger.warning("Invertor.estimate_numterms: %s" % exc)
+            logger.warning("Invertor.estimate_numterms: %s" % sys.exc_value)
             return self.nfunc, best_alpha, "Could not estimate number of terms"
 
@@ -632 +633 @@
                 return best_alpha, message, elapsed
 
-        except Exception as exc:
-            message = "Invertor.estimate_alpha: %s" % exc
+        except:
+            message = "Invertor.estimate_alpha: %s" % sys.exc_value
             return 0, message, elapsed
 
@@ -749 +750 @@
                         self.cov[i][i] = float(toks2[1])
 
-            except Exception as exc:
-                msg = "Invertor.from_file: corrupted file\n%s" % exc
+            except:
+                msg = "Invertor.from_file: corrupted file\n%s" % sys.exc_value
                 raise RuntimeError(msg)
         else: