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

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/sascalc/corfunc/corfunc_calculator.py (modified) (4 diffs)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -34 +34 @@
 
         def __call__(self, x):
-            if self._lastx == [] or x.tolist() != self._lastx.tolist():
+            # If input is a single number, evaluate the function at that number
+            # and return a single number
+            if type(x) == float or type(x) == int:
+                return self._smoothed_function(np.array([x]))[0]
+            # If input is a list, and is different to the last input, evaluate
+            # the function at each point. If the input is the same as last time
+            # the function was called, return the result that was calculated
+            # last time instead of explicity evaluating the function again.
+            elif self._lastx == [] or x.tolist() != self._lastx.tolist():
                 self._lasty = self._smoothed_function(x)
                 self._lastx = x
@@ -121 +129 @@
         extrapolation = Data1D(qs, iqs)
 
-        return params, extrapolation
-
-    def compute_transform(self, extrapolation, trans_type, background=None,
-        completefn=None, updatefn=None):
+        return params, extrapolation, s2
+
+    def compute_transform(self, extrapolation, trans_type, extrap_fn=None,
+        background=None, completefn=None, updatefn=None):
         """
         Transform an extrapolated scattering curve into a correlation function.
@@ -131 +139 @@
         :param background: The background value (if not provided, previously
             calculated value will be used)
+        :param extrap_fn: A callable function representing the extraoplated data
         :param completefn: The function to call when the transform calculation
             is complete`
@@ -144 +153 @@
         if trans_type == 'fourier':
             self._transform_thread = FourierThread(self._data, extrapolation,
-            background, completefn=completefn, updatefn=updatefn)
+            background, extrap_fn=extrap_fn, completefn=completefn,
+            updatefn=updatefn)
         elif trans_type == 'hilbert':
             self._transform_thread = HilbertThread(self._data, extrapolation,