Changeset d277229 in sasmodels for sasmodels/models/core_multi_shell.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_multi_shell.py (modified) (2 diffs)

sasmodels/models/core_multi_shell.py

@@ -100 +100 @@
 source = ["lib/sas_3j1x_x.c", "core_multi_shell.c"]
 have_Fq = True
+effective_radius_type = ["outer radius", "core radius"]
 
 def random():
@@ -144 +145 @@
     return np.asarray(z), np.asarray(rho)
 
-def ER(radius, n, thickness):
-    """Effective radius"""
-    n = int(n[0]+0.5)  # n is a control parameter and is not polydisperse
-    return np.sum(thickness[:n], axis=0) + radius
+#def ER(radius, n, thickness):
+#    """Effective radius"""
+#    n = int(n[0]+0.5)  # n is a control parameter and is not polydisperse
+#    return np.sum(thickness[:n], axis=0) + radius
 
 demo = dict(sld_core=6.4,