Changeset e187b25 in sasmodels for sasmodels/models/core_multi_shell.py

Timestamp:

Aug 5, 2016 10:48:52 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

785cbec

Parents:

50ec515

Message:

onion, core multi shell: fix profile plots

File:

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

sasmodels/models/core_multi_shell.py

@@ -105 +105 @@
 def profile(sld_core, radius, sld_solvent, n, sld, thickness):
     """
-    SLD profile
-    
-    :return: (r, beta) where r is a list of radius of the transition points\
-      and beta is a list of the corresponding SLD values.
-
+    Returns the SLD profile *r* (Ang), and *rho* (1e-6/Ang^2).
     """
-    total_radius = 1.25*(sum(thickness[:n]) + radius + 1)
-
     r = []
-    beta = []
+    rho = []
 
     # add in the core
     r.append(0)
-    beta.append(sld)
+    rho.append(sld_core)
     r.append(radius)
-    beta.append(sld)
+    rho.append(sld_core)
 
     # add in the shells
     for k in range(n):
         # Left side of each shells
-        r0 = r[-1]
-        r.append(r0)
-        beta.append(sld[k])
-        r.append(r0 + thickness[k])
-        beta.append(sld[k])
+        r.append(r[-1])
+        rho.append(sld[k])
+        r.append(r[-1] + thickness[k])
+        rho.append(sld[k])
     # add in the solvent
     r.append(r[-1])
-    beta.append(sld_solvent)
-    r.append(total_radius)
-    beta.append(sld_solvent)
+    rho.append(sld_solvent)
+    r.append(r[-1]*1.25)
+    rho.append(sld_solvent)
 
-    return np.asarray(r), np.asarray(beta)
+    return np.asarray(r), np.asarray(rho)
 
 def ER(radius, n, thickness):