Changeset a859f99 in sasview

Timestamp:

Sep 19, 2017 10:32:43 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

1f21a43

Parents:

5e2267e

Message:

use cumtrapz instead of iterated trapz

Location:

src/sas/sascalc/corfunc

Files:

• corfunc_calculator.py (modified) (1 diff)
• transform_thread.py (modified) (1 diff)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -141 +141 @@
         :param extrap_fn: A callable function representing the extraoplated data
         :param completefn: The function to call when the transform calculation
-            is complete`
+            is complete
         :param updatefn: The function to call to update the GUI with the status
             of the transform calculation

src/sas/sascalc/corfunc/transform_thread.py

@@ -46 +46 @@
             # trapz uses the trapezium rule to calculate the integral
             mask = xs <= 200.0 # Only calculate gamma3 up to x=200 (as this is all that's plotted)
-            from scipy.integrate import cumtrapz
-            n = len(xs[mask]) + 1
-            gamma3 = cumtrapz(gamma1[:n], xs[:n])
+            # gamma3 = [trapz(gamma1[:n], xs[:n])/xs[n-1] for n in range(2, len(xs[mask]) + 1)]j
+            # gamma3.insert(0, 1.0) # Gamma_3(0) is defined as 1
+            n = len(xs[mask])
+            gamma3 = cumtrapz(gamma1[:n], xs[:n])/xs[1:n]
             gamma3 = np.hstack((1.0, gamma3)) # Gamma_3(0) is defined as 1