Changes in / [e42c8e9d:5231948] in sasview

Location:

src/sas

Files:

• sascalc/fit/BumpsFitting.py (modified) (5 diffs)
• sasgui/perspectives/fitting/fitting.py (modified) (2 diffs)

src/sas/sascalc/fit/BumpsFitting.py

@@ -4 +4 @@
 import os
 from datetime import timedelta, datetime
+import traceback
 
 import numpy
@@ -293 +294 @@
             R.success = result['success']
             if R.success:
-                R.stderr = numpy.hstack((result['stderr'][fitted_index],
-                                         numpy.NaN*numpy.ones(len(fitness.computed_pars))))
+                if result['stderr'] is None:
+                    R.stderr = numpy.NaN*numpy.ones(len(param_list))
+                else:
+                    R.stderr = numpy.hstack((result['stderr'][fitted_index],
+                                             numpy.NaN*numpy.ones(len(fitness.computed_pars))))
                 R.pvec = numpy.hstack((result['value'][fitted_index],
                                       [p.value for p in fitness.computed_pars]))
@@ -306 +310 @@
                 R.uncertainty_state = result['uncertainty']
             all_results.append(R)
+        all_results[0].mesg = result['errors']
 
         if q is not None:
@@ -344 +349 @@
     try:
         best, fbest = fitdriver.fit()
-    except:
-        import traceback; traceback.print_exc()
-        raise
+        errors = []
+    except Exception as exc:
+        best, fbest = None, numpy.NaN
+        errors = [str(exc), traceback.traceback.format_exc()]
     finally:
         mapper.stop_mapper(fitdriver.mapper)
@@ -356 +362 @@
 
     success = best is not None
+    try:
+        stderr = fitdriver.stderr() if success else None
+    except Exception as exc:
+        errors.append(str(exc))
+        errors.append(traceback.format_exc())
+        stderr = None
     return {
         'value': best if success else None,
-        'stderr': fitdriver.stderr() if success else None,
+        'stderr': stderr,
         'success': success,
         'convergence': convergence,
         'uncertainty': getattr(fitdriver.fitter, 'state', None),
+        'errors': '\n'.join(errors),
         }
 

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -1521 +1521 @@
             for uid in page_id:
                 res = result[index]
+                fit_msg = res.mesg
                 if res.fitness is None or \
                     not numpy.isfinite(res.fitness) or \
                     numpy.any(res.pvec == None) or \
                     not numpy.all(numpy.isfinite(res.pvec)):
-                    msg = "Fitting did not converge!!!"
-                    evt = StatusEvent(status=msg, info="warning", type="stop")
-                    wx.PostEvent(self.parent, evt)
+                    fit_msg += "\nFitting did not converge!!!"
                     wx.CallAfter(self._update_fit_button, page_id)
                 else:
@@ -1550 +1549 @@
                         wx.CallAfter(cpage._on_fit_complete)
                     except KeyboardInterrupt:
-                        msg = "Singular point: Fitting Stoped."
-                        evt = StatusEvent(status=msg, info="info", type="stop")
-                        wx.PostEvent(self.parent, evt)
+                        fit_msg += "\nSingular point: Fitting stopped."
                     except:
-                        msg = "Singular point: Fitting Error occurred."
-                        evt = StatusEvent(status=msg, info="error", type="stop")
-                        wx.PostEvent(self.parent, evt)
+                        fit_msg += "\nSingular point: Fitting error occurred."
+                if fit_msg:
+                   evt = StatusEvent(status=fit_msg, info="warning", type="stop")
+                   wx.PostEvent(self.parent, evt)
 
         except: