Changeset b3f2a24 in sasmodels for sasmodels/models/unified_power_Rg.py

Timestamp:

Oct 6, 2016 6:49:29 PM (8 years ago)

Author:

dirk

Branches:

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

Children:

9272cbd, 0444c02

Parents:

adc753d

Message:

update help for Teubner-Stray model

File:

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

sasmodels/models/unified_power_Rg.py

@@ -95 +95 @@
             exp_now = exp(-(q*rg[i])**2/3.)
             pow_now = (erf(q*rg[i]/sqrt(6.))**3/q)**power[i]
-            exp_next = exp(-(q*rg[i+1])**2/3.) if i < ilevel-1 else 1.
+            if i < ilevel-1:
+                exp_next = exp(-(q*rg[i+1])**2/3.)
+            else:
+                exp_next = 1
             result += G[i]*exp_now + B[i]*exp_next*pow_now
+
     result[q == 0] = np.sum(G[:ilevel])
     return result