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

Timestamp:

Sep 7, 2018 3:29:38 AM (6 years ago)

Author:

grethevj

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3c60146

Parents:

2a12351b

Message:

Models updated to include choices for effective interaction radii

File:

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

sasmodels/models/hollow_rectangular_prism.py

@@ -143 +143 @@
 source = ["lib/gauss76.c", "hollow_rectangular_prism.c"]
 have_Fq = True
-
-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.)
+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):