Changeset 5e2267e in sasview for src/sas/sascalc

Timestamp:

Sep 18, 2017 9:59:14 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:

a859f99

Parents:

be51cf6

Message:

use cumtrapz instead of iterated trapz

File:

• src/sas/sascalc/corfunc/transform_thread.py (modified) (2 diffs)

src/sas/sascalc/corfunc/transform_thread.py

@@ -2 +2 @@
 from sas.sascalc.dataloader.data_info import Data1D
 from scipy.fftpack import dct
-from scipy.integrate import trapz
+from scipy.integrate import trapz, cumtrapz
 import numpy as np
 from time import sleep
@@ -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)
-            gamma3 = [trapz(gamma1[:n], xs[:n])/xs[n-1] for n in range(2, len(xs[mask]) + 1)]
-            gamma3.insert(0, 1.0) # Gamma_3(0) is defined as 1
-            gamma3 = np.array(gamma3)
+            from scipy.integrate import cumtrapz
+            n = len(xs[mask]) + 1
+            gamma3 = cumtrapz(gamma1[:n], xs[:n])
+            gamma3 = np.hstack((1.0, gamma3)) # Gamma_3(0) is defined as 1
 
             if self.check_if_cancelled(): return