Changeset 4acca8c in sasview for src/sas/sascalc/corfunc

Timestamp:

Mar 26, 2019 9:44:01 AM (6 years ago)

Author:

awashington

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl

Children:

3beadede

Parents:

f7e6b30 (diff), 60e20d8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' into Sasview-1079

File:

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

src/sas/sascalc/corfunc/transform_thread.py

@@ -45 +45 @@
             # gamma3(R) = 1/R int_{0}^{R} gamma1(x) dx
             # 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)]j
             # gamma3.insert(0, 1.0) # Gamma_3(0) is defined as 1
-            n = len(xs[mask])
+            n = len(xs)
             gamma3 = cumtrapz(gamma1[:n], xs[:n])/xs[1:n]
             gamma3 = np.hstack((1.0, gamma3)) # Gamma_3(0) is defined as 1
@@ -79 +78 @@
 
         transform1 = Data1D(xs, gamma1)
-        transform3 = Data1D(xs[xs <= 200], gamma3)
+        transform3 = Data1D(xs, gamma3)
         idf = Data1D(xs, idf)