Changeset a2db1ab in sasview

Timestamp:

Jul 11, 2016 5:30:51 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:

fb7fcec

Parents:

02a8779

Message:

Compute transform on a separate thread

Location:

src/sas

Files:

• sascalc/corfunc/corfunc_calculator.py (modified) (4 diffs)
• sascalc/corfunc/transform_thread.py (added)
• sasgui/perspectives/corfunc/corfunc_panel.py (modified) (2 diffs)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -10 +10 @@
 from numpy.linalg import lstsq
 from sas.sascalc.dataloader.data_info import Data1D
+from sas.sascalc.corfunc.transform_thread import TransformThread
 
 class CorfuncCalculator(object):
@@ -66 +67 @@
         self.upperq = upperq
         self.background = 0
+        self._transform_thread = None
 
     def set_data(self, data, scale=1):
@@ -120 +122 @@
         return extrapolation
 
-    def compute_transform(self, extrapolation, background=None):
+    def compute_transform(self, extrapolation, background=None,
+        completefn=None, updatefn=None):
         """
         Transform an extrapolated scattering curve into a correlation function.
@@ -127 +130 @@
         :param background: The background value (if not provided, previously
             calculated value will be used)
+        :param completefn: The function to call when the transform calculation
+            is complete`
+        :param updatefn: The function to call to update the GUI with the status
+            of the transform calculation
         :return: The transformed data
         """
-        qs = extrapolation.x
-        iqs = extrapolation.y
-        q = self._data.x
+        if self._transform_thread is not None:
+            if self._transform_thread.isrunning(): return
+
         if background is None: background = self.background
 
-        gamma = dct((iqs-background)*qs**2)
-        gamma = gamma / gamma.max()
-        xs = np.pi*np.arange(len(qs),dtype=np.float32)/(q[1]-q[0])/len(qs)
-
-        transform = Data1D(xs, gamma)
-
-        return transform
+        self._transform_thread = TransformThread(self._data, extrapolation,
+        background, completefn=completefn, updatefn=updatefn)
+        self._transform_thread.queue()
+
+    def transform_isrunning(self):
+        if self._transform_thread is None: return False
+        return self._transform_thread.isrunning()
+
+    def stop_transform(self):
+        if self._transform_thread.isrunning():
+            self._transform_thread.stop()
 
     def extract_parameters(self, transformed_data):

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

@@ -204 +204 @@
         Called when Transform button is pressed.
         """
-        try:
-            transformed_data = self._calculator.compute_transform(
-                self._extrapolated_data, self.background)
-        except:
-            transformed_data = None
-        if transformed_data is None:
+        if not self._calculator.transform_isrunning():
+            self._calculator.compute_transform(self._extrapolated_data,
+                self.background, completefn=self.transform_complete,
+                updatefn=self.transform_update)
+            self._transform_btn.SetLabel("Stop Tansform")
+        else:
+            self._calculator.stop_transform()
+            self.transform_update("Fourier transform cancelled.")
+            self._transform_btn.SetLabel("Tansform")
+
+    def transform_update(self, msg=""):
+        """
+        Called from TransformThread to update on status of calculation
+        """
+        wx.PostEvent(self._manager.parent,
+            StatusEvent(status=msg))
+
+    def transform_complete(self, transform=None):
+        """
+        Called from TransformThread when calculation has completed
+        """
+        if transform is None:
             msg = "Error calculating Transform."
             wx.PostEvent(self._manager.parent,
@@ -215 +231 @@
             self._extract_btn.Disable()
             return
-        self._transformed_data = transformed_data
+        self._transformed_data = transform
         import numpy as np
-        plot_x = transformed_data.x[np.where(transformed_data.x <= 200)]
-        plot_y = transformed_data.y[np.where(transformed_data.x <= 200)]
+        plot_x = transform.x[np.where(transform.x <= 200)]
+        plot_y = transform.y[np.where(transform.x <= 200)]
         self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL)
+        self._transform_btn.SetLabel("Tansform")
         self._extract_btn.Enable()