Changeset e47b06b in sasmodels for explore

Timestamp:

Jul 26, 2017 11:42:25 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

acc6c8f

Parents:

1dd7a45f

Message:

explore: code cleanup in long cylinder accuracy assessment

File:

• explore/symint.py (modified) (5 diffs)

explore/symint.py

@@ -32 +32 @@
     return norm, cylinder
 
-def make_inf_cylinder(radius, length):
-    def inf_cylinder(q):
+def make_long_cylinder(radius, length):
+    def long_cylinder(q):
         return norm/q * sas_2J1x_x(q*radius)**2
-    inf_cylinder.__doc__ = "inf cylinder radius=%g, length=%g"%(radius, length)
+    long_cylinder.__doc__ = "long cylinder radius=%g, length=%g"%(radius, length)
     volume = pi*radius**2*length
     norm = 1e-4*volume*CONTRAST**2*pi/length
-    return inf_cylinder
+    return long_cylinder
 
 def make_sphere(radius):
@@ -135 +135 @@
 length = 1e5
 NORM, KERNEL = make_cylinder(radius=radius, length=length)
-inf_cyl = make_inf_cylinder(radius=radius, length=length)
+long_cyl = make_long_cylinder(radius=radius, length=length)
 #NORM, KERNEL = make_sphere(radius=50.)
 
@@ -145 +145 @@
     for k in (8, 10, 13, 16, 19):
         gridded_integrals(Q, n=2**k+1)
-    #print("inf cyl", 0, inf_cyl(Q))
+    #print("inf cyl", 0, long_cyl(Q))
     #scipy_romberg(Q)
 
@@ -155 +155 @@
 
     q = np.logspace(-3, 0, 400)
-    I1 = inf_cyl(q)
+    I1 = long_cyl(q)
     I2 = plot_Iq(q, n=2**19+1, form="trapz")
     #plot_Iq(q, n=2**16+1, form="trapz")
@@ -163 +163 @@
     #plot_Iq(q, n=150, form="gauss")
     #plot_Iq(q, n=76, form="gauss")
-    pylab.loglog(q, inf_cyl(q), label="limit")
+    pylab.loglog(q, long_cyl(q), label="limit")
     pylab.legend()