Changeset 1448db7a in sasmodels

Timestamp:

Apr 19, 2016 1:33:47 AM (9 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:

25b82a1

Parents:

1bf66d9

Message:

Spherical sld clean-up

File:

• sasmodels/models/spherical_sld.py (modified) (2 diffs)

sasmodels/models/spherical_sld.py

@@ -183 +183 @@
 # pylint: enable=bad-whitespace, line-too-long
 source = ["lib/librefl.c",  "lib/sph_j1c.c", "spherical_sld.c"]
-
-#def Iq(q, *args, **kw):
-#    return q
-
-#def Iqxy(qx, *args, **kw):
-#    return qx
 
 def profile(n_shells, radius_core,  sld_core,  sld_solvent, sld_flat,
@@ -253 +247 @@
     return np.asarray(z), np.asarray(beta)*1e-6
 
-def ER(core_radius, n, thickness):
-    return np.sum(thickness[:n[0]], axis=0) + core_radius
+#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):