Changes in src/sas/sasgui/perspectives/corfunc/corfunc_panel.py [9b90bf8:7432acb] in sasview

File:

• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (5 diffs)

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

@@ -55 +55 @@
         self._data = data # The data to be analysed (corrected fr background)
         self._extrapolated_data = None # The extrapolated data set
-        # Callable object of class CorfuncCalculator._Interpolator representing
-        # the extrapolated and interpolated data
-        self._extrapolated_fn = None
         self._transformed_data = None # Fourier trans. of the extrapolated data
         self._calculator = CorfuncCalculator()
@@ -221 +218 @@
 
         try:
-            params, self._extrapolated_data, self._extrapolated_fn = \
-                self._calculator.compute_extrapolation()
+            params, self._extrapolated_data = self._calculator.compute_extrapolation()
         except Exception as e:
             msg = "Error extrapolating data:\n"
@@ -261 +257 @@
             StatusEvent(status=msg))
 
-    def transform_complete(self, transforms=None):
+    def transform_complete(self, transform=None):
         """
         Called from FourierThread when calculation has completed
         """
         self._transform_btn.SetLabel("Transform")
-        if transforms is None:
+        if transform is None:
             msg = "Error calculating Transform."
             if self.transform_type == 'hilbert':
@@ -274 +270 @@
             self._extract_btn.Disable()
             return
-
-        self._transformed_data = transforms
-        (transform1, transform3, idf) = transforms
-        plot_x = transform1.x[transform1.x <= 200]
-        plot_y = transform1.y[transform1.x <= 200]
+        self._transformed_data = transform
+        import numpy as np
+        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_LABEL1)
-        # No need to shorten gamma3 as it's only calculated up to x=200
-        self._manager.show_data(transform3, TRANSFORM_LABEL3)
-
-        plot_x = idf.x[idf.x <= 200]
-        plot_y = idf.y[idf.x <= 200]
-        self._manager.show_data(Data1D(plot_x, plot_y), IDF_LABEL)
-
         # Only enable extract params button if a fourier trans. has been done
         if self.transform_type == 'fourier':
@@ -298 +286 @@
         """
         try:
-            params = self._calculator.extract_parameters(self._transformed_data[0])
+            params = self._calculator.extract_parameters(self._transformed_data)
         except:
             params = None