Changeset 412c509 in sasview for src/sas/sascalc/corfunc/transform_thread.py

Timestamp:

Jul 11, 2017 9:59:44 AM (7 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2a54ba5

Parents:

457f735

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/11/17 09:59:23)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/11/17 09:59:44)

Message:

Compute 3D correlation function as well as 1D

File:

• src/sas/sascalc/corfunc/transform_thread.py (modified) (4 diffs)

src/sas/sascalc/corfunc/transform_thread.py

@@ -2 +2 @@
 from sas.sascalc.dataloader.data_info import Data1D
 from scipy.fftpack import dct
+from scipy.integrate import simps, trapz
 import numpy as np
 from time import sleep
 
 class FourierThread(CalcThread):
-    def __init__(self, raw_data, extrapolated_data, bg, updatefn=None,
-        completefn=None):
+    def __init__(self, raw_data, extrapolated_data, bg, extrap_fn=None,
+        updatefn=None, completefn=None):
         CalcThread.__init__(self, updatefn=updatefn, completefn=completefn)
         self.data = raw_data
         self.background = bg
         self.extrapolation = extrapolated_data
+        self.extrap_fn = extrap_fn
 
     def compute(self):
@@ -19 +21 @@
         background = self.background
 
+        xs = np.pi*np.arange(len(qs),dtype=np.float32)/(q[1]-q[0])/len(qs)
+
         self.ready(delay=0.0)
-        self.update(msg="Starting Fourier transform.")
+        self.update(msg="Fourier transform in progress.")
         self.ready(delay=0.0)
+
         if self.isquit():
             return
@@ -27 +32 @@
             gamma1 = dct((iqs-background)*qs**2)
             gamma1 = gamma1 / gamma1.max()
-        except:
+
+            # gamma3(R) = 1/R int_{0}^{R} gamma1(x) dx
+            # simps uses simpson's rule to calculate the integral
+            gamma3 = [trapz(gamma1[:n], xs[:n])/xs[n-1] for n in range(1, len(xs+1))]
+            gamma3 = np.array(gamma3)
+        except Exception as e:
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.error(e)
+
             self.update(msg="Fourier transform failed.")
-            self.complete(transform=None)
+            self.complete(transforms=None)
             return
         if self.isquit():
@@ -35 +49 @@
         self.update(msg="Fourier transform completed.")
 
-        xs = np.pi*np.arange(len(qs),dtype=np.float32)/(q[1]-q[0])/len(qs)
         transform1 = Data1D(xs, gamma1)
-        transform3 = Data1D()
+        transform3 = Data1D(xs, gamma3)
 
         transforms = (transform1, transform3)