Changeset 0542fe1 in sasmodels

Timestamp:

Dec 20, 2016 4:29:22 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:

2586093f

Parents:

f1ec7002

Message:

round to the nearest level rather than truncate

File:

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

sasmodels/models/unified_power_Rg.py

@@ -85 +85 @@
 
 def Iq(q, level, rg, power, B, G):
-    ilevel = int(level)
-    if ilevel == 0:
+    level = int(level + 0.5)
+    if level == 0:
         with errstate(divide='ignore'):
             return 1./q
@@ -92 +92 @@
     with errstate(divide='ignore', invalid='ignore'):
         result = np.zeros(q.shape, 'd')
-        for i in range(ilevel):
+        for i in range(level):
             exp_now = exp(-(q*rg[i])**2/3.)
             pow_now = (erf(q*rg[i]/sqrt(6.))**3/q)**power[i]
-            if i < ilevel-1:
+            if i < level-1:
                 exp_next = exp(-(q*rg[i+1])**2/3.)
             else:
@@ -101 +101 @@
             result += G[i]*exp_now + B[i]*exp_next*pow_now
 
-    result[q == 0] = np.sum(G[:ilevel])
+    result[q == 0] = np.sum(G[:level])
     return result