Changes in / [db74c47:b4aba0f] in sasmodels

Files:

• doc/conf.py (modified) (1 diff)
• sasmodels/models/img/pringles_fig1.png (added)
• sasmodels/models/pringle.c (added)
• sasmodels/models/pringle.py (added)
• sasmodels/sesans.py (modified) (2 diffs)

doc/conf.py

@@ -56 +56 @@
 # General information about the project.
 project = 'SAS Models'
-copyright = '2014, sasview team'
+copyright = '2016, sasview team'
 
 # The version info for the project you're documenting, acts as replacement for

sasmodels/sesans.py

@@ -189 +189 @@
         integral = besselj(0, q*SElength_i)*Iq*q
         G[i] = np.sum(integral)
+    G0 = np.sum(Iq*q)
 
     # [m^-1] step size in q, needed for integration
@@ -195 +196 @@
     # integration step, convert q into [m**-1] and 2 pi circle integration
     G *= dq*1e10*2*pi
-
-    P = exp(thickness*wavelength**2/(4*pi**2)*(G-G[0]))
+    G0 *= dq*1e10*2*pi
+
+    P = exp(thickness*wavelength**2/(4*pi**2)*(G-G0))
 
     return P