Changeset dd71228 in sasmodels for sasmodels/models/spherical_sld.py

Timestamp:

Apr 19, 2016 9:12:41 AM (8 years ago)

Author:

wojciech

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

cebbb5a

Parents:

7c20ba0

Message:

ER fucntion corected

File:

• sasmodels/models/spherical_sld.py (modified) (1 diff)

sasmodels/models/spherical_sld.py

@@ -282 +282 @@
     return np.asarray(z), np.asarray(beta)*1e-6
 
-#TODO: Not quite right I suppose
-def ER(n_shells, radius_core, thick_inter):
-    return np.sum(thick_inter[:n_shells], axis=0) + radius_core
-
-def VR(core_radius, n, thickness):
-    return 1.0, 1.0
+def ER(n_shells, radius_core, thick_inter0, thick_inter, thick_flat):
+    total_thickness = thick_inter0
+    total_thickness += np.sum(thick_inter[:n_shells], axis=0)
+    total_thickness += np.sum(thick_flat[:n_shells], axis=0)
+    return total_thickness + radius_core