Changeset ee60aa7 in sasmodels for sasmodels/models/hollow_rectangular_prism.py

Timestamp:

Sep 10, 2018 2:16:46 PM (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:

d299327

Parents:

3f818b2

Message:

clean up effective radius functions; improve mono_gauss_coil accuracy; start moving VR into C

File:

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

sasmodels/models/hollow_rectangular_prism.py

@@ -149 +149 @@
 source = ["lib/gauss76.c", "hollow_rectangular_prism.c"]
 have_Fq = True
-effective_radius_type = ["equivalent sphere","half length_a", "half length_b", "half length_c",
-                         "equivalent outer circular cross-section","half ab diagonal","half diagonal"]
-
-#def ER(length_a, b2a_ratio, c2a_ratio, thickness):
-#    """
-#    Return equivalent radius (ER)
-#    thickness parameter not used
-#    """
-#    b_side = length_a * b2a_ratio
-#    c_side = length_a * c2a_ratio
-#
-#    # surface average radius (rough approximation)
-#    surf_rad = sqrt(length_a * b_side / pi)
-#
-#    ddd = 0.75 * surf_rad * (2 * surf_rad * c_side + (c_side + surf_rad) * (c_side + pi * surf_rad))
-#    return 0.5 * (ddd) ** (1. / 3.)
-
-def VR(length_a, b2a_ratio, c2a_ratio, thickness):
-    """
-    Return shell volume and total volume
-    """
-    b_side = length_a * b2a_ratio
-    c_side = length_a * c2a_ratio
-    a_core = length_a - 2.0*thickness
-    b_core = b_side - 2.0*thickness
-    c_core = c_side - 2.0*thickness
-    vol_core = a_core * b_core * c_core
-    vol_total = length_a * b_side * c_side
-    vol_shell = vol_total - vol_core
-    return vol_total, vol_shell
-
+effective_radius_type = [
+    "equivalent sphere", "half length_a", "half length_b", "half length_c",
+    "equivalent outer circular cross-section",
+    "half ab diagonal", "half diagonal",
+    ]
 
 def random():