Changeset 5f768c2 in sasview

Timestamp:

Apr 10, 2017 4:12:45 AM (8 years ago)

Author:

gonzalezm

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

82373f5

Parents:

80a49c2

Message:

Adding error message to fitting window when model does not return any finite value.

File:

• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (4 diffs)

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

@@ -1733 +1733 @@
         """
         try:
+            number_finite = np.count_nonzero(np.isfinite(y))
+            if number_finite == 0:
+                logger.error("Using the present parameters the model does not return any finite value. ")
+                wx.PostEvent(self.parent, StatusEvent(status=\
+                    "Computing Error: %s" % str("Model did not return any finite value."), info="error"))
+                return
             np.nan_to_num(y)
             new_plot = self.create_theory_1D(x, y, page_id, model, data, state,
@@ -1789 +1795 @@
                                          index=index, weight=weight)
 
-            msg = "Computation  completed!"
+            msg = "Computation completed!"
+            if number_finite != len(y):
+                msg += ' PROBLEM: For some Q values the model returns non finite intensities!'
+                logger.error("For some Q values the model returns non finite intensities.")
+            
             wx.PostEvent(self.parent, StatusEvent(status=msg, type="stop"))
+            
         except:
             raise
@@ -1817 +1828 @@
         that can be plot.
         """
+        number_finite = np.count_nonzero(np.isfinite(image))
+        if number_finite == 0:
+            logger.error("Using the present parameters the model does not return any finite value. ")
+            wx.PostEvent(self.parent, StatusEvent(status = "Computing Error: %s" % 
+            str("Model did not return any finite value."), info="error"))
+            return
         np.nan_to_num(image)
         new_plot = Data2D(image=image, err_image=data.err_data)
@@ -1876 +1893 @@
                                       index=index, weight=weight)
         msg = "Computation  completed!"
+        if number_finite != len(image):
+            msg += ' PROBLEM: For some Qx,Qy values the model returns non finite intensities!'
+            logger.error("For some Qx,Qy values the model returns non finite intensities.")
         wx.PostEvent(self.parent, StatusEvent(status=msg, type="stop"))