Changeset 547c6f0 in sasmodels

Timestamp:

Feb 15, 2018 7:59:45 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

aa90015

Parents:

a2ca6e5

Message:

polymer_excl_volume: update eq. to match paper. Refs #1073

File:

• sasmodels/models/polymer_excl_volume.py (modified) (4 diffs)

sasmodels/models/polymer_excl_volume.py

@@ -18 +18 @@
 and $n$ is the degree of polymerization.
 
-This integral was later put into an almost analytical form as follows
+This integral was put into an almost analytical form as follows
 (Hammouda, 1993)
 
 .. math::
 
-    P(Q)=\frac{1}{\nu U^{1/2\nu}}\gamma\left(\frac{1}{2\nu},U\right) -
-    \frac{1}{U^{1/2\nu}}\gamma\left(\frac{1}{\nu},U\right)
+    P(Q)=\frac{1}{\nu U^{1/2\nu}}
+    \left\{
+        \gamma\left(\frac{1}{2\nu},U\right) -
+        \frac{1}{U^{1/2\nu}}\gamma\left(\frac{1}{\nu},U\right)
+    \right\}
 
-later recast as (for example, Hore, 2013; Hammouda & Kim, 2017)
+and later recast as (for example, Hore, 2013; Hammouda & Kim, 2017)
 
 .. math::
@@ -37 +40 @@
 .. math::
 
-    \gamma(x,U)=\int_0^{U}dt\ exp(-t)t^{x-1}
+    \gamma(x,U)=\int_0^{U}dt\ \exp(-t)t^{x-1}
 
 and the variable $U$ is given in terms of the scattering vector $Q$ as
@@ -92 +95 @@
 .. math::
 
-    P(Q) = \frac{2}{Q^4R_{g}^4} \left[exp(-Q^2R_{g}^2) - 1 + Q^2R_{g}^2 \right]
+    P(Q) = \frac{2}{Q^4R_{g}^4} \left[\exp(-Q^2R_{g}^2) - 1 + Q^2R_{g}^2 \right]
 
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D,
@@ -110 +113 @@
 Advances in Polym. Sci.* 106 (1993) 87-133
 
-M Hore et al, *Co-Nonsolvency of Poly(n-isopropylacrylamide) in Deuterated 
+M Hore et al, *Co-Nonsolvency of Poly(n-isopropylacrylamide) in Deuterated
 Water/Ethanol Mixtures* 46 (2013) 7894-7901