Changeset 5e2267e in sasview


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/corfunc/transform_thread.py

    ra309667 r5e2267e  
    22from sas.sascalc.dataloader.data_info import Data1D 
    33from scipy.fftpack import dct 
    4 from scipy.integrate import trapz 
     4from scipy.integrate import trapz, cumtrapz 
    55import numpy as np 
    66from time import sleep 
     
    4646            # trapz uses the trapezium rule to calculate the integral 
    4747            mask = xs <= 200.0 # Only calculate gamma3 up to x=200 (as this is all that's plotted) 
    48             gamma3 = [trapz(gamma1[:n], xs[:n])/xs[n-1] for n in range(2, len(xs[mask]) + 1)] 
    49             gamma3.insert(0, 1.0) # Gamma_3(0) is defined as 1 
    50             gamma3 = np.array(gamma3) 
     48            from scipy.integrate import cumtrapz 
     49            n = len(xs[mask]) + 1 
     50            gamma3 = cumtrapz(gamma1[:n], xs[:n]) 
     51            gamma3 = np.hstack((1.0, gamma3)) # Gamma_3(0) is defined as 1 
    5152 
    5253            if self.check_if_cancelled(): return 
Note: See TracChangeset for help on using the changeset viewer.