Changeset ee60aa7 in sasmodels for sasmodels/models/core_shell_cylinder.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/core_shell_cylinder.py (modified) (1 diff)

sasmodels/models/core_shell_cylinder.py

@@ -132 +132 @@
 source = ["lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", "core_shell_cylinder.c"]
 have_Fq = True
-effective_radius_type = ["equivalent sphere","outer radius","half outer length","half min outer dimension",
-                         "half max outer dimension","half outer diagonal"]
-
-#def ER(radius, thickness, length):
-#    """
-#    Returns the effective radius used in the S*P calculation
-#    """
-#    radius = radius + thickness
-#    length = length + 2 * thickness
-#    ddd = 0.75 * radius * (2 * radius * length + (length + radius) * (length + pi * radius))
-#    return 0.5 * (ddd) ** (1. / 3.)
+effective_radius_type = [
+    "equivalent sphere", "outer radius", "half outer length",
+    "half min outer dimension", "half max outer dimension",
+    "half outer diagonal",
+    ]
 
 def random():