Changeset d18f8a8 in sasmodels for sasmodels/models/lamellarPC.py

Timestamp:

Dec 1, 2015 10:30:30 AM (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:

e88bb78

Parents:

eb69cce

Message:

fix multiline equation alignment

File:

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

sasmodels/models/lamellarPC.py

@@ -23 +23 @@
 
 - *spacing* is the average distance between adjacent layers
-  $\left<D\right>$, and
+  $\langle D \rangle$, and
 
 - *spacing_polydisp* is the relative standard deviation of the Gaussian
-  layer distance distribution $\sigma_D / \left<D\right>$.
+  layer distance distribution $\sigma_D / \langle D \rangle$.
 
 
@@ -49 +49 @@
 
 
-    Z_N(q) = \frac{1 - w^2}{1 + w^2 - 2w \cos(q \left<D\right>)}
+    Z_N(q) = \frac{1 - w^2}{1 + w^2 - 2w \cos(q \langle D \rangle)}
         + x_N S_N + (1 - x_N) S_{N+1}
 
@@ -56 +56 @@
 .. math::
 
-    S_N(q) = \frac{a_N}{N}[1 + w^2 - 2 w \cos(q \left<D\right>)]^2
+    S_N(q) = \frac{a_N}{N}[1 + w^2 - 2 w \cos(q \langle D \rangle)]^2
 
 and
@@ -62 +62 @@
 .. math::
 
-    \begin{array}{rcl}
-    a_N &=& 4w^2 - 2(w^3 + w) \cos(q \left<D\right>)
-        - 4w^{N+2}\cos(Nq \left<D\right>) \\
-        &&{} + 2 w^{N+3}\cos[(N-1)q \left<D\right>]
-        + 2w^{N+1}\cos[(N+1)q \left<D\right>]
-    \end{array}
+    a_N &= 4w^2 - 2(w^3 + w) \cos(q \langle D \rangle) \\
+        &\quad - 4w^{N+2}\cos(Nq \langle D \rangle)
+        + 2 w^{N+3}\cos[(N-1)q \langle D \rangle]
+        + 2w^{N+1}\cos[(N+1)q \langle D \rangle]
 
 for the layer spacing distribution $w = \exp(-\sigma_D^2 q^2/2)$.