Changeset 6b7e2f7 in sasmodels for doc

Timestamp:

Aug 17, 2016 3:59:36 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:

6dc78e4

Parents:

fe496dd (diff), 524e5c4 (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

Location:

doc/ref/magnetism

Files:

• mag_img/M_angles_pic.bmp (moved) (moved from doc/ref/magnetism/img/M_angles_pic.bmp)
• mag_img/mag_vector.bmp (moved) (moved from doc/ref/magnetism/img/mag_vector.bmp)
• magnetism.rst (modified) (3 diffs)

doc/ref/magnetism/magnetism.rst

@@ -17 +17 @@
 
 For magnetic scattering, only the magnetization component $\mathbf{M_\perp}$
-perpendicular to the scattering vector $\mathbf{Q}$ contributes to the the magnetic
+perpendicular to the scattering vector $\mathbf{Q}$ contributes to the magnetic
 scattering length.
 
 
 .. figure::
-    img/mag_vector.bmp
+    mag_img/mag_vector.bmp
 
 The magnetic scattering length density is then
@@ -42 +42 @@
 
 .. figure::
-    img/M_angles_pic.bmp
+    mag_img/M_angles_pic.bmp
 
 If the angles of the $Q$ vector and the spin-axis $x'$ to the $x$ - axis are
 $\phi$ and $\theta_{up}$, respectively, then, depending on the spin state of the
 neutrons, the scattering length densities, including the nuclear scattering
-length density ($\beta_N$) are
+length density ($\beta{_N}$) are
 
 .. math::
@@ -83 +83 @@
 ===========   ================================================================
  M0_sld        = $D_M M_0$
- Up_theta      = $\theta_up$
+ Up_theta      = $\theta_{up}$
  M_theta       = $\theta_M$
  M_phi         = $\phi_M$