Changeset 0420af7 in sasmodels for sasmodels/models/hollow_cylinder.py

Timestamp:

Jan 21, 2016 4:17:17 PM (8 years ago)

Author:

krzywon

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:

0da2a01

Parents:

6458608

Message:

Modified hollow_cylinder to reject invalid inputs, added VR, ER and
tests. Si now has pre-calculated factorials for faster processing.

File:

• sasmodels/models/hollow_cylinder.py (modified) (4 diffs)

sasmodels/models/hollow_cylinder.py

@@ -64 +64 @@
 """
 
-from numpy import inf
+from numpy import pi, inf
 
 name = "hollow_cylinder"
@@ -92 +92 @@
 source = ["lib/J1.c", "lib/gauss76.c", "hollow_cylinder.c"]
 
+def ER(radius, core_radius, length):
+    if radius == 0 or length == 0:
+        return 0.0
+    len1 = radius
+    len2 = length/2.0
+    term1 = len1*len1*2.0*len2/2.0
+    term2 = 1.0 + (len2/len1)*(1.0 + 1/len2/2.0)*(1.0 + pi*len1/len2/2.0)
+    ddd = 3.0*term1*term2
+    diam = pow(ddd, (1.0/3.0))
+    return diam
+
+def VR(radius, core_radius, length):
+    vol_core = pi*core_radius*core_radius*length
+    vol_total = pi*radius*radius*length
+    vol_shell = vol_total - vol_core
+    return vol_shell, vol_total
+
 # parameters for demo
 demo = dict(scale=1.0,background=0.0,length=400.0,radius=30.0,core_radius=20.0,
@@ -97 +114 @@
             radius_pd=.2, radius_pd_n=9,
             length_pd=.2, length_pd_n=10,
+            core_radius_pd=.2, core_radius_pd_n=9,
             theta_pd=10, theta_pd_n=5,
             )
@@ -109 +127 @@
 # Parameters for unit tests
 tests = [
-         [{"radius" : 30.0},0.00005,1764.926]
+         [{"radius" : 30.0},0.00005,1764.926],
+         [{},'VR',1.8],
+         [{},0.001,1756.76]
          ]