Changeset a3ed157 in sasview for src/sas/sasgui/perspectives/corfunc

Timestamp:

Aug 22, 2016 8:30:04 AM (8 years ago)

Author:

lewis

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6ffa0dd

Parents:

20ced5c

Message:

More useful error messages when calculating bg fails

File:

• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (3 diffs)

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -172 +172 @@
             self.set_qmin(lower)
             self.set_qmax((upper1, upper2))
-            self.set_background(self._calculator.compute_background(self.qmax))
+            self._compute_background()
 
     def get_data(self):
@@ -210 +210 @@
         try:
             params, self._extrapolated_data = self._calculator.compute_extrapolation()
-        except:
-            msg = "Error extrapolating data."
+        except Exception as e:
+            msg = "Error extrapolating data:\n"
+            msg += str(e)
             wx.PostEvent(self._manager.parent,
-                StatusEvent(status=msg, info="Error"))
+                StatusEvent(status=msg, info="error"))
             self._transform_btn.Disable()
             return
@@ -374 +375 @@
 
     def _compute_background(self, event=None):
-        self.set_background(self._calculator.compute_background(self.qmax))
+        if event is not None:
+            event.Skip()
+        self._on_enter_input()
+        try:
+            bg = self._calculator.compute_background(self.qmax)
+            self.set_background(bg)
+        except Exception as e:
+            msg = "Error computing background level:\n"
+            msg += str(e)
+            wx.PostEvent(self._manager.parent,
+                StatusEvent(status=msg, info="error"))
 
     def _on_enter_input(self, event=None):