Changeset b3f6bc3 in sasmodels for sasmodels/models/spherepy.py

Timestamp:

Feb 15, 2015 2:07:00 PM (9 years ago)

Author:

pkienzle

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

f786ff3

Parents:

cb6ecf4

Message:

support pure python model Iq/Iqxy?

File:

• sasmodels/models/spherepy.py (modified) (1 diff)

sasmodels/models/spherepy.py

@@ -83 +83 @@
 
 
-# No volume normalization despite having a volume parameter
-# This should perhaps be volume normalized?
 def form_volume(radius):
-    return 1.333333333333333*pi*radius*radius*radius
+    return 1.333333333333333*pi*radius**3
 
 def Iq(q, sld, solvent_sld, radius):
+    #print "q",q
+    #print "sld,r",sld,solvent_sld,radius
     qr = q*radius
     sn, cn = sin(qr), cos(qr)
-    bes = 3 * (sn-qr*cn)/qr**3
+    # FOR VECTORIZED VERSION, UNCOMMENT THE NEXT TWO LINES
+    bes = 3 * (sn-qr*cn)/qr**3 # may be 0/0 but we fix that next line
     bes[qr==0] = 1
+    # FOR NON VECTORIZED VERSION, UNCOMMENT THE NEXT LINE
+    #bes = 3 * (sn-qr*cn)/qr**3 if qr>0 else 1
     fq = bes * (sld - solvent_sld) * form_volume(radius)
-    return 1.0e-4*fq*fq
+    return 1.0e-4*fq**2
+# FOR VECTORIZED VERSION, UNCOMMENT THE NEXT LINE
+Iq.vectorized = True
 
 def Iqxy(qx, qy, sld, solvent_sld, radius):
     return Iq(sqrt(qx**2 + qy**2), sld, solvent_sld, radius)
+Iqxy.vectorized = True
 
 def ER(radius):