Changeset 56b2687 in sasmodels for sasmodels/models/lamellar.py

Timestamp:

Jul 14, 2016 3:35:58 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

98ba1fc

Parents:

61f8638 (diff), fa800e72 (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 polydisp

Conflicts:

README.rst
sasmodels/core.py
sasmodels/data.py
sasmodels/generate.py
sasmodels/kernelcl.py
sasmodels/kerneldll.py
sasmodels/sasview_model.py

File:

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

sasmodels/models/lamellar.py

@@ -9 +9 @@
 .. math::
 
-    I(q) = scale*\frac{2\pi P(q)}{q^2\delta }
+    I(q) = \text{scale}\frac{2\pi P(q)}{q^2\delta} + \text{background}
 
 
@@ -16 +16 @@
 .. math::
 
-   P(q) = \frac{2\Delta\rho^2}{q^2}(1-cos(q\delta)) = \frac{4\Delta\rho^2}{q^2}sin^2(\frac{q\delta}{2})
+   P(q) = \frac{2\Delta\rho^2}{q^2}(1-\cos(q\delta))
+        = \frac{4\Delta\rho^2}{q^2}\sin^2\left(\frac{q\delta}{2}\right)
 
 where $\delta$ is the total layer thickness and $\Delta\rho$ is the scattering length density difference.