Changeset b3f2a24 in sasmodels

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

Location:

sasmodels/models

Files:

• teubner_strey.py (modified) (2 diffs)
• unified_power_Rg.py (modified) (1 diff)

sasmodels/models/teubner_strey.py

@@ -19 +19 @@
 .. math::
 
-    a_2 &= \biggl[1+\bigl(\frac{2\pi\xi}{d}\bigr)^2\biggr]\\
+    a_2 &= \biggl[1+\bigl(\frac{2\pi\xi}{d}\bigr)^2\biggr]^2\\
     c_1 &= -2\xi^2\bigl(\frac{2\pi\xi}{d}\bigr)^2+2\xi^2\\
     c_2 &= \xi^4
@@ -92 +92 @@
     """SAS form"""
     drho2 = (sld-sld_solvent)*(sld-sld_solvent)
-    a2 = power(1.0+power(2.0*pi*xi/d,2.0),2.0)
-    c1 = -2.0*xi*xi*power(2.0*pi*xi/d,2.0)+2*xi*xi
+    k = 2.0*pi*xi/d
+    a2 = power(1.0+power(k,2.0),2.0)
+    c1 = -2.0*xi*xi*power(k,2.0)+2*xi*xi
     c2 = power(xi,4.0)
     prefactor = 8.0*pi*volfraction*(1.0-volfraction)*drho2*c2/xi

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