Changeset e0f979e in sasmodels

Timestamp:

Mar 28, 2019 9:02:40 AM (6 years ago)

Author:

smk78

Branches:

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

Children:

c0136c72

Parents:

7a5f8af (diff), 850788e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels.git

Location:

sasmodels/models

Files:

• pearl_necklace.py (modified) (2 diffs)
• guinier_porod.py (modified) (1 diff)
• unified_power_rg.py (modified) (1 diff)

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} \\
@@ -65 +65 @@
 ----------------------------
 
-* **Author:** 
-* **Last Modified by:** 
-* **Last Reviewed by:** 
+* **Author:**
+* **Last Modified by:**
+* **Last Reviewed by:**
 * **Source added by :** Steve King **Date:** March 25, 2019
 """

sasmodels/models/guinier_porod.py

@@ -5 +5 @@
 such as rods or platelets, and shapes intermediate between spheres
 and rods or between rods and platelets, and overcomes some of the
-deficiencies of the (Beaucage) :ref:`unified_power_rg` model (see Hammouda, 2010).
+deficiencies of the (Beaucage) :ref:`unified-power-rg` model (see Hammouda, 2010).
 
 Definition

sasmodels/models/unified_power_rg.py

@@ -22 +22 @@
 artefacts that appear as kinks in the fitted model function.
 
-Also see the Guinier_Porod model.
+Also see the :ref:`guinier-porod` model.
 
 The empirical fit function is: