Changeset 768c0c4 in sasmodels

Timestamp:

Dec 20, 2016 4:58:11 PM (8 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:

fa4a994

Parents:

8c92abb

Message:

round to nearest number of layers rather than implicit ceil()

Location:

sasmodels/models

Files:

• onion.c (modified) (1 diff)
• onion.py (modified) (2 diffs)

sasmodels/models/onion.c

@@ -30 +30 @@
 
 static double
-form_volume(double radius_core, double n, double thickness[])
+form_volume(double radius_core, double n_shells, double thickness[])
 {
-  int i;
+  int n = (int)(n_shells+0.5);
   double r = radius_core;
-  for (i=0; i < n; i++) {
+  for (int i=0; i < n; i++) {
     r += thickness[i];
   }

sasmodels/models/onion.py

@@ -323 +323 @@
     Returns shape profile with x=radius, y=SLD.
     """
-
+    n_shells = int(n_shells+0.5)
     total_radius = 1.25*(sum(thickness[:n_shells]) + radius_core + 1)
     dz = total_radius/400  # 400 points for a smooth plot
@@ -366 +366 @@
     return np.asarray(z), np.asarray(rho)
 
-def ER(radius_core, n, thickness):
+def ER(radius_core, n_shells, thickness):
     """Effective radius"""
-    return np.sum(thickness[:int(n[0])], axis=0) + radius_core
+    n = int(n_shells[0]+0.5)
+    return np.sum(thickness[:n], axis=0) + radius_core
 
 demo = {