Changeset 82373f5 in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Apr 10, 2017 10:55:59 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:

1cf4a130, a534432

Parents:

5f768c2

Message:

Modifications suggested by Andrew Nelson.

File:

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

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

@@ -1734 +1734 @@
         try:
             number_finite = np.count_nonzero(np.isfinite(y))
-            if number_finite == 0:
+            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"))
+                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)
@@ -1796 +1796 @@
 
             msg = "Computation completed!"
-            if number_finite != len(y):
+            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.")
@@ -1829 +1829 @@
         """
         number_finite = np.count_nonzero(np.isfinite(image))
-        if number_finite == 0:
+        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"))
+                str("Model did not return any finite value."), info="error"))
             return
         np.nan_to_num(image)
@@ -1893 +1893 @@
                                       index=index, weight=weight)
         msg = "Computation  completed!"
-        if number_finite != len(image):
+        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.")