Changeset db1d9d5 in sasmodels for sasmodels/models/pearl_necklace.py

Timestamp:

Mar 28, 2019 3:16:51 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests

Children:

8795b6f

Parents:

a34b811

Message:

merge with master

File:

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

sasmodels/models/pearl_necklace.py

@@ -25 +25 @@
 .. math::
 
-    S_{ss}(q) &= sm_s^2\psi^2(q)[\frac{N}{1-sin(qA)/qA}-\frac{N}{2}-
-        \frac{1-(sin(qA)/qA)^N}{(1-sin(qA)/qA)^2}\cdot\frac{sin(qA)}{qA}] \\
-    S_{ff}(q) &= sm_r^2[M\{2\Lambda(q)-(\frac{sin(ql/2)}{ql/2})\}+
+    S_{ss}(q) &= 2m_s^2\psi^2(q)\left[\frac{N}{1-sin(qA)/qA}-\frac{N}{2}-
+        \frac{1-(sin(qA)/qA)^N}{(1-sin(qA)/qA)^2}\cdot\frac{sin(qA)}{qA}\right] \\
+    S_{ff}(q) &= m_r^2\left[M\left\{2\Lambda(q)-\left(\frac{sin(ql/2)}{ql/2}\right)\right\}+
         \frac{2M\beta^2(q)}{1-sin(qA)/qA}-2\beta^2(q)\cdot
-        \frac{1-(sin(qA)/qA)^M}{(1-sin(qA)/qA)^2}] \\
-    S_{fs}(q) &= m_r \beta (q) \cdot m_s \psi (q) \cdot 4[
+        \frac{1-(sin(qA)/qA)^M}{(1-sin(qA)/qA)^2}\right] \\
+    S_{fs}(q) &= m_r \beta (q) \cdot m_s \psi (q) \cdot 4\left[
         \frac{N-1}{1-sin(qA)/qA}-\frac{1-(sin(qA)/qA)^{N-1}}{(1-sin(qA)/qA)^2}
-        \cdot \frac{sin(qA)}{qA}] \\
+        \cdot \frac{sin(qA)}{qA}\right] \\
     \psi(q) &= 3 \cdot \frac{sin(qR)-(qR)\cdot cos(qR)}{(qR)^3} \\
     \Lambda(q) &= \frac{\int_0^{ql}\frac{sin(t)}{t}dt}{ql} \\
@@ -40 +40 @@
 (volume of the *N* pearls/rods). *V* is the total volume of the necklace.
 
+.. note::
+
+   *num_pearls* must be an integer.
+
 The 2D scattering intensity is the same as $P(q)$ above, regardless of the
 orientation of the *q* vector.
-
-The returned value is scaled to units of |cm^-1| and the parameters of the
-pearl_necklace model are the following
-
-NB: *num_pearls* must be an integer.
 
 References
@@ -52 +51 @@
 
 .. [#] R Schweins and K Huber, *Particle Scattering Factor of Pearl Necklace Chains*,
-*Macromol. Symp.* 211 (2004) 25-42 2004
+       *Macromol. Symp.* 211 (2004) 25-42 2004
+
 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659
 
@@ -66 +66 @@
 
 * **Author:**
-* **Last Modified by:**
-* **Last Reviewed by:**
+* **Last Modified by:** Andrew Jackson **Date:** March 28, 2019
+* **Last Reviewed by:** Steve King **Date:** March 28, 2019
 * **Source added by :** Steve King **Date:** March 25, 2019
 """