Changeset 82d88d5 in sasview for src/sas/sascalc/pr

Timestamp:

Mar 6, 2019 4: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

Location:

src/sas/sascalc/pr

Files:

• distance_explorer.py (modified) (1 diff)
• fit/expression.py (modified) (1 diff)
• invertor.py (modified) (1 diff)
• num_term.py (modified) (1 diff)

src/sas/sascalc/pr/distance_explorer.py

@@ -99 +99 @@
                 results.pos_err.append(pos_err)
                 results.osc.append(osc)
-            except:
+            except Exception as exc:
                 # This inversion failed, skip this D_max value
                 msg = "ExploreDialog: inversion failed for "
-                msg += "D_max=%s\n %s" % (str(d), sys.exc_value)
+                msg += "D_max=%s\n %s" % (str(d), exc)
                 results.errors.append(msg)
 

src/sas/sascalc/pr/fit/expression.py

@@ -210 +210 @@
 
     #print("Function: "+functiondef)
-    exec functiondef in globals,locals
+    exec(functiondef, globals, locals)
     retfn = locals['eval_expressions']
 

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:

src/sas/sascalc/pr/num_term.py

@@ -182 +182 @@
                 data_y = np.append(data_y, test_y)
                 data_err = np.append(data_err, err)
-            except:
-                logger.error(sys.exc_value)
+            except Exception as exc:
+                logger.error(exc)
 
     return data_x, data_y, data_err