Changeset 4f611f1 in sasmodels

Timestamp:

Jun 29, 2017 1:05:14 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:

e5d7a60

Parents:

4f0c993

Message:

play with cylinder integral

Files:

• explore/asymint.py (added)
• explore/symint.py (added)
• sasmodels/special.py (modified) (1 diff)

sasmodels/special.py

@@ -283 +283 @@
     return scipy.special.sici(x)[0]
 
+def sas_j1(x):
+    if np.isscalar(x):
+        retvalue = (sin(x) - x*cos(x))/x**2 if x != 0. else 0.
+    else:
+        with np.errstate(all='ignore'):
+            retvalue = (sin(x) - x*cos(x))/x**2
+        retvalue[x == 0.] = 0.
+        
 def sas_3j1x_x(x):
-    retvalue = 3*sas_j1(x)/x
-    retvalue[x==0] = 1.
+    if np.isscalar(x):
+        retvalue = 3*(sin(x) - x*cos(x))/x**3 if x != 0. else 1.
+    else:
+        with np.errstate(all='ignore'):
+            retvalue = 3*(sin(x) - x*cos(x))/x**3
+        retvalue[x == 0.] = 1.
+    return retvalue
 
 def sas_2J1x_x(x):
-    retvalue = 2*sas_J1(x)/x
-    retvalue[x==0] = 1.
+    if np.isscalar(x):
+        retvalue = 2*sas_J1(x)/x if x != 0 else 1.
+    else:
+        with np.errstate(all='ignore'):
+            retvalue = 2*sas_J1(x)/x
+        retvalue[x==0] = 1.
+    return retvalue