Changeset 7b68dc5 in sasmodels

Timestamp:

Sep 12, 2016 1:31:16 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:

6592f56

Parents:

7e6bea81

Message:

core_multi_shell, onion: convert multiplicity to integer to avoid warnings

Location:

sasmodels/models

Files:

• core_multi_shell.py (modified) (1 diff)
• onion.py (modified) (1 diff)

sasmodels/models/core_multi_shell.py

@@ -132 +132 @@
 def ER(radius, n, thickness):
     """Effective radius"""
-    n = n[0]  # n cannot be polydisperse
+    n = int(n[0])  # n cannot be polydisperse
     return np.sum(thickness[:n], axis=0) + radius
 

sasmodels/models/onion.py

@@ -368 +368 @@
 def ER(core_radius, n, thickness):
     """Effective radius"""
-    return np.sum(thickness[:n[0]], axis=0) + core_radius
+    return np.sum(thickness[:int(n[0])], axis=0) + core_radius
 
 demo = {