Changeset a90aa1c in sasmodels for sasmodels/models/linear_pearls.py

Timestamp:

Feb 7, 2017 12:45:34 PM (7 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:

5467cd8

Parents:

c3ccaec (diff), 1105286 (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' into ticket-815

File:

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

sasmodels/models/linear_pearls.py

@@ -16 +16 @@
 .. math::
 
-    P(Q) = \frac{scale}{V}\left[ m_{p}^2
-    \left(N+2\sum_{n-1}^{N-1}(N-n)\frac{sin(qnl)}{qnl}\right)
-    \left( 3\frac{sin(qR)-qRcos(qR)}{(qr)^3}\right)^2\right]
+    P(Q) = \frac{\text{scale}}{V}\left[ m_{p}^2
+    \left(N+2\sum_{n-1}^{N-1}(N-n)\frac{\sin(qnl)}{qnl}\right)
+    \left( 3\frac{\sin(qR)-qR\cos(qR)}{(qr)^3}\right)^2\right]
 
 where the mass $m_p$ is $(SLD_{pearl}-SLD_{solvent})*(volume\ of\ N\ pearls)$.
@@ -56 +56 @@
     ["radius",      "Ang",       80.0, [0, inf],     "", "Radius of the pearls"],
     ["edge_sep",    "Ang",      350.0, [0, inf],     "", "Length of the string segment - surface to surface"],
-    ["num_pearls",  "",           3.0, [0, inf],     "", "Number of the pearls"],
+    ["num_pearls",  "",           3.0, [1, inf],     "", "Number of the pearls"],
     ["sld",   "1e-6/Ang^2", 1.0, [-inf, inf],  "sld", "SLD of the pearl spheres"],
     ["sld_solvent", "1e-6/Ang^2", 6.3, [-inf, inf],  "sld", "SLD of the solvent"],