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

Timestamp:

Sep 10, 2018 4: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/core_shell_parallelepiped.py (modified) (2 diffs)

sasmodels/models/core_shell_parallelepiped.py

@@ -98 +98 @@
 is the scattering length of the solvent.
 
-.. note:: 
+.. note::
 
    the code actually implements two substitutions: $d(cos\alpha)$ is
@@ -227 +227 @@
 source = ["lib/gauss76.c", "core_shell_parallelepiped.c"]
 have_Fq = True
-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
+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 random():