Changeset 457f735 in sasview

Timestamp:

Jul 11, 2017 5:05:13 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:

412c509

Parents:

03e3902

Message:

Refactor in preparation for 3D transform

Location:

src/sas

Files:

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

src/sas/sascalc/corfunc/transform_thread.py

@@ -25 +25 @@
             return
         try:
-            gamma = dct((iqs-background)*qs**2)
-            gamma = gamma / gamma.max()
+            gamma1 = dct((iqs-background)*qs**2)
+            gamma1 = gamma1 / gamma1.max()
         except:
             self.update(msg="Fourier transform failed.")
@@ -36 +36 @@
 
         xs = np.pi*np.arange(len(qs),dtype=np.float32)/(q[1]-q[0])/len(qs)
-        transform = Data1D(xs, gamma)
+        transform1 = Data1D(xs, gamma1)
+        transform3 = Data1D()
 
-        self.complete(transform=transform)
+        transforms = (transform1, transform3)
+
+        self.complete(transforms=transforms)
 
 class HilbertThread(CalcThread):

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

@@ -257 +257 @@
             StatusEvent(status=msg))
 
-    def transform_complete(self, transform=None):
+    def transform_complete(self, transforms=None):
         """
         Called from FourierThread when calculation has completed
         """
         self._transform_btn.SetLabel("Transform")
-        if transform is None:
+        if transforms is None:
             msg = "Error calculating Transform."
             if self.transform_type == 'hilbert':
@@ -270 +270 @@
             self._extract_btn.Disable()
             return
-        self._transformed_data = transform
+        self._transformed_data = transforms
+        (transform1, transform3) = transforms
         import numpy as np
-        plot_x = transform.x[np.where(transform.x <= 200)]
-        plot_y = transform.y[np.where(transform.x <= 200)]
+        plot_x = transform1.x[np.where(transform1.x <= 200)]
+        plot_y = transform1.y[np.where(transform1.x <= 200)]
         self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL1)
         # Only enable extract params button if a fourier trans. has been done
@@ -286 +287 @@
         """
         try:
-            params = self._calculator.extract_parameters(self._transformed_data)
+            params = self._calculator.extract_parameters(self._transformed_data[0])
         except:
             params = None

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

@@ -59 +59 @@
         self.q = None
         self.iq = None
-        # TODO: Add extrapolated data and transformed data (when implemented)
 
     def __str__(self):