Changeset 8393c74 in sasmodels

Timestamp:

Oct 17, 2016 1:24:43 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:

9762341

Parents:

1b49bf8

Message:

teubner-strey: code cleanup

File:

• sasmodels/models/teubner_strey.py (modified) (2 diffs)

sasmodels/models/teubner_strey.py

@@ -69 +69 @@
 B Jakobs, T Sottmann, R Strey, and I Grillo, *J. Chem. Phys.*, 115 (2001), 580
 """
+from __future__ import division
 
 import numpy as np
@@ -89 +90 @@
     ]
 
-def Iq(q, volfraction, sld, sld_solvent,d,xi):
+def Iq(q, volfraction_a, sld_a, sld_b, d, xi):
     """SAS form"""
-    drho2 = (sld-sld_solvent)*(sld-sld_solvent)
+    drho = sld_a - sld_b
     k = 2.0*pi*xi/d
     a2 = (1.0 + k**2)**2
     c1 = 2.0*xi**2 * (1.0 - k**2)
     c2 = xi**4
-    prefactor = 8.0*pi*volfraction*(1.0-volfraction)*drho2*c2/xi
-    #k2 = (2.0*pi/d)*(2.0*pi/d)
-    #xi2 = 1/(xi*xi)
-    #q2 = q*q
-    #result = prefactor/((xi2+k2)*(xi2+k2)+2.0*(xi2-k2)*q2+q2*q2)
+    prefactor = 8.0*pi * volfraction_a*(1.0 - volfraction_a) * drho**2 * c2/xi
     return 1.0e-4*prefactor / np.polyval([c2, c1, a2], q**2)