Changeset 1820208 in sasmodels

Timestamp:

Oct 24, 2017 9:42:51 AM (6 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:

a5f91a7

Parents:

5110e16

Message:

asymint: fix sphere exact calc, and triaxial ellipsoid

File:

• explore/asymint.py (modified) (3 diffs)

explore/asymint.py

@@ -100 +100 @@
         qr = env.sqrt((a*qa)**2 + (b*qb)**2 + (c*qc)**2)
         return env.sas_3j1x_x(qr)
-    Fq.__doc__ = "triaxial ellipse minor=%g, major=%g polar=%g"%(a, b, c)
+    Fq.__doc__ = "triaxial ellipsoid minor=%g, major=%g polar=%g"%(a, b, c)
     volume = 4*env.pi*a*b*c/3
     norm = CONTRAST**2*volume/10000
@@ -177 +177 @@
     #A, B, C = 4450, 14000, 47
     A, B, C = 445, 140, 47  # integer for the sake of mpf
-    NORM, KERNEL = make_triellip(A, B, C)
-    NORM_MP, KERNEL_MP = make_triellip(A, B, C, env=MPenv)
+    NORM, KERNEL = make_triaxial_ellipsoid(A, B, C)
+    NORM_MP, KERNEL_MP = make_triaxial_ellipsoid(A, B, C, env=MPenv)
 elif shape == 'parallelepiped':
     #A, B, C = 4450, 14000, 47
@@ -337 +337 @@
     Q = float(Qstr)
     if shape == 'sphere':
-        print("exact", NORM*sas_3j1x_x(Q*RADIUS)**2)
+        print("exact", NORM*sp.sas_3j1x_x(Q*RADIUS)**2)
     print("gauss-20", *gauss_quad_2d(Q, n=20))
     print("gauss-76", *gauss_quad_2d(Q, n=76))