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

Timestamp:

Sep 7, 2018 5: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/core_shell_parallelepiped.py (modified) (1 diff)

sasmodels/models/core_shell_parallelepiped.py

@@ -227 +227 @@
 source = ["lib/gauss76.c", "core_shell_parallelepiped.c"]
 have_Fq = True
-
-
-def ER(length_a, length_b, length_c, thick_rim_a, thick_rim_b, thick_rim_c):
-    """
-        Return equivalent radius (ER)
-    """
-    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)
+effective_radius_type = ["equivalent sphere","half outer length_a", "half outer length_b", "half outer length_c",
+                         "equivalent circular cross-section","half outer ab diagonal","half outer diagonal"]
+
+#def ER(length_a, length_b, length_c, thick_rim_a, thick_rim_b, thick_rim_c):
+#    """
+#        Return equivalent radius (ER)
+#    """
+#    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