Changeset 412c509 in sasview for src/sas/sasgui/perspectives

Timestamp:

Jul 11, 2017 11: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 11:59:23)

git-committer:

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

Message:

Compute 3D correlation function as well as 1D

File:

• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (4 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()
@@ -218 +221 @@
 
         try:
-            params, self._extrapolated_data = self._calculator.compute_extrapolation()
+            params, self._extrapolated_data, self._extrapolated_fn = \
+                self._calculator.compute_extrapolation()
         except Exception as e:
             msg = "Error extrapolating data:\n"
@@ -241 +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)
@@ -276 +281 @@
         plot_y = transform1.y[np.where(transform1.x <= 200)]
         self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL1)
+        plot_x = transform3.x[np.where(transform3.x <= 200)]
+        plot_y = transform3.y[np.where(transform3.x <= 200)]
+        self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL3)
         # Only enable extract params button if a fourier trans. has been done
         if self.transform_type == 'fourier':