Index: src/sans/models/media/model_functions.html
===================================================================
--- src/sans/models/media/model_functions.html	(revision 083e993db092072416a44449e3646346f8660cb3)
+++ src/sans/models/media/model_functions.html	(revision 7eb3aa290e3eff8c4b0a9c95305b2da74d182737)
@@ -7,8 +7,102 @@
 <ul style="margin-top: 0in;" type="disc">
 <li><a href="#Introduction"><b>Introduction</b></a></li>
-<li><a href="#Shapes"><b>Shapes</b></a>: <a href="#SphereModel">SphereModel (Magnetic 2D Model)</a>, <a href="#BinaryHSModel">BinaryHSModel</a>, <a href="#FuzzySphereModel">FuzzySphereModel</a>, <a href="#RaspBerryModel">RaspBerryModel</a>, <a href="#CoreShellModel">CoreShellModel (Magnetic 2D Model)</a>,&nbsp;<a href="#Core2ndMomentModel">Core2ndMomentModel</a>, <a href="#CoreMultiShellModel">CoreMultiShellModel (Magnetic 2D Model)</a>, <a href="#VesicleModel">VesicleModel</a>, <a href="#MultiShellModel">MultiShellModel</a>, &nbsp;<a href="#OnionExpShellModel">OnionExpShellModel</a>, <a href="#SphericalSLDModel">SphericalSLDModel</a>, <a href="#LinearPearlsModel">LinearPearlsModel</a>, <a href="#PearlNecklaceModel">PearlNecklaceModel</a> , <a href="#CylinderModel">CylinderModel (Magnetic 2D Model)</a>, <a href="#CoreShellCylinderModel">CoreShellCylinderModel</a>, <a href="#CoreShellBicelleModel">CoreShellBicelleModel</a>,<a href="#HollowCylinderModel">HollowCylinderModel</a>, <a href="#FlexibleCylinderModel">FlexibleCylinderModel</a>, <a href="#FlexibleCylinderModel">FlexCylEllipXModel</a>, <a href="#StackedDisksModel">StackedDisksModel</a>, <a href="#ParallelepipedModel">ParallelepipedModel (Magnetic 2D Model)</a>, <a href="#CSParallelepipedModel">CSParallelepipedModel</a>, <a href="#EllipticalCylinderModel">EllipticalCylinderModel</a>, <a href="#BarBellModel">BarBellModel</a>, <a href="#CappedCylinderModel">CappedCylinderModel</a>, <a href="#EllipsoidModel">EllipsoidModel</a>, <a href="#CoreShellEllipsoidModel">CoreShellEllipsoidModel</a>, <a href="#TriaxialEllipsoidModel">TriaxialEllipsoidModel</a>, <a href="#LamellarModel">LamellarModel</a>, <a href="#LamellarFFHGModel">LamellarFFHGModel</a>, <a href="#LamellarPSModel">LamellarPSModel</a>, <a href="#LamellarPSHGModel">LamellarPSHGModel</a>, <a href="#LamellarPCrystalModel">LamellarPCrystalModel</a>, <a href="#SCCrystalModel">SCCrystalModel</a>, <a href="#FCCrystalModel">FCCrystalModel</a>, <a href="#BCCrystalModel">BCCrystalModel</a>.</li>
-<li><a href="#Shape-Independent"><b>Shape-Independent</b></a>: <a href="#Absolute%20Power_Law">AbsolutePower_Law</a>, <a href="#BEPolyelectrolyte">BEPolyelectrolyte</a>, <a href="#BroadPeakModel">BroadPeakModel,<span><span style="text-decoration: underline;"><span style="color: blue;">CorrLength</span></span></span><span>,</span></a> <a href="#DABModel">DABModel</a>, <a href="#Debye">Debye</a>, <a href="#Number_Density_Fractal">FractalModel</a>, <a href="#FractalCoreShell">FractalCoreShell</a>, <a href="#GaussLorentzGel">GaussLorentzGel</a>, <a href="#Guinier">Guinier</a>, <a href="#GuinierPorod">GuinierPorod</a>, <a href="#Lorentz">Lorentz</a>, <a href="#Mass_Fractal">MassFractalModel</a>, <a href="#MassSurface_Fractal">MassSurfaceFractal</a>, <a href="#Peak%20Gauss%20Model">PeakGaussModel</a>, <a href="#Peak%20Lorentz%20Model">PeakLorentzModel</a>, <a href="#Poly_GaussCoil">Poly_GaussCoil</a>, <a href="#PolymerExclVolume">PolyExclVolume</a>, <a href="#PorodModel">PorodModel</a>, <a href="#RPA10Model">RPA10Model</a>, <a href="#StarPolymer">StarPolymer</a>, <a href="#Surface_Fractal">SurfaceFractalModel</a>, <a href="#TeubnerStreyModel">Teubner Strey</a>, <a href="#TwoLorentzian">TwoLorentzian</a>, <a href="#TwoPowerLaw">TwoPowerLaw</a>, <a href="#UnifiedPowerRg">UnifiedPowerRg</a>, <a href="#LineModel">LineModel</a>, <a href="#ReflectivityModel">ReflectivityModel</a>, <a href="#ReflectivityIIModel">ReflectivityIIModel</a>, <a href="#GelFitModel">GelFitModel</a>.</li>
-<li><a href="#Model"><b>Customized Models</b></a>: <a href="#testmodel">testmodel</a>, <a href="#testmodel_2">testmodel_2</a>, <a href="#sum_p1_p2">sum_p1_p2</a>, <a href="#sum_Ap1_1_Ap2">sum_Ap1_1_Ap2</a>, <a href="#polynomial5">polynomial5</a>, <a href="#sph_bessel_jn">sph_bessel_jn</a>.</li>
-<li><a href="#Structure_Factors"><b>Structure Factors</b></a>: <a href="#HardsphereStructure">HardSphereStructure</a>, <a href="#SquareWellStructure">SquareWellStructure</a>, <a href="#HayterMSAStructure">HayterMSAStructure</a>, <a href="#StickyHSStructure">StickyHSStructure</a>.</li>
+<li><a href="#Shapes"><b>Shapes</b></a>: 
+	<ul>
+	<li>Sphere based:<br/>
+	<a href="#SphereModel">SphereModel (Magnetic 2D Model)</a>, 
+	<a href="#BinaryHSModel">BinaryHSModel</a>, 
+	<a href="#FuzzySphereModel">FuzzySphereModel</a>, 
+	<a href="#RaspBerryModel">RaspBerryModel</a>, 
+	<a href="#CoreShellModel">CoreShellModel (Magnetic 2D Model)</a>,
+	<a href="#Core2ndMomentModel">Core2ndMomentModel</a>, 
+	<a href="#CoreMultiShellModel">CoreMultiShellModel (Magnetic 2D Model)</a>, 
+	<a href="#VesicleModel">VesicleModel</a>, 
+	<a href="#MultiShellModel">MultiShellModel</a>, 
+	<a href="#OnionExpShellModel">OnionExpShellModel</a>, 
+	<a href="#SphericalSLDModel">SphericalSLDModel</a>, 
+	<a href="#LinearPearlsModel">LinearPearlsModel</a>, 
+	<a href="#PearlNecklaceModel">PearlNecklaceModel</a>
+	</li>
+	<li>Cylinder based:<br/>
+	<a href="#CylinderModel">CylinderModel (Magnetic 2D Model)</a>, 
+	<a href="#CoreShellCylinderModel">CoreShellCylinderModel</a>, 
+	<a href="#CoreShellBicelleModel">CoreShellBicelleModel</a>,
+	<a href="#HollowCylinderModel">HollowCylinderModel</a>,
+	<a href="#FlexibleCylinderModel">FlexibleCylinderModel</a>,
+	<a href="#FlexibleCylinderModel">FlexCylEllipXModel</a>,
+	<a href="#StackedDisksModel">StackedDisksModel</a>,
+	<a href="#EllipticalCylinderModel">EllipticalCylinderModel</a>, 
+	<a href="#BarBellModel">BarBellModel</a>, 
+	<a href="#CappedCylinderModel">CappedCylinderModel</a>,
+	<a href="#PringleModel">PringleModel</a> 
+	</li>
+	<li>Parallelpipeds:<br/>
+	<a href="#ParallelepipedModel">ParallelepipedModel (Magnetic 2D Model)</a>,
+	<a href="#CSParallelepipedModel">CSParallelepipedModel</a>
+	</li>
+	<li>Ellipsoids:<br/>
+	<a href="#EllipsoidModel">EllipsoidModel</a>, 
+	<a href="#CoreShellEllipsoidModel">CoreShellEllipsoidModel</a>, 
+	<a href="#TriaxialEllipsoidModel">TriaxialEllipsoidModel</a>
+	</li>
+	<li>Lamellar:<br/> 
+	<a href="#LamellarModel">LamellarModel</a>, 
+	<a href="#LamellarFFHGModel">LamellarFFHGModel</a>, 
+	<a href="#LamellarPSModel">LamellarPSModel</a>, 
+	<a href="#LamellarPSHGModel">LamellarPSHGModel</a>
+	</li>
+	<li>Paracrystals:<br/>
+	<a href="#LamellarPCrystalModel">LamellarPCrystalModel</a>, 
+	<a href="#SCCrystalModel">SCCrystalModel</a>, 
+	<a href="#FCCrystalModel">FCCrystalModel</a>, 
+	<a href="#BCCrystalModel">BCCrystalModel</a>.</li>
+	</li>
+	</ul>
+<li><a href="#Shape-Independent"><b>Shape-Independent</b></a>: 
+	<a href="#Absolute%20Power_Law">AbsolutePower_Law</a>, 
+	<a href="#BEPolyelectrolyte">BEPolyelectrolyte</a>, 
+	<a href="#BroadPeakModel">BroadPeakModel</a>,
+	<a href="#CorrLength">CorrLength</a>, 
+	<a href="#DABModel">DABModel</a>, 
+	<a href="#Debye">Debye</a>, 
+	<a href="#Number_Density_Fractal">FractalModel</a>, 
+	<a href="#FractalCoreShell">FractalCoreShell</a>, 
+	<a href="#GaussLorentzGel">GaussLorentzGel</a>, 
+	<a href="#Guinier">Guinier</a>, 
+	<a href="#GuinierPorod">GuinierPorod</a>, 
+	<a href="#Lorentz">Lorentz</a>, 
+	<a href="#Mass_Fractal">MassFractalModel</a>, 
+	<a href="#MassSurface_Fractal">MassSurfaceFractal</a>, 
+	<a href="#Peak%20Gauss%20Model">PeakGaussModel</a>, 
+	<a href="#Peak%20Lorentz%20Model">PeakLorentzModel</a>, 
+	<a href="#Poly_GaussCoil">Poly_GaussCoil</a>, 
+	<a href="#PolymerExclVolume">PolyExclVolume</a>, 
+	<a href="#PorodModel">PorodModel</a>, 
+	<a href="#RPA10Model">RPA10Model</a>, 
+	<a href="#StarPolymer">StarPolymer</a>, 
+	<a href="#Surface_Fractal">SurfaceFractalModel</a>, 
+	<a href="#TeubnerStreyModel">Teubner Strey</a>, 
+	<a href="#TwoLorentzian">TwoLorentzian</a>, 
+	<a href="#TwoPowerLaw">TwoPowerLaw</a>, 
+	<a href="#UnifiedPowerRg">UnifiedPowerRg</a>, 
+	<a href="#LineModel">LineModel</a>, 
+	<a href="#ReflectivityModel">ReflectivityModel</a>, 
+	<a href="#ReflectivityIIModel">ReflectivityIIModel</a>, 
+	<a href="#GelFitModel">GelFitModel</a>.</li>
+	
+<li><a href="#Model"><b>Customized Models</b></a>: 
+	<a href="#testmodel">testmodel</a>, 
+	<a href="#testmodel_2">testmodel_2</a>, 
+	<a href="#sum_p1_p2">sum_p1_p2</a>, 
+	<a href="#sum_Ap1_1_Ap2">sum_Ap1_1_Ap2</a>, 
+	<a href="#polynomial5">polynomial5</a>, 
+	<a href="#sph_bessel_jn">sph_bessel_jn</a>.</li>
+	
+<li><a href="#Structure_Factors"><b>Structure Factors</b></a>: 
+	<a href="#HardsphereStructure">HardSphereStructure</a>, 
+	<a href="#SquareWellStructure">SquareWellStructure</a>, 
+	<a href="#HayterMSAStructure">HayterMSAStructure</a>, 
+	<a href="#StickyHSStructure">StickyHSStructure</a>.</li>
+	
 <li><a href="#References"><b>References</b></a></li>
 </ul>
@@ -2662,306 +2756,7 @@
 <p>Kratky, O. and Porod, G., J. Colloid Science, 4, 35, 1949.</p>
 <p>Higgins, J.S. and Benoit, H.C., "Polymers and Neutron Scattering", Clarendon, Oxford, 1994.</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.21.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="ParallelepipedModel"></a><b><span style="font-size: 14pt;">ParallelepipedModel (Magnetic 2D Model) </span></b></p>
-<p>This model provides the form factor, P(<em>q</em>), for a rectangular cylinder (below) where the form factor is normalized by the volume of the cylinder. P(q) = scale*&lt;f^2&gt;/V+background where the volume V= ABC and the averaging &lt; &gt;&nbsp; is applied over all orientation for 1D. &nbsp;</p>
-For magnetic scattering, please see the '<a href="polar_mag_help.html">Polarization/Magnetic Scattering</a>' in Fitting Help.
-<p><span style="font-size: 14pt;">&nbsp;</span></p>
-<p style="text-align: center;" align="center"><img src="img/image087.jpg" alt="" width="326" height="247" /></p>
-<p>The side of the solid must be satisfied the condition of A&lt;B</p>
-<p>By this definition, assuming</p>
-<p>a = A/B&lt;1; b=B/B=1; c=C/B&gt;1, the form factor,</p>
-<p style="text-align: center;" align="center"><span style="position: relative; top: 48pt;"><img src="img/image088.PNG" alt="" /></span></p>
-<p>The contrast is defined as</p>
-<p style="text-align: center;" align="center"><span style="position: relative; top: 6pt;"><img src="img/image089.PNG" alt="" /></span></p>
-<p>The scattering intensity per unit volume is returned in the unit of [cm-1]; &nbsp;I(q) = <span style="font-family: Symbol;">f</span>P(q).</p>
-<p>For P*S: The 2nd virial coefficient of the solid cylinder is calculate based on the averaged effective radius (= sqrt(short_a*short_b/pi)) and length( = long_c) values, and used as the effective radius toward S(Q) when P(Q)*S(Q) is applied.</p>
-<p>To provide easy access to the orientation of the parallelepiped, we define the axis of the cylinder using two angles &theta; , <span style="font-family: 'Arial','sans-serif';">&phi; </span>and<span style="font-family: Symbol;">Y</span>. Similarly to the case of the cylinder, those angles, &theta; &nbsp;and <span style="font-family: 'Arial','sans-serif';">&phi;,</span> are defined on Figure 2 of CylinderModel. The angle <span style="font-family: Symbol;">Y </span>is the rotational angle around its own long_c axis against the q plane. For example, <span style="font-family: Symbol;">Y </span>= 0 when the short_b axis is parallel to the x-axis of the detector.</p>
-<p style="text-align: center;" align="center"><img src="img/image090.jpg"/></p>
-<p style="text-align: center;" align="center"><b>Figure. Definition of angles for 2D</b>.</p>
-<p style="text-align: center;" align="center"><img src="img/image091.jpg" alt="" width="379" height="256" /></p>
-<p style="text-align: center;" align="center">Figure. Examples of the angles for oriented pp against the detector plane.</p>
-<div align="center">
-<table style="border-collapse: collapse;" border="2" cellspacing="0" cellpadding="0">
-<tbody>
-<tr style="height: 18.8pt;">
-<td style="border: 1pt solid width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>Parameter name</p>
-</td>
-<td style="border-width: 1pt 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>Units</p>
-</td>
-<td style="border-width: 1pt 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>Default value</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>background</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>cm-1</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>0.0</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; vertical-align: top; width: 107pt; height: 18.8pt;">
-<p>contrast</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring; -2</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>5e-006</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>long_c</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring;</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>400</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>short_a</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring; -2</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>35</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>short_b</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring;</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>75</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>scale</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">&nbsp;</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>1</p>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<p style="text-align: center;" align="center"><img id="Picture 492" src="img/image092.jpg" alt="" width="455" height="351" /></p>
-<p style="text-align: center;" align="center"><b>Figure. 1D plot using the default values (w/1000 data point).</b></p>
-<p style="margin-left: 1.35in; text-indent: -0.25in;"><span style="font-family: Symbol;">&middot;</span><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span><b>Validation of the parallelepiped 2D model</b></p>
-<p>Validation of our code was done by comparing the output of the 1D calculation to the angular average of the output of 2 D calculation over all possible angles. The Figure below shows the comparison where the solid dot refers to averaged 2D while the line represents the result of 1D calculation (for the averaging, 76, 180, 76 points are taken over the angles of theta, phi, and psi respectively).</p>
-<p style="text-align: center;" align="center"><img id="Picture 104" src="img/image093.gif" alt="" width="481" height="299" /></p>
-<p style="text-align: center;" align="center"><b>Figure. Comparison between 1D and averaged 2D.</b></p>
-<p>Our model uses the form factor calculations implemented in a c-library provided by the NIST Center for Neutron Research (Kline, 2006):</p>
-<p>REFERENCE</p>
-<p>Mittelbach and Porod, Acta Physica Austriaca 14 (1961) 185-211.</p>
-<p>Equations (1), (13-14). (in German)</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.22.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><b><span style="font-size: 14pt;"><a name="CSParallelepipedModel"></a>CSParallelepipedModel</span></b></p>
-<p>Calculates the form factor for a rectangular solid with a core-shell structure. The thickness and the scattering length density of the shell or "rim" can be different on all three (pairs) of faces.&nbsp; The form factor is normalized by the particle volume such that P(q) = scale*&lt;f^2&gt;/Vol + bkg, where &lt; &gt; is an average over all possible orientations of the rectangular solid. An instrument resolution smeared version is also provided.</p>
-<p>The function calculated is the form factor of the rectangular solid below. The core of the solid is defined by the dimensions ABC such that A &lt; B &lt; C.&nbsp;</p>
-<p style="text-align: center;" align="center"><img id="Picture 38" src="img/image087.jpg" alt="" width="326" height="247" />&nbsp;</p>
-<p>There are rectangular "slabs" of thickness tA that add to the A dimension (on the BC faces). There are similar slabs on the AC (=tB) and AB (=tC) faces. The projection in the AB plane is then:</p>
-<p style="text-align: center;" align="center"><img src="img/image094.jpg" alt="" width="334" height="277" /></p>
-<p>The volume of the solid is:</p>
-<p><span style="position: relative; top: 5pt;"><img src="img/image095.PNG" alt="" /></span></p>
-<p>meaning that there are "gaps" at the corners of the solid.</p>
-<p>The intensity calculated follows the parallelepiped model, with the core-shell intensity being calculated as the square of the sum of the amplitudes of the core and shell, in the same manner as a core-shell sphere.</p>
-<p>For the calculation of the form factor to be valid, the sides of the solid MUST be chosen such that A &lt; B &lt; C. If this inequality in not satisfied, the model will not report an error, and the calculation will not be correct.</p>
-<p>FITTING NOTES:</p>
-<p>If the scale is set equal to the particle volume fraction, f, the returned value is the scattered intensity per unit volume, I(q) = f*P(q). However, no interparticle interference effects are included in this calculation.</p>
-<p>There are many parameters in this model. Hold as many fixed as possible with known values, or you will certainly end up at a solution that is unphysical.</p>
-<p>Constraints must be applied during fitting to ensure that the inequality A &lt; B &lt; C&nbsp; is not violated. The calculation will not report an error, but the results will not be correct.</p>
-<p>The returned value is in units of [cm-1], on absolute scale.</p>
-<p>For P*S: The 2nd virial coefficient of this CSPP is calculate based on the averaged effective radius (= sqrt((short_a+2*rim_a)*(short_b+2*rim_b)/pi)) and length( = long_c+2*rim_c) values, and used as the effective radius toward S(Q) when P(Q)*S(Q) is applied.</p>
-<p>To provide easy access to the orientation of the CSparallelepiped, we define the axis of the cylinder using two angles &theta; , <span style="font-family: 'Arial','sans-serif';">&phi; </span>and<span style="font-family: Symbol;">Y</span>. Similarly to the case of the cylinder, those angles, &theta; &nbsp;and <span style="font-family: 'Arial','sans-serif';">&phi;,</span> are defined on Figure 2 of CylinderModel. The angle <span style="font-family: Symbol;">Y </span>is the rotational angle around its own long_c axis against the q plane. For example, <span style="font-family: Symbol;">Y </span>= 0 when the short_b axis is parallel to the x-axis of the detector.</p>
-<p style="text-align: center;" align="center"><img id="Picture 102" src="img/image090.jpg" /></p>
-<p style="text-align: center;" align="center"><b>Figure. Definition of angles for 2D</b>.</p>
-<p style="text-align: center;" align="center"><img id="Picture 103" src="img/image091.jpg" alt="" width="379" height="256" /></p>
-<p style="text-align: center;" align="center">Figure. Examples of the angles for oriented cspp against the detector plane.</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; TEST DATASET</p>
-<p>This example dataset is produced by running the Macro Plot_CSParallelepiped(), using 100 data points, qmin = 0.001 &Aring;-1,&nbsp; qmax = 0.7 &Aring;-1 and the below default values.&nbsp;</p>
-<div align="center">
-<table style="border-collapse: collapse;" border="2" cellspacing="0" cellpadding="0">
-<tbody>
-<tr style="height: 18.8pt;">
-<td style="border: 1pt solid width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>Parameter name</p>
-</td>
-<td style="border-width: 1pt 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>Units</p>
-</td>
-<td style="border-width: 1pt 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>Default value</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; vertical-align: top; width: 107pt; height: 18.8pt;">
-<p>background</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>cm-1</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>0.06</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>sld_pcore</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring; -2</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>1e-006</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>sld_rimA</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring; -2</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>2e-006</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>sld_rimB</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring; -2</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>4e-006</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>sld_rimC</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring; -2</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>2e-006</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>sld_solv</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring; -2</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>6e-006</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>rimA</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring;</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>10</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>rimB</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring;</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>10</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>rimC</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring;</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>10</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>longC</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring;</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>400</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>shortA</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring;</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>35</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>midB</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>&Aring;</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>75</p>
-</td>
-</tr>
-<tr style="height: 18.8pt;">
-<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>scale</p>
-</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">&nbsp;</td>
-<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
-<p>1</p>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<p style="text-align: center;" align="center"><img id="Picture 33" src="img/image096.jpg" alt="" width="450" height="338" /></p>
-<p style="text-align: center;" align="center"><b>Figure. 1D plot using the default values (w/256 data points).</b></p>
-<p style="text-align: center;" align="center"><b>&nbsp;</b></p>
-<p style="text-align: center;" align="center"><img id="Picture 34" src="img/image097.jpg" alt="" width="451" height="339" /></p>
-<p style="text-align: center;" align="center"><b>Figure. 2D plot using the default values (w/(256X265) data points).</b></p>
 
-<p>Our model uses the form factor calculations implemented in a c-library provided by the NIST Center for Neutron Research (Kline, 2006):</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; REFERENCE</p>
-<p>see: Mittelbach and Porod, Acta Physica Austriaca 14 (1961) 185-211.</p>
-<p>Equations (1), (13-14). (yes, it's in German)&nbsp;</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.23.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="EllipticalCylinderModel"></a><b><span style="font-size: 14pt;">Elliptical Cylinder Model</span></b></p>
+
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.21.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="EllipticalCylinderModel"></a><b><span style="font-size: 14pt;">Elliptical Cylinder Model</span></b></p>
 <p>This function calculates the scattering from an oriented elliptical cylinder.</p>
 <p><b>For 2D (orientated system):</b></p>
@@ -3092,5 +2887,5 @@
 <p>REFERENCE</p>
 <p style="text-indent: 0.25in;">L. A. Feigin and D. I. Svergun &ldquo;Structure Analysis by Small-Angle X-Ray and Neutron Scattering&rdquo;, Plenum, New York, (1987).</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.24.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="BarBellModel"></a><b><span style="font-size: 14pt;">BarBell(/DumBell)Model</span></b></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.22.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="BarBellModel"></a><b><span style="font-size: 14pt;">BarBell(/DumBell)Model</span></b></p>
 <p>Calculates the scattering from a barbell-shaped cylinder (This model simply becomes the DumBellModel when the length of the cylinder, L, is set to zero). That is, a sphereocylinder with spherical end caps that have a radius larger than that of the cylinder and the center of the end cap radius lies outside of the cylinder All dimensions of the barbell are considered to be monodisperse. See the diagram for the details of the geometry and restrictions on parameter values.&nbsp;</p>
 <p style="margin-left: 0.85in; text-indent: -0.35in;"><b>1.1.</b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp; </span>Definition</b></p>
@@ -3223,5 +3018,5 @@
 
 
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.25.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="CappedCylinderModel"></a><b><span style="font-size: 14pt;">CappedCylinder(/ConvexLens)Model</span></b></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.23.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="CappedCylinderModel"></a><b><span style="font-size: 14pt;">CappedCylinder(/ConvexLens)Model</span></b></p>
 <p>Calculates the scattering from a cylinder with spherical section end-caps(This model simply becomes the ConvexLensModel when the length of the cylinder L = 0. &nbsp;That is, a sphereocylinder with end caps that have a radius larger than that of the cylinder and the center of the end cap radius lies within the cylinder. See the diagram for the details of the geometry and restrictions on parameter values.</p>
 <p style="margin-left: 0.85in; text-indent: -0.35in;">&nbsp;</p>
@@ -3350,7 +3145,436 @@
 <p style="text-align: center;" align="center">Figure. Examples of the angles for oriented pp against the detector plane.</p>
 
+<!-- Pringle form factor AJJ 2014-02-17 -->
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.24.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="PringleModel"></a><b><span style="font-size: 14pt;">PringleModel</span></b></p>
+<p>This model provides the form factor, P(<em>q</em>), for a 'pringle' or 'saddle-shaped' object (a hyperbolic paraboloid).</p>
+<p style="text-align: center;" align="center">&nbsp;&nbsp;</p>
+<p>The returned value is in units of [cm-1], on absolute scale.</p>
+<p>The form factor calculated is:</p>
+<p style="text-align: center;" align="center"><img src="img/pringle_eqn_1.jpg" alt="" height='60px'/></p>
+<p>where</p>
+<p style="text-align: center;" align="center"><img src="img/pringle_eqn_2.jpg" alt="" height='120px'/></p>
+<p>&nbsp;</p>
+<p>The parameters of the model and a plot comparing the pringle model with the equivalent cylinder are shown below.</p>
+<div align="center">
+<table style="border-collapse: collapse;" border="2" cellspacing="0" cellpadding="0">
+<tbody>
+<tr style="height: 18.8pt;">
+<td style="border: 1pt solid width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>Parameter name</p>
+</td>
+<td style="border-width: 1pt 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>Units</p>
+</td>
+<td style="border-width: 1pt 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>Default value</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; vertical-align: top; width: 107pt; height: 18.8pt;">
+<p>background</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>cm-1</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>0.0</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>alpha</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p></p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>0.001</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>beta</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p></p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>0.02</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>radius</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">&nbsp;</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>60</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>scale</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">&nbsp;</td>
+<p></p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>1</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>sld_pringle</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring; -2</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>1e-006</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>sld_solvent</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring; -2</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>6.3e-006</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>thickness</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring;</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>10</p>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+<p style="text-align: center;" align="center"><img id="Picture 492" src="img/pringle-vs-cylinder.png" alt="" width="455" height="351" /></p>
+<p style="text-align: center;" align="center"><b>Figure. 1D plot using the default values (w/150 data point).</b></p>
+<p>REFERENCE</p>
+<p>S. Alexandru Rautu, Private Communication.</p>
 
 
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.26.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="EllipsoidModel"></a><b><span style="font-size: 14pt;">Ellipsoid Model</span></b></p>
+
+
+
+
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.25.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="ParallelepipedModel"></a><b><span style="font-size: 14pt;">ParallelepipedModel (Magnetic 2D Model) </span></b></p>
+<p>This model provides the form factor, P(<em>q</em>), for a rectangular cylinder (below) where the form factor is normalized by the volume of the cylinder. P(q) = scale*&lt;f^2&gt;/V+background where the volume V= ABC and the averaging &lt; &gt;&nbsp; is applied over all orientation for 1D. &nbsp;</p>
+For magnetic scattering, please see the '<a href="polar_mag_help.html">Polarization/Magnetic Scattering</a>' in Fitting Help.
+<p><span style="font-size: 14pt;">&nbsp;</span></p>
+<p style="text-align: center;" align="center"><img src="img/image087.jpg" alt="" width="326" height="247" /></p>
+<p>The side of the solid must be satisfied the condition of A&lt;B</p>
+<p>By this definition, assuming</p>
+<p>a = A/B&lt;1; b=B/B=1; c=C/B&gt;1, the form factor,</p>
+<p style="text-align: center;" align="center"><span style="position: relative; top: 48pt;"><img src="img/image088.PNG" alt="" /></span></p>
+<p>The contrast is defined as</p>
+<p style="text-align: center;" align="center"><span style="position: relative; top: 6pt;"><img src="img/image089.PNG" alt="" /></span></p>
+<p>The scattering intensity per unit volume is returned in the unit of [cm-1]; &nbsp;I(q) = <span style="font-family: Symbol;">f</span>P(q).</p>
+<p>For P*S: The 2nd virial coefficient of the solid cylinder is calculate based on the averaged effective radius (= sqrt(short_a*short_b/pi)) and length( = long_c) values, and used as the effective radius toward S(Q) when P(Q)*S(Q) is applied.</p>
+<p>To provide easy access to the orientation of the parallelepiped, we define the axis of the cylinder using two angles &theta; , <span style="font-family: 'Arial','sans-serif';">&phi; </span>and<span style="font-family: Symbol;">Y</span>. Similarly to the case of the cylinder, those angles, &theta; &nbsp;and <span style="font-family: 'Arial','sans-serif';">&phi;,</span> are defined on Figure 2 of CylinderModel. The angle <span style="font-family: Symbol;">Y </span>is the rotational angle around its own long_c axis against the q plane. For example, <span style="font-family: Symbol;">Y </span>= 0 when the short_b axis is parallel to the x-axis of the detector.</p>
+<p style="text-align: center;" align="center"><img src="img/image090.jpg"/></p>
+<p style="text-align: center;" align="center"><b>Figure. Definition of angles for 2D</b>.</p>
+<p style="text-align: center;" align="center"><img src="img/image091.jpg" alt="" width="379" height="256" /></p>
+<p style="text-align: center;" align="center">Figure. Examples of the angles for oriented pp against the detector plane.</p>
+<div align="center">
+<table style="border-collapse: collapse;" border="2" cellspacing="0" cellpadding="0">
+<tbody>
+<tr style="height: 18.8pt;">
+<td style="border: 1pt solid width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>Parameter name</p>
+</td>
+<td style="border-width: 1pt 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>Units</p>
+</td>
+<td style="border-width: 1pt 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>Default value</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>background</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>cm-1</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>0.0</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; vertical-align: top; width: 107pt; height: 18.8pt;">
+<p>contrast</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring; -2</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>5e-006</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>long_c</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring;</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>400</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>short_a</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring; -2</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>35</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>short_b</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring;</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>75</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>scale</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">&nbsp;</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>1</p>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+<p style="text-align: center;" align="center"><img id="Picture 492" src="img/image092.jpg" alt="" width="455" height="351" /></p>
+<p style="text-align: center;" align="center"><b>Figure. 1D plot using the default values (w/1000 data point).</b></p>
+<p style="margin-left: 1.35in; text-indent: -0.25in;"><span style="font-family: Symbol;">&middot;</span><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span><b>Validation of the parallelepiped 2D model</b></p>
+<p>Validation of our code was done by comparing the output of the 1D calculation to the angular average of the output of 2 D calculation over all possible angles. The Figure below shows the comparison where the solid dot refers to averaged 2D while the line represents the result of 1D calculation (for the averaging, 76, 180, 76 points are taken over the angles of theta, phi, and psi respectively).</p>
+<p style="text-align: center;" align="center"><img id="Picture 104" src="img/image093.gif" alt="" width="481" height="299" /></p>
+<p style="text-align: center;" align="center"><b>Figure. Comparison between 1D and averaged 2D.</b></p>
+<p>Our model uses the form factor calculations implemented in a c-library provided by the NIST Center for Neutron Research (Kline, 2006):</p>
+<p>REFERENCE</p>
+<p>Mittelbach and Porod, Acta Physica Austriaca 14 (1961) 185-211.</p>
+<p>Equations (1), (13-14). (in German)</p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.26.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><b><span style="font-size: 14pt;"><a name="CSParallelepipedModel"></a>CSParallelepipedModel</span></b></p>
+<p>Calculates the form factor for a rectangular solid with a core-shell structure. The thickness and the scattering length density of the shell or "rim" can be different on all three (pairs) of faces.&nbsp; The form factor is normalized by the particle volume such that P(q) = scale*&lt;f^2&gt;/Vol + bkg, where &lt; &gt; is an average over all possible orientations of the rectangular solid. An instrument resolution smeared version is also provided.</p>
+<p>The function calculated is the form factor of the rectangular solid below. The core of the solid is defined by the dimensions ABC such that A &lt; B &lt; C.&nbsp;</p>
+<p style="text-align: center;" align="center"><img id="Picture 38" src="img/image087.jpg" alt="" width="326" height="247" />&nbsp;</p>
+<p>There are rectangular "slabs" of thickness tA that add to the A dimension (on the BC faces). There are similar slabs on the AC (=tB) and AB (=tC) faces. The projection in the AB plane is then:</p>
+<p style="text-align: center;" align="center"><img src="img/image094.jpg" alt="" width="334" height="277" /></p>
+<p>The volume of the solid is:</p>
+<p><span style="position: relative; top: 5pt;"><img src="img/image095.PNG" alt="" /></span></p>
+<p>meaning that there are "gaps" at the corners of the solid.</p>
+<p>The intensity calculated follows the parallelepiped model, with the core-shell intensity being calculated as the square of the sum of the amplitudes of the core and shell, in the same manner as a core-shell sphere.</p>
+<p>For the calculation of the form factor to be valid, the sides of the solid MUST be chosen such that A &lt; B &lt; C. If this inequality in not satisfied, the model will not report an error, and the calculation will not be correct.</p>
+<p>FITTING NOTES:</p>
+<p>If the scale is set equal to the particle volume fraction, f, the returned value is the scattered intensity per unit volume, I(q) = f*P(q). However, no interparticle interference effects are included in this calculation.</p>
+<p>There are many parameters in this model. Hold as many fixed as possible with known values, or you will certainly end up at a solution that is unphysical.</p>
+<p>Constraints must be applied during fitting to ensure that the inequality A &lt; B &lt; C&nbsp; is not violated. The calculation will not report an error, but the results will not be correct.</p>
+<p>The returned value is in units of [cm-1], on absolute scale.</p>
+<p>For P*S: The 2nd virial coefficient of this CSPP is calculate based on the averaged effective radius (= sqrt((short_a+2*rim_a)*(short_b+2*rim_b)/pi)) and length( = long_c+2*rim_c) values, and used as the effective radius toward S(Q) when P(Q)*S(Q) is applied.</p>
+<p>To provide easy access to the orientation of the CSparallelepiped, we define the axis of the cylinder using two angles &theta; , <span style="font-family: 'Arial','sans-serif';">&phi; </span>and<span style="font-family: Symbol;">Y</span>. Similarly to the case of the cylinder, those angles, &theta; &nbsp;and <span style="font-family: 'Arial','sans-serif';">&phi;,</span> are defined on Figure 2 of CylinderModel. The angle <span style="font-family: Symbol;">Y </span>is the rotational angle around its own long_c axis against the q plane. For example, <span style="font-family: Symbol;">Y </span>= 0 when the short_b axis is parallel to the x-axis of the detector.</p>
+<p style="text-align: center;" align="center"><img id="Picture 102" src="img/image090.jpg" /></p>
+<p style="text-align: center;" align="center"><b>Figure. Definition of angles for 2D</b>.</p>
+<p style="text-align: center;" align="center"><img id="Picture 103" src="img/image091.jpg" alt="" width="379" height="256" /></p>
+<p style="text-align: center;" align="center">Figure. Examples of the angles for oriented cspp against the detector plane.</p>
+<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; TEST DATASET</p>
+<p>This example dataset is produced by running the Macro Plot_CSParallelepiped(), using 100 data points, qmin = 0.001 &Aring;-1,&nbsp; qmax = 0.7 &Aring;-1 and the below default values.&nbsp;</p>
+<div align="center">
+<table style="border-collapse: collapse;" border="2" cellspacing="0" cellpadding="0">
+<tbody>
+<tr style="height: 18.8pt;">
+<td style="border: 1pt solid width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>Parameter name</p>
+</td>
+<td style="border-width: 1pt 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>Units</p>
+</td>
+<td style="border-width: 1pt 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>Default value</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; vertical-align: top; width: 107pt; height: 18.8pt;">
+<p>background</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>cm-1</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>0.06</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>sld_pcore</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring; -2</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>1e-006</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>sld_rimA</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring; -2</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>2e-006</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>sld_rimB</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring; -2</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>4e-006</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>sld_rimC</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring; -2</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>2e-006</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>sld_solv</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring; -2</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>6e-006</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>rimA</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring;</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>10</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>rimB</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring;</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>10</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>rimC</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring;</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>10</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>longC</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring;</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>400</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>shortA</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring;</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>35</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>midB</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>&Aring;</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>75</p>
+</td>
+</tr>
+<tr style="height: 18.8pt;">
+<td style="border-width: medium 1pt 1pt; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>scale</p>
+</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">&nbsp;</td>
+<td style="border-width: medium 1pt 1pt medium; width: 107pt; height: 18.8pt;" valign="top" width="143">
+<p>1</p>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+<p style="text-align: center;" align="center"><img id="Picture 33" src="img/image096.jpg" alt="" width="450" height="338" /></p>
+<p style="text-align: center;" align="center"><b>Figure. 1D plot using the default values (w/256 data points).</b></p>
+<p style="text-align: center;" align="center"><b>&nbsp;</b></p>
+<p style="text-align: center;" align="center"><img id="Picture 34" src="img/image097.jpg" alt="" width="451" height="339" /></p>
+<p style="text-align: center;" align="center"><b>Figure. 2D plot using the default values (w/(256X265) data points).</b></p>
+
+<p>Our model uses the form factor calculations implemented in a c-library provided by the NIST Center for Neutron Research (Kline, 2006):</p>
+<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; REFERENCE</p>
+<p>see: Mittelbach and Porod, Acta Physica Austriaca 14 (1961) 185-211.</p>
+<p>Equations (1), (13-14). (yes, it's in German)&nbsp;</p>
+
+
+
+
+
+
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.27.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="EllipsoidModel"></a><b><span style="font-size: 14pt;">Ellipsoid Model</span></b></p>
 <p>This model provides the form factor for an ellipsoid (ellipsoid of revolution) with uniform scattering length density. The form factor is normalized by the particle volume.</p>
 <p style="margin-left: 0.85in; text-indent: -0.35in;"><b>1.1.</b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp; </span>Definition</b></p>
@@ -3486,5 +3710,5 @@
 <p><a name="_Ref173223004"></a>Figure 6: Comparison of the intensity for uniformly distributed ellipsoids calculated from our 2D model and the intensity from the NIST SANS analysis software. The parameters used were: Scale=1.0, Radius_a=20 &Aring;, Radius_b=400 &Aring;, Contrast=3e-6 &Aring; -2, and Background=0.0 cm -1.</p>
 <p>&nbsp;</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.27.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="CoreShellEllipsoidModel"></a><b><span style="font-size: 14pt;">CoreShellEllipsoidModel </span></b></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.28.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="CoreShellEllipsoidModel"></a><b><span style="font-size: 14pt;">CoreShellEllipsoidModel </span></b></p>
 <p>This model provides the form factor, P(<em>q</em>), for a core shell ellipsoid (below) where the form factor is normalized by the volume of the cylinder. P(q) = scale*&lt;f^2&gt;/V+background where the volume V= 4pi/3*rmaj*rmin2 and the averaging &lt; &gt;&nbsp; is applied over all orientation for 1D. &nbsp;</p>
 <p style="text-align: center;" align="center">&nbsp;&nbsp;<img id="Picture 41" src="img/image125.gif" alt="" width="335" height="179" /></p>
@@ -3621,5 +3845,9 @@
 <p>Kotlarchyk, M.; Chen, S.-H. J. Chem. Phys., 1983, 79, 2461.</p>
 <p>Berr, S.&nbsp; J. Phys. Chem., 1987, 91, 4760.</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.28.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="TriaxialEllipsoidModel"></a><b><span style="font-size: 14pt;">TriaxialEllipsoidModel</span></b></p>
+
+
+
+
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.29.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="TriaxialEllipsoidModel"></a><b><span style="font-size: 14pt;">TriaxialEllipsoidModel</span></b></p>
 <p>This model provides the form factor, P(<em>q</em>), for an ellipsoid (below) where all three axes are of different lengths, i.e.,&nbsp; Ra =&lt; Rb =&lt; Rc (Note that users should maintains this inequality for the all calculations).&nbsp; P(q) = scale*&lt;f^2&gt;/V+background where the volume V= 4pi/3*Ra*Rb*Rc, and the averaging &lt; &gt;&nbsp; is applied over all orientation for 1D. &nbsp;</p>
 <p style="text-align: center;" align="center">&nbsp;&nbsp;<img id="Picture 42" src="img/image128.jpg" alt="" width="376" height="226" /></p>
@@ -3736,5 +3964,11 @@
 <p>REFERENCE</p>
 <p>L. A. Feigin and D. I. Svergun &ldquo;Structure Analysis by Small-Angle X-Ray and Neutron Scattering&rdquo;, Plenum, New York, 1987.</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.29.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="LamellarModel"></a><b><span style="font-size: 14pt;">LamellarModel</span></b></p>
+
+
+
+
+
+
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.30.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="LamellarModel"></a><b><span style="font-size: 14pt;">LamellarModel</span></b></p>
 <p>This model provides the scattering intensity, I(<em>q</em>), for a lyotropic lamellar phase where a uniform SLD and random distribution in solution are assumed. &nbsp;The ploydispersion in the bilayer thickness can be applied from the GUI.</p>
 <p>The scattering intensity I(q) is:</p>
@@ -3823,5 +4057,5 @@
 <p>Nallet, Laversanne, and Roux, J. Phys. II France, 3, (1993) 487-502.</p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; also in J. Phys. Chem. B, 105, (2001) 11081-11088.</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.30.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="LamellarFFHGModel"></a><b><span style="font-size: 14pt;">LamellarFFHGModel</span></b></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.31.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="LamellarFFHGModel"></a><b><span style="font-size: 14pt;">LamellarFFHGModel</span></b></p>
 <p>This model provides the scattering intensity, I(<em>q</em>), for a lyotropic lamellar phase where a random distribution in solution are assumed. &nbsp;The SLD of the head region is taken to be different from the SLD of the tail region.</p>
 <p>The scattering intensity I(q) is:</p>
@@ -3932,5 +4166,5 @@
 <p>Nallet, Laversanne, and Roux, J. Phys. II France, 3, (1993) 487-502.</p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; also in J. Phys. Chem. B, 105, (2001) 11081-11088.</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.31.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="LamellarPSModel"></a><b><span style="font-size: 14pt;">LamellarPSModel</span></b></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.32.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="LamellarPSModel"></a><b><span style="font-size: 14pt;">LamellarPSModel</span></b></p>
 <p>This model provides the scattering intensity (<b>form factor</b> <b>*</b> <b>structure factor</b>), I(<em>q</em>), for a lyotropic lamellar phase where a random distribution in solution are assumed.</p>
 <p>The scattering intensity I(q) is:</p>
@@ -4045,5 +4279,5 @@
 <p>Nallet, Laversanne, and Roux, J. Phys. II France, 3, (1993) 487-502.</p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; also in J. Phys. Chem. B, 105, (2001) 11081-11088.</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.32.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="LamellarPSHGModel"></a><b><span style="font-size: 14pt;">LamellarPSHGModel</span></b></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.33.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="LamellarPSHGModel"></a><b><span style="font-size: 14pt;">LamellarPSHGModel</span></b></p>
 <p>This model provides the scattering intensity (<b>form factor</b> <b>*</b> <b>structure factor</b>), I(<em>q</em>), for a lyotropic lamellar phase where a random distribution in solution are assumed. &nbsp;The SLD of the head region is taken to be different from the SLD of the tail region.</p>
 <p>The scattering intensity I(q) is:</p>
@@ -4192,5 +4426,5 @@
 <p>Nallet, Laversanne, and Roux, J. Phys. II France, 3, (1993) 487-502.</p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; also in J. Phys. Chem. B, 105, (2001) 11081-11088.</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.33.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="LamellarPCrystalModel"></a><b><span style="font-size: 14pt;">LamellarPCrystalModel</span></b></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.34.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="LamellarPCrystalModel"></a><b><span style="font-size: 14pt;">LamellarPCrystalModel</span></b></p>
 <p>Lamella ParaCrystal Model: Calculates the scattering from a stack of repeating lamellar structures. The stacks of lamellae (infinite in lateral dimension) are treated as a paracrystal to account for the repeating spacing. The repeat distance is further characterized by a Gaussian polydispersity. This model can be used for large multilamellar vesicles.</p>
 <p>The scattering intensity I(q) is calculated as:</p>
@@ -4308,5 +4542,5 @@
 <p>REFERENCE</p>
 <p>M. Bergstrom, J. S. Pedersen, P. Schurtenberger, S. U. Egelhaaf, J. Phys. Chem. B, 103 (1999) 9888-9897.</p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.34.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="SCCrystalModel"></a><b><span style="font-size: 14pt;">SC(Simple Cubic Para-)CrystalModel</span></b></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.35.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="SCCrystalModel"></a><b><span style="font-size: 14pt;">SC(Simple Cubic Para-)CrystalModel</span></b></p>
 <p>Calculates the scattering from a simple cubic lattice with paracrystalline distortion. Thermal vibrations are considered to be negligible, and the size of the paracrystal is infinitely large. Paracrystalline distortion is assumed to be isotropic and characterized by a Gaussian distribution.</p>
 <p>The returned value is scaled to units of [cm-1sr-1], absolute scale.</p>
@@ -4432,5 +4666,5 @@
 <p style="text-align: center;" align="center"><b><img src="img/image157.jpg" alt="" width="447" height="322" /></b></p>
 <p style="text-align: center;" align="center"><b>Figure. 2D plot using the default values (w/200X200 pixels).</b></p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.35.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="FCCrystalModel"></a><b><span style="font-size: 14pt;">FC(Face Centered Cubic Para-)CrystalModel</span></b></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.36.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="FCCrystalModel"></a><b><span style="font-size: 14pt;">FC(Face Centered Cubic Para-)CrystalModel</span></b></p>
 <p>Calculates the scattering from a face-centered cubic lattice with paracrystalline distortion. Thermal vibrations are considered to be negligible, and the size of the paracrystal is infinitely large. Paracrystalline distortion is assumed to be isotropic and characterized by a Gaussian distribution.&nbsp;</p>
 <p>The returned value is scaled to units of [cm-1sr-1], absolute scale.</p>
@@ -4557,5 +4791,5 @@
 <p style="text-align: center;" align="center"><img src="img/image166.jpg" alt="" width="473" height="352" /></p>
 <p style="text-align: center;" align="center"><b>Figure. 2D plot using the default values (w/200X200 pixels).</b></p>
-<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.36.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="BCCrystalModel"></a><b><span style="font-size: 14pt;">BC(Body Centered Cubic Para-)CrystalModel</span></b></p>
+<p style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.37.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></b><a name="BCCrystalModel"></a><b><span style="font-size: 14pt;">BC(Body Centered Cubic Para-)CrystalModel</span></b></p>
 <p>Calculates the scattering from a body-centered cubic lattice with paracrystalline distortion. Thermal vibrations are considered to be negligible, and the size of the paracrystal is infinitely large. Paracrystalline distortion is assumed to be isotropic and characterized by a Gaussian distribution.The returned value is scaled to units of [cm-1sr-1], absolute scale.</p>
 <p>The scattering intensity I(q) is calculated as:</p>
