Changeset 2a54ba5 in sasview
- Timestamp:
- Jul 12, 2017 5:14:39 AM (7 years ago)
- 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:
- 22194b1
- Parents:
- 412c509
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/corfunc/transform_thread.py
r412c509 r2a54ba5 2 2 from sas.sascalc.dataloader.data_info import Data1D 3 3 from scipy.fftpack import dct 4 from scipy.integrate import simps,trapz4 from scipy.integrate import trapz 5 5 import numpy as np 6 6 from time import sleep … … 34 34 35 35 # gamma3(R) = 1/R int_{0}^{R} gamma1(x) dx 36 # simps uses simpson'srule to calculate the integral36 # trapz uses the trapezium rule to calculate the integral 37 37 gamma3 = [trapz(gamma1[:n], xs[:n])/xs[n-1] for n in range(1, len(xs+1))] 38 38 gamma3 = np.array(gamma3)
Note: See TracChangeset
for help on using the changeset viewer.