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

sasmodels/models/core_shell_sphere.py

@@ -78 +78 @@
 source = ["lib/sas_3j1x_x.c", "lib/core_shell.c", "core_shell_sphere.c"]
 have_Fq = True
+effective_radius_type = ["outer radius", "core radius"]
 
 demo = dict(scale=1, background=0, radius=60, thickness=10,
             sld_core=1.0, sld_shell=2.0, sld_solvent=0.0)
 
-def ER(radius, thickness):
-    """
-        Equivalent radius
-        @param radius: core radius
-        @param thickness: shell thickness
-    """
-    return radius + thickness
+#def ER(radius, thickness):
+#    """
+#        Equivalent radius
+#        @param radius: core radius
+#        @param thickness: shell thickness
+#    """
+#    return radius + thickness
 
 def VR(radius, thickness):