Changeset d03228e in sasview for src/sas/sascalc

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/sascalc/corfunc

Files:

• corfunc_calculator.py (modified) (3 diffs)
• transform_thread.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
+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)