Changeset eb320682 in sasview

Timestamp:

Jul 12, 2016 5:29:11 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:

41345d7e

Parents:

c512f7d

Message:

Fix bug that occurs when correlation function has no linear section

Location:

src/sas

Files:

• sascalc/corfunc/corfunc_calculator.py (modified) (1 diff)
• sasgui/perspectives/corfunc/corfunc_panel.py (modified) (3 diffs)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -201 +201 @@
         mask = np.where(np.abs((y-(m*x+b))/y) < 0.01)[0]
         if len(mask) == 0:  # Return garbage for bad fits
-            return garbage
+            return { 'max': self._round_sig_figs(x[maxs[0]], 6) }
         dtr = x[mask[0]]  # Beginning of Linear Section
         d0 = x[mask[-1]]  # End of Linear Section

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

@@ -108 +108 @@
             return
         if self.state.outputs is not None and self.state.outputs != {}:
-            self.set_extracted_params(self.state.outputs)
+            self.set_extracted_params(self.state.outputs, reset=True)
 
     def get_state(self):
@@ -151 +151 @@
         self._calculator.set_data(data)
         # Reset the outputs
-        self.set_extracted_params(None)
+        self.set_extracted_params(None, reset=True)
         if self._manager is not None:
             self._manager.clear_data()
@@ -285 +285 @@
         self._calculator.background = bg
 
-    def set_extracted_params(self, params):
+    def set_extracted_params(self, params=None, reset=False):
         self.extracted_params = params
+        error = False
         if params is None:
+            if not reset: error = True
             for key in OUTPUT_STRINGS.keys():
                 self._output_boxes[key].SetValue('-')
         else:
-            for key in OUTPUT_STRINGS.keys():
-                value = params[key]
+            if len(params) < len(OUTPUT_STRINGS):
+                # Not all parameters were calculated
+                error = True
+            for key, value in params.iteritems():
                 self._output_boxes[key].SetValue(value)
+        if error:
+            msg = 'Not all parameters were able to be calculated'
+            wx.PostEvent(self._manager.parent, StatusEvent(
+                status=msg, info='error'))
+
 
     def plot_qrange(self, active=None, leftdown=False):