Changeset eb69cce in sasmodels for sasmodels/models/bcc.py

Timestamp:

Nov 30, 2015 7:18:41 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:

d18f8a8

Parents:

d138d43

Message:

make model docs more consistent; build pdf docs

File:

• sasmodels/models/bcc.py (modified) (7 diffs)

sasmodels/models/bcc.py

@@ -13 +13 @@
 The scattering intensity $I(q)$ is calculated as
 
-.. math:
+.. math::
 
-    I(q) = \frac{\text{scale}}{V_P} V_\text{lattice} P(q) Z(q)
+    I(q) = \frac{\text{scale}}{V_p} V_\text{lattice} P(q) Z(q)
 
 
-where *scale* is the volume fraction of spheres, *Vp* is the volume of the
-primary particle, *V(lattice)* is a volume correction for the crystal
+where *scale* is the volume fraction of spheres, $V_p$ is the volume of the
+primary particle, $V_\text{lattice}$ is a volume correction for the crystal
 structure, $P(q)$ is the form factor of the sphere (normalized), and $Z(q)$
 is the paracrystalline structure factor for a body-centered cubic structure.
 
 Equation (1) of the 1990 reference is used to calculate $Z(q)$, using
-equations (29)-(31) from the 1987 paper for *Z1*\ , *Z2*\ , and *Z3*\ .
+equations (29)-(31) from the 1987 paper for $Z1$, $Z2$, and $Z3$.
 
 The lattice correction (the occupied volume of the lattice) for a
@@ -30 +30 @@
 separation $D$ is
 
-.. math:
+.. math::
 
     V_\text{lattice} = \frac{16\pi}{3} \frac{R^3}{\left(D\sqrt{2}\right)^3}
@@ -38 +38 @@
 in the calculation of $Z(q)$
 
-.. math:
+.. math::
 
     \Delta a = g D
@@ -51 +51 @@
 For a crystal, diffraction peaks appear at reduced q-values given by
 
-.. math:
+.. math::
 
     \frac{qD}{2\pi} = \sqrt{h^2 + k^2 + l^2}
@@ -60 +60 @@
 correspond to (just the first 5)
 
-.. math:
+.. math::
 
-    \begin{eqnarray}
-    &q/q_o&&\quad 1&& \ \sqrt{2} && \ \sqrt{3} && \ \sqrt{4} && \ \sqrt{5} \\
-    &\text{Indices}&& (110) && (200) && (211) && (220) && (310)
-    \end{eqnarray}
+    \begin{array}{lccccc}
+    q/q_o          &   1   & \sqrt{2} & \sqrt{3} & \sqrt{4} & \sqrt{5} \\
+    \text{Indices} & (110) &    (200) & (211)    & (220)    & (310)    \\
+    \end{array}
 
 **NB**: The calculation of $Z(q)$ is a double numerical integral that must
@@ -86 +86 @@
 model computation.
 
-.. figure:: img/crystal_orientation.gif
+.. figure:: img/crystal_orientation.png
 
     Orientation of the crystal with respect to the scattering plane.
@@ -94 +94 @@
     2D plot using the default values (w/200X200 pixels).*
 
-Reference
----------
+References
+----------
 
 Hideki Matsuoka et. al. *Physical Review B*, 36 (1987) 1754-1765