Changeset 1820208 in sasmodels


Ignore:
Timestamp:
Oct 24, 2017 11:42:51 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:
a5f91a7
Parents:
5110e16
Message:

asymint: fix sphere exact calc, and triaxial ellipsoid

File:
1 edited

Legend:

Unmodified
Added
Removed
  • explore/asymint.py

    r5110e16 r1820208  
    100100        qr = env.sqrt((a*qa)**2 + (b*qb)**2 + (c*qc)**2) 
    101101        return env.sas_3j1x_x(qr) 
    102     Fq.__doc__ = "triaxial ellipse minor=%g, major=%g polar=%g"%(a, b, c) 
     102    Fq.__doc__ = "triaxial ellipsoid minor=%g, major=%g polar=%g"%(a, b, c) 
    103103    volume = 4*env.pi*a*b*c/3 
    104104    norm = CONTRAST**2*volume/10000 
     
    177177    #A, B, C = 4450, 14000, 47 
    178178    A, B, C = 445, 140, 47  # integer for the sake of mpf 
    179     NORM, KERNEL = make_triellip(A, B, C) 
    180     NORM_MP, KERNEL_MP = make_triellip(A, B, C, env=MPenv) 
     179    NORM, KERNEL = make_triaxial_ellipsoid(A, B, C) 
     180    NORM_MP, KERNEL_MP = make_triaxial_ellipsoid(A, B, C, env=MPenv) 
    181181elif shape == 'parallelepiped': 
    182182    #A, B, C = 4450, 14000, 47 
     
    337337    Q = float(Qstr) 
    338338    if shape == 'sphere': 
    339         print("exact", NORM*sas_3j1x_x(Q*RADIUS)**2) 
     339        print("exact", NORM*sp.sas_3j1x_x(Q*RADIUS)**2) 
    340340    print("gauss-20", *gauss_quad_2d(Q, n=20)) 
    341341    print("gauss-76", *gauss_quad_2d(Q, n=76)) 
Note: See TracChangeset for help on using the changeset viewer.