Changeset d03228e in sasview for src/sas

Timestamp:

Jul 12, 2016 6:13:24 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:

8bdc103

Parents:

41345d7e

Message:

Add backbone for Hilbert transform

Location:

src/sas

Files:

• sascalc/corfunc/corfunc_calculator.py (modified) (3 diffs)
• sascalc/corfunc/transform_thread.py (modified) (2 diffs)
• sasgui/perspectives/corfunc/corfunc_panel.py (modified) (9 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
+from sas.sascalc.corfunc.transform_thread import FourierThread
+from sas.sascalc.corfunc.transform_thread import HilbertThread
 
 class CorfuncCalculator(object):
@@ -122 +123 @@
         return extrapolation
 
-    def compute_transform(self, extrapolation, background=None,
+    def compute_transform(self, extrapolation, trans_type, background=None,
         completefn=None, updatefn=None):
         """
@@ -141 +142 @@
         if background is None: background = self.background
 
-        self._transform_thread = TransformThread(self._data, extrapolation,
-        background, completefn=completefn, updatefn=updatefn)
+        if trans_type == 'fourier':
+            self._transform_thread = FourierThread(self._data, extrapolation,
+            background, completefn=completefn, updatefn=updatefn)
+        elif trans_type == 'hilbert':
+            self._transform_thread = HilbertThread(self._data, extrapolation,
+            background, completefn=completefn, updatefn=updatefn)
+        else:
+            err = ("Incorrect transform type supplied, must be 'fourier'",
+                " or 'hilbert'")
+            raise ValueError, err
+
         self._transform_thread.queue()
 

src/sas/sascalc/corfunc/transform_thread.py

@@ -5 +5 @@
 from time import sleep
 
-class TransformThread(CalcThread):
+class FourierThread(CalcThread):
     def __init__(self, raw_data, extrapolated_data, bg, updatefn=None,
         completefn=None):
@@ -39 +39 @@
 
         self.complete(transform=transform)
+
+class HilbertThread(CalcThread):
+    def __init__(self, raw_data, extrapolated_data, bg, updatefn=None,
+        completefn=None):
+        CalcThread.__init__(self, updatefn=updatefn, completefn=completefn)
+        self.data = raw_data
+        self.background = bg
+        self.extrapolation = extrapolated_data
+
+    def compute(self):
+        qs = self.extrapolation.x
+        iqs = self.extrapolation.y
+        q = self.data.x
+        background = self.background
+
+        self.ready(delay=0.0)
+        self.update(msg="Starting Hilbert transform.")
+        self.ready(delay=0.0)
+        if self.isquit():
+            return
+
+        # TODO: Implement hilbert transform
+
+        self.update(msg="Hilbert transform completed.")
+
+        self.complete(transform=None)

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

@@ -64 +64 @@
         self.background = 0
         self.extracted_params = None
+        self.transform_type = 'fourier'
         # Dictionary for saving refs to text boxes used to display output data
         self._output_boxes = None
@@ -167 +168 @@
         return self._data
 
+    def radio_changed(self, event=None):
+        if event is not None:
+            self.transform_type = event.GetEventObject().GetName()
+
     def compute_extrapolation(self, event=None):
         """
@@ -206 +211 @@
         if not self._calculator.transform_isrunning():
             self._calculator.compute_transform(self._extrapolated_data,
-                self.background, completefn=self.transform_complete,
+                self.transform_type, background=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_update("Transform cancelled.")
             self._transform_btn.SetLabel("Tansform")
 
     def transform_update(self, msg=""):
         """
-        Called from TransformThread to update on status of calculation
+        Called from FourierThread to update on status of calculation
         """
         wx.PostEvent(self._manager.parent,
@@ -223 +230 @@
     def transform_complete(self, transform=None):
         """
-        Called from TransformThread when calculation has completed
-        """
+        Called from FourierThread when calculation has completed
+        """
+        self._transform_btn.SetLabel("Tansform")
         if transform is None:
             msg = "Error calculating Transform."
+            if self.transform_type == 'hilbert':
+                msg = "Not yet implemented"
             wx.PostEvent(self._manager.parent,
                 StatusEvent(status=msg, info="Error"))
@@ -236 +246 @@
         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()
+        # Only enable extract params button if a fourier trans. has been done
+        if self.transform_type == 'fourier':
+            self._extract_btn.Enable()
+        else:
+            self._extract_btn.Disable()
 
     def extract_parameters(self, event=None):
@@ -421 +434 @@
 
         # Parameters
-        qbox = wx.StaticBox(self, -1, "Parameters")
+        qbox = wx.StaticBox(self, -1, "Input Parameters")
         qbox_sizer = wx.StaticBoxSizer(qbox, wx.VERTICAL)
         qbox_sizer.SetMinSize((_STATICBOX_WIDTH, 75))
@@ -497 +510 @@
 
         vbox.Add(qbox_sizer, (1, 0), (1, 1),
+            wx.LEFT | wx.RIGHT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+
+        # Transform type
+        transform_box = wx.StaticBox(self, -1, "Transform Type")
+        transform_sizer = wx.StaticBoxSizer(transform_box, wx.VERTICAL)
+
+        radio_sizer = wx.GridBagSizer(5,5)
+
+        fourier_btn = wx.RadioButton(self, -1, "Fourier", name='fourier',
+            style=wx.RB_GROUP)
+        hilbert_btn = wx.RadioButton(self, -1, "Hilbert", name='hilbert')
+
+        fourier_btn.Bind(wx.EVT_RADIOBUTTON, self.radio_changed)
+        hilbert_btn.Bind(wx.EVT_RADIOBUTTON, self.radio_changed)
+
+        radio_sizer.Add(fourier_btn, (0,0), (1,1), wx.LEFT | wx.EXPAND)
+        radio_sizer.Add(hilbert_btn, (0,1), (1,1), wx.RIGHT | wx.EXPAND)
+
+        transform_sizer.Add(radio_sizer, wx.TOP, 0)
+        vbox.Add(transform_sizer, (2, 0), (1, 1),
             wx.LEFT | wx.RIGHT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
 
@@ -522 +555 @@
         outputbox_sizer.Add(output_sizer, wx.TOP, 0)
 
-        vbox.Add(outputbox_sizer, (2, 0), (1, 1),
+        vbox.Add(outputbox_sizer, (3, 0), (1, 1),
             wx.LEFT | wx.RIGHT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
 
@@ -547 +580 @@
 
         controlbox_sizer.Add(controls_sizer, wx.TOP | wx.EXPAND, 0)
-        vbox.Add(controlbox_sizer, (3, 0), (1, 1),
+        vbox.Add(controlbox_sizer, (4, 0), (1, 1),
             wx.LEFT | wx.RIGHT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)