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

Timestamp:

Feb 7, 2017 2:45:34 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

5467cd8

Parents:

c3ccaec (diff), 1105286 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket-815

File:

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

sasmodels/models/spherical_sld.py

@@ -233 +233 @@
     """
 
+    n_shells = int(n_shells + 0.5)
+    n_steps = int(n_steps + 0.5)
     z = []
     rho = []
@@ -240 +242 @@
     rho.append(sld[0])
 
-    for i in range(0, int(n_shells)):
+    for i in range(0, n_shells):
         z_next += thickness[i]
         z.append(z_next)
@@ -261 +263 @@
 def ER(n_shells, thickness, interface):
     """Effective radius"""
-    n_shells = int(n_shells)
+    n_shells = int(n_shells + 0.5)
     total = (np.sum(thickness[:n_shells], axis=1)
              + np.sum(interface[:n_shells], axis=1))