Changeset 9611dd6 in sasview for src/sans/models

Timestamp:

Apr 27, 2014 3:33:24 PM (11 years ago)

Author:

Peter Parker

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

a27b3df

Parents:

a110e37f

Message:

Fix greek letters.

File:

• src/sans/models/media/model_functions.html (modified) (15 diffs)

src/sans/models/media/model_functions.html

@@ -3586 +3586 @@
 <p>The 1D scattering intensity for this model is calculated according to the equations given by
 Nayuk and Huber (Nayuk, 2012).</p>
-<p>Assuming a hollow parallelepiped with infinitely thin walls, edge lengths <span class="formula"><i>A</i>â€
+<p>Assuming a hollow parallelepiped with infinitely thin walls, edge lengths A &le; B &le; C
+        <span class="formula"><i>A</i>â€
 ≀â€
 <i>B</i>â€
@@ -3592 +3593 @@
 <i>C</i></span>
 
-and presenting an orientation with respect to the scattering vector given by Ξ and φ,
-where Ξ is the angle between the <em>z</em> axis and the longest axis of the parallelepiped <em>C</em>, and φ
+and presenting an orientation with respect to the scattering vector given by &theta; and &phi;,
+where &theta; is the angle between the <em>z</em> axis and the longest axis of the parallelepiped <em>C</em>, and &phi;
 is the angle between the scattering vector (lying in the <em>xy</em> plane) and the <em>y</em> axis,
 the form factor is given by:</p>
@@ -3615 +3616 @@
 <p style="text-align: center;" align="center"><span style="position: relative; top: 6pt;"><img src="img/RectangularHollowPrismInfThinWalls_6.png" alt="" /></span></p>
 
-<p>where <em>V</em> is the volume of the rectangular prism, <span class="formula"><i>ρ</i><sub><span class="mbox">pipe</span></sub></span>
+<p>where <em>V</em> is the volume of the rectangular prism, <span class="formula"><i>&rho;</i><sub><span class="mbox">pipe</span></sub></span>
  is the scattering length of the
-parallelepiped, <span class="formula"><i>ρ</i><sub><span class="mbox">solvent</span></sub></span>
+parallelepiped, <span class="formula"><i>&rho;</i><sub><span class="mbox">solvent</span></sub></span>
  is the scattering length of the solvent, and
 (if the data are in absolute scale) scale represents the volume fraction (which is unitless) .</p>
@@ -3641 +3642 @@
 </tr>
 <tr><td>short_side</td>
-<td>Å</td>
+<td>&Aring;</td>
 <td>35</td>
 </tr>
@@ -3653 +3654 @@
 </tr>
 <tr><td>sldPipe</td>
-<td>Å<sup>-2</sup></td>
+<td>&Aring;<sup>-2</sup></td>
 <td>6.3e-6</td>
 </tr>
 <tr><td>sldSolv</td>
-<td>Å<sup>-2</sup></td>
+<td>&Aring;<sup>-2</sup></td>
 <td>1.0e-6</td>
 </tr>
@@ -3697 +3698 @@
 but the implementation here is closer to the equations given by Nayuk and Huber (Nayuk, 2012).</p>
 <p>The scattering from a massive parallelepiped with an orientation with respect to the scattering vector
-given by Ξ and φ is given by:</p>
+given by &theta; and &phi; is given by:</p>
 
 <p style="text-align: center;" align="center"><span style="position: relative; top: 6pt;"><img src="img/RectangularPrism_1.png" alt="" /></span></p>
 
 <p>where <em>A</em>, <em>B</em> and <em>C</em> are the sides of the parallelepiped and must fulfill <span class="formula"><i>A</i>â€
-≀â€
+&le;â€
 <i>B</i>â€
-≀â€
+&le;â€
 <i>C</i></span>
 ,
-Ξ is the angle between the <em>z</em> axis and the longest axis of the parallelepiped <em>C</em>, and φ
+&theta; is the angle between the <em>z</em> axis and the longest axis of the parallelepiped <em>C</em>, and &phi;
 is the angle between the scattering vector (lying in the <em>xy</em> plane) and the <em>y</em> axis.</p>
 <p>The normalized form factor in 1D is obtained averaging over all possible orientations:</p>
@@ -3717 +3718 @@
 <p style="text-align: center;" align="center"><span style="position: relative; top: 6pt;"><img src="img/RectangularPrism_3.png" alt="" /></span></p>
 
-<p>where <em>V</em> is the volume of the rectangular prism, <span class="formula"><i>ρ</i><sub><span class="mbox">pipe</span></sub></span>
+<p>where <em>V</em> is the volume of the rectangular prism, <span class="formula"><i>&rho;</i><sub><span class="mbox">pipe</span></sub></span>
  is the scattering length of the
-parallelepiped, <span class="formula"><i>ρ</i><sub><span class="mbox">solvent</span></sub></span>
+parallelepiped, <span class="formula"><i>&rho;</i><sub><span class="mbox">solvent</span></sub></span>
  is the scattering length of the solvent, and
 (if the data are in absolute scale) scale represents the volume fraction (which is unitless) .</p>
@@ -3742 +3743 @@
 </tr>
 <tr><td>short_side</td>
-<td>Å</td>
+<td>&Aring;</td>
 <td>35</td>
 </tr>
@@ -3754 +3755 @@
 </tr>
 <tr><td>sldPipe</td>
-<td>Å<sup>-2</sup></td>
+<td>&Aring;<sup>-2</sup></td>
 <td>6.3e-6</td>
 </tr>
 <tr><td>sldSolv</td>
-<td>Å<sup>-2</sup></td>
+<td>&Aring;<sup>-2</sup></td>
 <td>1.0e-6</td>
 </tr>
@@ -3793 +3794 @@
 <p>The 1D scattering intensity for this model is calculated by forming the difference of the
 amplitudes of two massive parallelepipeds differing in their outermost dimensions in
-each direction by the same length increment 2 Δ (Nayuk, 2012).</p>
+each direction by the same length increment 2 &Delta; (Nayuk, 2012).</p>
 <p>As in the case of the massive parallelepiped, the scattering amplitude is computed for a particular
 orientation of the parallelepiped with respect to the scattering vector and then averaged over all
@@ -3800 +3801 @@
 <p style="text-align: center;" align="center"><span style="position: relative; top: 6pt;"><img src="img/RectangularHollowPrism_1.png" alt="" /></span></p>
 
-<p>where Ξ is the angle between the <em>z</em> axis and the longest axis of the parallelepiped, φ
+<p>where &theta; is the angle between the <em>z</em> axis and the longest axis of the parallelepiped, &phi;
 is the angle between the scattering vector (lying in the <em>xy</em> plane) and the <em>y</em> axis, and:</p>
 
@@ -3806 +3807 @@
 
 <p>where <em>A</em>, <em>B</em> and <em>C</em> are the external sides of the parallelepiped fulfilling <span class="formula"><i>A</i>â€
-≀â€
+&le;â€
 <i>B</i>â€
-≀â€
+&le;â€
 <i>C</i></span>
 ,
@@ -3819 +3820 @@
 <p style="text-align: center;" align="center"><span style="position: relative; top: 6pt;"><img src="img/RectangularHollowPrism_4.png" alt="" /></span></p>
 
-<p>where <span class="formula"><i>ρ</i><sub><span class="mbox">pipe</span></sub></span>
+<p>where <span class="formula"><i>&rho;</i><sub><span class="mbox">pipe</span></sub></span>
  is the scattering length of the
-parallelepiped, <span class="formula"><i>ρ</i><sub><span class="mbox">solvent</span></sub></span>
+parallelepiped, <span class="formula"><i>&rho;</i><sub><span class="mbox">solvent</span></sub></span>
  is the scattering length of the solvent, and
 (if the data are in absolute scale) scale represents the volume fraction (which is unitless) .</p>
@@ -3845 +3846 @@
 </tr>
 <tr><td>short_side</td>
-<td>Å</td>
+<td>&Aring;</td>
 <td>35</td>
 </tr>
@@ -3857 +3858 @@
 </tr>
 <tr><td>thickness</td>
-<td>Å</td>
+<td>&Aring;</td>
 <td>1</td>
 </tr>
 <tr><td>sldPipe</td>
-<td>Å<sup>-2</sup></td>
+<td>&Aring;<sup>-2</sup></td>
 <td>6.3e-6</td>
 </tr>
 <tr><td>sldSolv</td>
-<td>Å<sup>-2</sup></td>
+<td>&Aring;<sup>-2</sup></td>
 <td>1.0e-6</td>
 </tr>