Changeset 10ee838 in sasmodels

Timestamp:

Nov 29, 2017 11:45:34 PM (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:

c11d09f, 0f113fb

Parents:

4493288

Message:

core_shell_parallelepiped: use ER from parallelepiped, with a, b, c dimensions including the rim

File:

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

sasmodels/models/core_shell_parallelepiped.py

@@ -188 +188 @@
         Return equivalent radius (ER)
     """
-
-    # surface average radius (rough approximation)
-    surf_rad = sqrt((length_a + 2.0*thick_rim_a)
-                    * (length_b + 2.0*thick_rim_b) / pi)
-
-    height = length_c + 2.0*thick_rim_c
-
-    ddd = (0.75 * surf_rad * (2 * surf_rad * height
-           + (height + surf_rad) * (height + pi * surf_rad)))
-    return 0.5 * (ddd) ** (1. / 3.)
+    from .parallelepiped import ER as ER_p
+
+    a = length_a + 2*thick_rim_a
+    b = length_b + 2*thick_rim_b
+    c = length_c + 2*thick_rim_c
+    return ER_p(a, b, c)
 
 # VR defaults to 1.0