Changeset c728295 in sasview

Timestamp:

Jul 18, 2017 11:46:10 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:

d78b5cb

Parents:

7dda833

Message:

Remove unused argument and import

Location:

src/sas

Files:

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

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -131 +131 @@
         return params, extrapolation, s2
 
-    def compute_transform(self, extrapolation, trans_type, extrap_fn=None,
-        background=None, completefn=None, updatefn=None):
+    def compute_transform(self, extrapolation, trans_type, background=None,
+        completefn=None, updatefn=None):
         """
         Transform an extrapolated scattering curve into a correlation function.
@@ -153 +153 @@
         if trans_type == 'fourier':
             self._transform_thread = FourierThread(self._data, extrapolation,
-            background, extrap_fn=extrap_fn, completefn=completefn,
+            background, completefn=completefn,
             updatefn=updatefn)
         elif trans_type == 'hilbert':

src/sas/sascalc/corfunc/transform_thread.py

@@ -7 +7 @@
 
 class FourierThread(CalcThread):
-    def __init__(self, raw_data, extrapolated_data, bg, extrap_fn=None,
-        updatefn=None, completefn=None):
+    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
-        self.extrap_fn = extrap_fn
 
     def check_if_cancelled(self):

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

@@ -245 +245 @@
             self._calculator.compute_transform(self._extrapolated_data,
                 self.transform_type, background=self.background,
-                extrap_fn=self._extrapolated_fn,
                 completefn=self.transform_complete,
                 updatefn=self.transform_update)
@@ -275 +274 @@
             self._extract_btn.Disable()
             return
+
         self._transformed_data = transforms
         (transform1, transform3, idf) = transforms
-        import numpy as np
         plot_x = transform1.x[np.where(transform1.x <= 200)]
         plot_y = transform1.y[np.where(transform1.x <= 200)]
@@ -284 +283 @@
         self._manager.show_data(transform3, TRANSFORM_LABEL3)
         self._manager.show_data(idf, IDF_LABEL)
+
         # Only enable extract params button if a fourier trans. has been done
         if self.transform_type == 'fourier':