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

sasmodels/models/core_shell_ellipsoid.py

@@ -146 +146 @@
 source = ["lib/sas_3j1x_x.c", "lib/gauss76.c", "core_shell_ellipsoid.c"]
 have_Fq = True
-
-def ER(radius_equat_core, x_core, thick_shell, x_polar_shell):
-    """
-        Returns the effective radius used in the S*P calculation
-    """
-    from .ellipsoid import ER as ellipsoid_ER
-    polar_outer = radius_equat_core*x_core + thick_shell*x_polar_shell
-    equat_outer = radius_equat_core + thick_shell
-    return ellipsoid_ER(polar_outer, equat_outer)
+effective_radius_type = ["equivalent sphere","average outer curvature", "min outer radius", "max outer radius"]
+
+#def ER(radius_equat_core, x_core, thick_shell, x_polar_shell):
+#    """
+#        Returns the effective radius used in the S*P calculation
+#    """
+#    from .ellipsoid import ER as ellipsoid_ER
+#    polar_outer = radius_equat_core*x_core + thick_shell*x_polar_shell
+#    equat_outer = radius_equat_core + thick_shell
+#    return ellipsoid_ER(polar_outer, equat_outer)
 
 def random():