Changes in / [658dd57:edba324] in sasview

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitting.py (modified) (4 diffs)
• models.py (modified) (1 diff)

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

@@ -1735 +1735 @@
         """
         try:
+            number_finite = np.count_nonzero(np.isfinite(y))
+            if not number_finite:
+                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,
@@ -1791 +1797 @@
                                          index=index, weight=weight)
 
-            msg = "Computation  completed!"
+            msg = "Computation completed!"
+            if number_finite != y.size:
+                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
@@ -1819 +1830 @@
         that can be plot.
         """
+        number_finite = np.count_nonzero(np.isfinite(image))
+        if not number_finite:
+            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)
@@ -1878 +1895 @@
                                       index=index, weight=weight)
         msg = "Computation  completed!"
+        if number_finite != image.size:
+            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"))
 

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

@@ -156 +156 @@
     try:
         import compileall
-        compileall.compile_dir(dir=dir, ddir=dir, force=1,
+        compileall.compile_dir(dir=dir, ddir=dir, force=0,
                                quiet=report_problem)
     except: