Changeset 6f17afa in sasview

Timestamp:

Mar 18, 2016 12:41:22 PM (9 years ago)

Author:

smk78

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:

66f21cd

Parents:

c9c718a

Message:

Image path references now with /olddocs appended

File:

• src/sas/models/media/olddocs/model_functions.rst (modified) (217 diffs)

src/sas/models/media/olddocs/model_functions.rst

@@ -102 +102 @@
 the particle
 
-.. image:: img/image001.PNG
+.. image:: img/olddocs/image001.PNG
 
 with
 
-.. image:: img/image002.PNG
+.. image:: img/olddocs/image002.PNG
 
 where |P0|\ *(q)* is the un-normalized form factor, |rho|\ *(r)* is the scattering length density at a given
@@ -114 +114 @@
 by the particle volume fraction
 
-.. image:: img/image003.PNG
+.. image:: img/olddocs/image003.PNG
 
 Our so-called 1D scattering intensity functions provide *P(q)* for the case where the scatterer is randomly oriented. In
@@ -337 +337 @@
 The 1D scattering intensity is calculated in the following way (Guinier, 1955)
 
-.. image:: img/image004.PNG
+.. image:: img/olddocs/image004.PNG
 
 where *scale* is a volume fraction, *V* is the volume of the scatterer, *r* is the radius of the sphere, *bkg* is
@@ -372 +372 @@
 NIST (Kline, 2006). Figure 1 shows a comparison of the output of our model and the output of the NIST software.
 
-.. image:: img/image005.jpg
+.. image:: img/olddocs/image005.jpg
 
 Figure 1: Comparison of the DANSE scattering intensity for a sphere with the output of the NIST SANS analysis software.
@@ -391 +391 @@
 solution
 
-.. image:: img/image006.PNG
+.. image:: img/olddocs/image006.PNG
 
 where *Sij* are the partial structure factors and *fi* are the scattering amplitudes of the particles. The subscript 1
@@ -397 +397 @@
 where *n* = the number density) is internally calculated based on
 
-.. image:: img/image007.PNG
+.. image:: img/olddocs/image007.PNG
 
 The 2D scattering intensity is the same as 1D, regardless of the orientation of the *q* vector which is defined as
 
-.. image:: img/image008.PNG
+.. image:: img/olddocs/image008.PNG
 
 The parameters of the BinaryHSModel are the following (in the names, *l* (or *ls*\ ) stands for larger spheres
@@ -419 +419 @@
 ==============  ========  =============
 
-.. image:: img/image009.jpg
+.. image:: img/olddocs/image009.jpg
 
 *Figure. 1D plot using the default values above (w/200 data point).*
@@ -445 +445 @@
 The scattering intensity *I(q)* is calculated as:
 
-.. image:: img/image010.PNG
+.. image:: img/olddocs/image010.PNG
 
 where the amplitude *A(q)* is given as the typical sphere scattering convoluted with a Gaussian to get a gradual
 drop-off in the scattering length density
 
-.. image:: img/image011.PNG
+.. image:: img/olddocs/image011.PNG
 
 Here |A2|\ *(q)* is the form factor, *P(q)*. The scale is equivalent to the volume fraction of spheres, each of
@@ -471 +471 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image008.PNG
+.. image:: img/olddocs/image008.PNG
 
 This example dataset is produced by running the FuzzySphereModel, using 200 data points, *qmin* = 0.001 -1,
@@ -487 +487 @@
 ==============  ========  =============
 
-.. image:: img/image012.jpg
+.. image:: img/olddocs/image012.jpg
 
 *Figure. 1D plot using the default values (w/200 data point).*
@@ -508 +508 @@
 The structure is:
 
-.. image:: img/raspberry_pic.jpg
+.. image:: img/olddocs/raspberry_pic.jpg
 
 where *Ro* = the radius of the large sphere, *Rp* = the radius of the smaller sphere on the surface, |delta| = the
@@ -523 +523 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image008.PNG
+.. image:: img/olddocs/image008.PNG
 
 This example dataset is produced by running the RaspBerryModel, using 2000 data points, *qmin* = 0.0001 |Ang^-1|,
@@ -544 +544 @@
 ==============  ========  =============
 
-.. image:: img/raspberry_plot.jpg
+.. image:: img/olddocs/raspberry_plot.jpg
 
 *Figure. 1D plot using the values of /2000 data points.*
@@ -568 +568 @@
 The 1D scattering intensity is calculated in the following way (Guinier, 1955)
 
-.. image:: img/image013.PNG
+.. image:: img/olddocs/image013.PNG
 
 where *scale* is a scale factor, *Vs* is the volume of the outer shell, *Vc* is the volume of the core, *rs* is the
@@ -608 +608 @@
 NIST (Kline, 2006). Figure 1 shows a comparison of the output of our model and the output of the NIST software.
 
-.. image:: img/image014.jpg
+.. image:: img/olddocs/image014.jpg
 
 Figure 1: Comparison of the SasView scattering intensity for a core-shell sphere with the output of the NIST SANS
@@ -669 +669 @@
 *qmax* = 0.7 -1 and the above default values.
 
-.. image:: img/image015.jpg
+.. image:: img/olddocs/image015.jpg
 
 *Figure: 1D plot using the default values (w/200 data point).*
@@ -675 +675 @@
 The scattering length density profile for the default sld values (w/ 4 shells).
 
-.. image:: img/image016.jpg
+.. image:: img/olddocs/image016.jpg
 
 *Figure: SLD profile against the radius of the sphere for default SLDs.*
@@ -704 +704 @@
 The *I* :sub:`0` is calculated in the following way (King, 2002)
 
-.. image:: img/secondmeq1.jpg
+.. image:: img/olddocs/secondmeq1.jpg
 
 where *scale* is a scale factor, *poly* is the sld of the polymer (or surfactant) layer, *solv* is the sld of the
@@ -731 +731 @@
 ==============  ========  =============
 
-.. image:: img/secongm_fig1.jpg
+.. image:: img/olddocs/secongm_fig1.jpg
 
 REFERENCE
@@ -747 +747 @@
 solvent and the shells are interleaved with layers of solvent. For *N* = 1, this returns the VesicleModel (above).
 
-.. image:: img/image020.jpg
+.. image:: img/olddocs/image020.jpg
 
 The 2D scattering intensity is the same as 1D, regardless of the orientation of the *q* vector which is defined as
 
-.. image:: img/image008.PNG
+.. image:: img/olddocs/image008.PNG
 
 NB: The outer most radius (= *core_radius* + *n_pairs* \* *s_thickness* + (*n_pairs* - 1) \* *w_thickness*) is used
@@ -774 +774 @@
 is the number of shells.
 
-.. image:: img/image021.jpg
+.. image:: img/olddocs/image021.jpg
 
 *Figure. 1D plot using the default values (w/200 data point).*
@@ -801 +801 @@
 The 1D scattering intensity is calculated in the following way
 
-.. image:: img/image022.gif
-
-.. image:: img/image023.gif
+.. image:: img/olddocs/image022.gif
+
+.. image:: img/olddocs/image023.gif
 
 where, for a spherically symmetric particle with a particle density |rho|\ *(r)*
 
-.. image:: img/image024.gif
+.. image:: img/olddocs/image024.gif
 
 so that
 
-.. image:: img/image025.gif
-
-.. image:: img/image026.gif
-
-.. image:: img/image027.gif
+.. image:: img/olddocs/image025.gif
+
+.. image:: img/olddocs/image026.gif
+
+.. image:: img/olddocs/image027.gif
 
 Here we assumed that the SLDs of the core and solvent are constant against *r*.
@@ -821 +821 @@
 Now lets consider the SLD of a shell, *r*\ :sub:`shelli`, defined by
 
-.. image:: img/image028.gif
+.. image:: img/olddocs/image028.gif
 
 An example of a possible SLD profile is shown below where *sld_in_shelli* (|rho|\ :sub:`in`\ ) and
@@ -829 +829 @@
 For \| *A* \| > 0,
 
-.. image:: img/image029.gif
+.. image:: img/olddocs/image029.gif
 
 For *A* ~ 0 (eg., *A* = -0.0001), this function converges to that of the linear SLD profile (ie,
@@ -835 +835 @@
 so this case is equivalent to
 
-.. image:: img/image030.gif
-
-.. image:: img/image031.gif
-
-.. image:: img/image032.gif
-
-.. image:: img/image033.gif
+.. image:: img/olddocs/image030.gif
+
+.. image:: img/olddocs/image031.gif
+
+.. image:: img/olddocs/image032.gif
+
+.. image:: img/olddocs/image033.gif
 
 For *A* = 0, the exponential function has no dependence on the radius (so that *sld_out_shell* (|rho|\ :sub:`out`) is
@@ -847 +847 @@
 factor contributed by the shells is
 
-.. image:: img/image034.gif
-
-.. image:: img/image035.gif
+.. image:: img/olddocs/image034.gif
+
+.. image:: img/olddocs/image035.gif
 
 In the equation
 
-.. image:: img/image036.gif
+.. image:: img/olddocs/image036.gif
 
 Finally, the form factor can be calculated by
 
-.. image:: img/image037.gif
+.. image:: img/olddocs/image037.gif
 
 where
 
-.. image:: img/image038.gif
+.. image:: img/olddocs/image038.gif
 
 and
 
-.. image:: img/image039.gif
+.. image:: img/olddocs/image039.gif
 
 The 2D scattering intensity is the same as *P(q)* above, regardless of the orientation of the *q* vector which is
 defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 NB: The outer most radius is used as the effective radius for *S(Q)* when *P(Q)* \* *S(Q)* is applied.
@@ -892 +892 @@
 NB: *rad_core* represents the core radius (*R1*) and *thick_shell1* (*R2* - *R1*) is the thickness of the shell1, etc.
 
-.. image:: img/image041.jpg
+.. image:: img/olddocs/image041.jpg
 
 *Figure. 1D plot using the default values (w/400 point).*
 
-.. image:: img/image042.jpg
+.. image:: img/olddocs/image042.jpg
 
 *Figure. SLD profile from the default values.*
@@ -918 +918 @@
 The 1D scattering intensity is calculated in the following way (Guinier, 1955)
 
-.. image:: img/image017.PNG
+.. image:: img/olddocs/image017.PNG
 
 where *scale* is a scale factor, *Vshell* is the volume of the shell, *V1* is the volume of the core, *V2* is the total
@@ -928 +928 @@
 and a shell thickness, *t*.
 
-.. image:: img/image018.jpg
+.. image:: img/olddocs/image018.jpg
 
 The 2D scattering intensity is the same as *P(q)* above, regardless of the orientation of the *q* vector which is
 defined as
 
-.. image:: img/image008.PNG
+.. image:: img/olddocs/image008.PNG
 
 NB: The outer most radius (= *radius* + *thickness*) is used as the effective radius for *S(Q)* when *P(Q)* \* *S(Q)*
@@ -953 +953 @@
 NB: *radius* represents the core radius (*R1*) and the *thickness* (*R2* - *R1*) is the shell thickness.
 
-.. image:: img/image019.jpg
+.. image:: img/olddocs/image019.jpg
 
 *Figure. 1D plot using the default values (w/200 data point).*
@@ -984 +984 @@
 The 1D scattering intensity is calculated in the following way:
 
-.. image:: img/image022.gif
-
-.. image:: img/image043.gif
+.. image:: img/olddocs/image022.gif
+
+.. image:: img/olddocs/image043.gif
 
 where, for a spherically symmetric particle with a particle density |rho|\ *(r)*
 
-.. image:: img/image024.gif
+.. image:: img/olddocs/image024.gif
 
 so that
 
-.. image:: img/image044.gif
-
-.. image:: img/image045.gif
-
-.. image:: img/image046.gif
-
-.. image:: img/image047.gif
-
-.. image:: img/image048.gif
-
-.. image:: img/image027.gif
+.. image:: img/olddocs/image044.gif
+
+.. image:: img/olddocs/image045.gif
+
+.. image:: img/olddocs/image046.gif
+
+.. image:: img/olddocs/image047.gif
+
+.. image:: img/olddocs/image048.gif
+
+.. image:: img/olddocs/image027.gif
 
 Here we assumed that the SLDs of the core and solvent are constant against *r*. The SLD at the interface between
@@ -1011 +1011 @@
 1) Exp
 
-.. image:: img/image049.gif
+.. image:: img/olddocs/image049.gif
 
 2) Power-Law
 
-.. image:: img/image050.gif
+.. image:: img/olddocs/image050.gif
 
 3) Erf
 
-.. image:: img/image051.gif
+.. image:: img/olddocs/image051.gif
 
 The functions are normalized so that they vary between 0 and 1, and they are constrained such that the SLD is
@@ -1027 +1027 @@
 to the form factor *P(q)*
 
-.. image:: img/image052.gif
-
-.. image:: img/image053.gif
-
-.. image:: img/image054.gif
+.. image:: img/olddocs/image052.gif
+
+.. image:: img/olddocs/image053.gif
+
+.. image:: img/olddocs/image054.gif
 
 where we assume that |rho|\ :sub:`inter_i`\ *(r)* can be approximately linear within a sub-layer *j*.
@@ -1037 +1037 @@
 In the equation
 
-.. image:: img/image055.gif
+.. image:: img/olddocs/image055.gif
 
 Finally, the form factor can be calculated by
 
-.. image:: img/image037.gif
+.. image:: img/olddocs/image037.gif
 
 where
 
-.. image:: img/image038.gif
+.. image:: img/olddocs/image038.gif
 
 and
 
-.. image:: img/image056.gif
+.. image:: img/olddocs/image056.gif
 
 The 2D scattering intensity is the same as *P(q)* above, regardless of the orientation of the *q* vector which is
 defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 NB: The outer most radius is used as the effective radius for *S(Q)* when *P(Q)* \* *S(Q)* is applied.
@@ -1081 +1081 @@
 NB: *rad_core0* represents the core radius (*R1*).
 
-.. image:: img/image057.jpg
+.. image:: img/olddocs/image057.jpg
 
 *Figure. 1D plot using the default values (w/400 point).*
 
-.. image:: img/image058.jpg
+.. image:: img/olddocs/image058.jpg
 
 *Figure. SLD profile from the default values.*
@@ -1104 +1104 @@
 of each string is assumed to be negligible.
 
-.. image:: img/linearpearls.jpg
+.. image:: img/olddocs/linearpearls.jpg
 
 *2.1.12.1. Definition*
@@ -1110 +1110 @@
 The output of the scattering intensity function for the LinearPearlsModel is given by (Dobrynin, 1996)
 
-.. image:: img/linearpearl_eq1.gif
+.. image:: img/olddocs/linearpearl_eq1.gif
 
 where the mass *m*\ :sub:`p` is (SLD\ :sub:`pearl` - SLD\ :sub:`solvent`) \* (volume of *N* pearls). V is the total
@@ -1133 +1133 @@
 NB: *num_pearls* must be an integer.
 
-.. image:: img/linearpearl_plot.jpg
+.. image:: img/olddocs/linearpearl_plot.jpg
 
 REFERENCE
@@ -1150 +1150 @@
 distance.
 
-.. image:: img/pearl_fig.jpg
+.. image:: img/olddocs/pearl_fig.jpg
 
 *2.1.13.1. Definition*
@@ -1156 +1156 @@
 The output of the scattering intensity function for the PearlNecklaceModel is given by (Schweins, 2004)
 
-.. image:: img/pearl_eq1.gif
+.. image:: img/olddocs/pearl_eq1.gif
 
 where
 
-.. image:: img/pearl_eq2.gif
-
-.. image:: img/pearl_eq3.gif
-
-.. image:: img/pearl_eq4.gif
-
-.. image:: img/pearl_eq5.gif
-
-.. image:: img/pearl_eq6.gif
+.. image:: img/olddocs/pearl_eq2.gif
+
+.. image:: img/olddocs/pearl_eq3.gif
+
+.. image:: img/olddocs/pearl_eq4.gif
+
+.. image:: img/olddocs/pearl_eq5.gif
+
+.. image:: img/olddocs/pearl_eq6.gif
 
 and
 
-.. image:: img/pearl_eq7.gif
+.. image:: img/olddocs/pearl_eq7.gif
 
 where the mass *m*\ :sub:`i` is (SLD\ :sub:`i` - SLD\ :sub:`solvent`) \* (volume of the *N* pearls/rods). *V* is the
@@ -1198 +1198 @@
 NB: *num_pearls* must be an integer.
 
-.. image:: img/pearl_plot.jpg
+.. image:: img/olddocs/pearl_plot.jpg
 
 REFERENCE
@@ -1219 +1219 @@
 The output of the 2D scattering intensity function for oriented cylinders is given by (Guinier, 1955)
 
-.. image:: img/image059.PNG
+.. image:: img/olddocs/image059.PNG
 
 where
 
-.. image:: img/image060.PNG
+.. image:: img/olddocs/image060.PNG
 
 and |alpha| is the angle between the axis of the cylinder and the *q*-vector, *V* is the volume of the cylinder,
@@ -1232 +1232 @@
 and |phi|. Those angles are defined in Figure 1.
 
-.. image:: img/image061.jpg
+.. image:: img/olddocs/image061.jpg
 
 *Figure 1. Definition of the angles for oriented cylinders.*
 
-.. image:: img/image062.jpg
+.. image:: img/olddocs/image062.jpg
 
 *Figure 2. Examples of the angles for oriented pp against the detector plane.*
@@ -1259 +1259 @@
 The output of the 1D scattering intensity function for randomly oriented cylinders is then given by
 
-.. image:: img/image063.PNG
+.. image:: img/olddocs/image063.PNG
 
 The *cyl_theta* and *cyl_phi* parameter are not used for the 1D output. Our implementation of the scattering kernel
@@ -1269 +1269 @@
 NIST (Kline, 2006). Figure 3 shows a comparison of the 1D output of our model and the output of the NIST software.
 
-.. image:: img/image065.jpg
+.. image:: img/olddocs/image065.jpg
 
 *Figure 3: Comparison of the SasView scattering intensity for a cylinder with the output of the NIST SANS analysis*
@@ -1277 +1277 @@
 In general, averaging over a distribution of orientations is done by evaluating the following
 
-.. image:: img/image064.PNG
+.. image:: img/olddocs/image064.PNG
 
 where *p(*\ |theta|,\ |phi|\ *)* is the probability distribution for the orientation and |P0|\ *(q,*\ |alpha|\ *)* is
@@ -1284 +1284 @@
 distribution *p(*\ |theta|,\ |phi|\ *)* = 1.0. Figure 4 shows the result of such a cross-check.
 
-.. image:: img/image066.jpg
+.. image:: img/olddocs/image066.jpg
 
 *Figure 4: Comparison of the intensity for uniformly distributed cylinders calculated from our 2D model and the*
@@ -1309 +1309 @@
 The 1D scattering intensity is calculated in the following way (Guinier, 1955)
 
-.. image:: img/image072.PNG
+.. image:: img/olddocs/image072.PNG
 
 where *scale* is a scale factor, *J1* is the 1st order Bessel function, *J1(x)* = (sin *x* - *x* cos *x*)/ *x*\ :sup:`2`.
@@ -1334 +1334 @@
 ==============  ========  =============
 
-.. image:: img/image074.jpg
+.. image:: img/olddocs/image074.jpg
 
 *Figure. 1D plot using the default values (w/1000 data point).*
@@ -1341 +1341 @@
 (Kline, 2006).
 
-.. image:: img/image061.jpg
+.. image:: img/olddocs/image061.jpg
 
 *Figure. Definition of the angles for the oriented HollowCylinderModel.*
 
-.. image:: img/image062.jpg
+.. image:: img/olddocs/image062.jpg
 
 *Figure. Examples of the angles for oriented pp against the detector plane.*
@@ -1371 +1371 @@
 The Capped Cylinder geometry is defined as
 
-.. image:: img/image112.jpg
+.. image:: img/olddocs/image112.jpg
 
 where *r* is the radius of the cylinder. All other parameters are as defined in the diagram. Since the end cap radius
@@ -1380 +1380 @@
 The scattered intensity *I(q)* is calculated as
 
-.. image:: img/image113.jpg
+.. image:: img/olddocs/image113.jpg
 
 where the amplitude *A(q)* is given as
 
-.. image:: img/image114.jpg
+.. image:: img/olddocs/image114.jpg
 
 The < > brackets denote an average of the structure over all orientations. <\ *A*\ :sup:`2`\ *(q)*> is then the form
@@ -1392 +1392 @@
 The volume of the Capped Cylinder is (with *h* as a positive value here)
 
-.. image:: img/image115.jpg
+.. image:: img/olddocs/image115.jpg
 
 and its radius-of-gyration
 
-.. image:: img/image116.jpg
+.. image:: img/olddocs/image116.jpg
 
 **The requirement that** *R* >= *r* **is not enforced in the model! It is up to you to restrict this during analysis.**
@@ -1415 +1415 @@
 ==============  ========  =============
 
-.. image:: img/image117.jpg
+.. image:: img/olddocs/image117.jpg
 
 *Figure. 1D plot using the default values (w/256 data point).*
@@ -1422 +1422 @@
 |theta| = 45 deg and |phi| =0 deg with default values for other parameters
 
-.. image:: img/image118.jpg
+.. image:: img/olddocs/image118.jpg
 
 *Figure. 2D plot (w/(256X265) data points).*
 
-.. image:: img/image061.jpg
+.. image:: img/olddocs/image061.jpg
 
 *Figure. Definition of the angles for oriented 2D cylinders.*
 
-.. image:: img/image062.jpg
+.. image:: img/olddocs/image062.jpg
 
 *Figure. Examples of the angles for oriented pp against the detector plane.*
@@ -1453 +1453 @@
 The output of the 2D scattering intensity function for oriented core-shell cylinders is given by (Kline, 2006)
 
-.. image:: img/image067.PNG
+.. image:: img/olddocs/image067.PNG
 
 where
 
-.. image:: img/image068.PNG
-
-.. image:: img/image239.PNG
+.. image:: img/olddocs/image068.PNG
+
+.. image:: img/olddocs/image239.PNG
 
 and |alpha| is the angle between the axis of the cylinder and the *q*\ -vector, *Vs* is the volume of the outer shell
@@ -1468 +1468 @@
 the outer shell is given by *L+2t*. *J1* is the first order Bessel function.
 
-.. image:: img/image069.jpg
+.. image:: img/olddocs/image069.jpg
 
 To provide easy access to the orientation of the core-shell cylinder, we define the axis of the cylinder using two
@@ -1503 +1503 @@
 NIST (Kline, 2006). Figure 1 shows a comparison of the 1D output of our model and the output of the NIST software.
 
-.. image:: img/image070.jpg
+.. image:: img/olddocs/image070.jpg
 
 *Figure 1: Comparison of the SasView scattering intensity for a core-shell cylinder with the output of the NIST SANS*
@@ -1514 +1514 @@
 2D output using a uniform distribution *p(*\ |theta|,\ |phi|\ *)* = 1.0. Figure 2 shows the result of such a cross-check.
 
-.. image:: img/image071.jpg
+.. image:: img/olddocs/image071.jpg
 
 *Figure 2: Comparison of the intensity for uniformly distributed core-shell cylinders calculated from our 2D model and*
@@ -1521 +1521 @@
 *Solvent_sld* = 1e-6 |Ang^-2|, and *Background* = 0.0 |cm^-1|.
 
-.. image:: img/image061.jpg
+.. image:: img/olddocs/image061.jpg
 
 *Figure. Definition of the angles for oriented core-shell cylinders.*
 
-.. image:: img/image062.jpg
+.. image:: img/olddocs/image062.jpg
 
 *Figure. Examples of the angles for oriented pp against the detector plane.*
@@ -1545 +1545 @@
 to any of the orientation angles, and also for the minor radius and the ratio of the ellipse radii.
 
-.. image:: img/image098.gif
+.. image:: img/olddocs/image098.gif
 
 *Figure.* *a* = *r_minor* and |nu|\ :sub:`n` = *r_ratio* (i.e., *r_major* / *r_minor*).
@@ -1551 +1551 @@
 The function calculated is
 
-.. image:: img/image099.PNG
+.. image:: img/olddocs/image099.PNG
 
 with the functions
 
-.. image:: img/image100.PNG
+.. image:: img/olddocs/image100.PNG
 
 and the angle |bigpsi| is defined as the orientation of the major axis of the ellipse with respect to the vector *q*\ .
@@ -1574 +1574 @@
 All angle parameters are valid and given only for 2D calculation; ie, an oriented system.
 
-.. image:: img/image101.jpg
+.. image:: img/olddocs/image101.jpg
 
 *Figure. Definition of angles for 2D*
 
-.. image:: img/image062.jpg
+.. image:: img/olddocs/image062.jpg
 
 *Figure. Examples of the angles for oriented elliptical cylinders against the detector plane.*
@@ -1597 +1597 @@
 ==============  ========  =============
 
-.. image:: img/image102.jpg
+.. image:: img/olddocs/image102.jpg
 
 *Figure. 1D plot using the default values (w/1000 data point).*
@@ -1608 +1608 @@
 and 76 degrees are taken for the angles of |theta|, |phi|, and |bigpsi| respectively).
 
-.. image:: img/image103.gif
+.. image:: img/olddocs/image103.gif
 
 *Figure. Comparison between 1D and averaged 2D.*
@@ -1615 +1615 @@
 the results of the averaging by varying the number of angular bins.
 
-.. image:: img/image104.gif
+.. image:: img/olddocs/image104.gif
 
 *Figure. The intensities averaged from 2D over different numbers of bins and angles.*
@@ -1639 +1639 @@
 The 2D scattering intensity is the same as 1D, regardless of the orientation of the *q* vector which is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 *2.1.19.1. Definition*
 
-.. image:: img/image075.jpg
+.. image:: img/olddocs/image075.jpg
 
 The chain of contour length, *L*, (the total length) can be described as a chain of some number of locally stiff
@@ -1666 +1666 @@
 ==============  ========  =============
 
-.. image:: img/image076.jpg
+.. image:: img/olddocs/image076.jpg
 
 *Figure. 1D plot using the default values (w/1000 data point).*
@@ -1721 +1721 @@
 - The scattering function is negative for a range of parameter values and q-values that are experimentally accessible. A correction function has been added to give the proper behavior.
 
-.. image:: img/image077.jpg
+.. image:: img/olddocs/image077.jpg
 
 The chain of contour length, *L*, (the total length) can be described as a chain of some number of locally stiff
@@ -1745 +1745 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image008.PNG
+.. image:: img/olddocs/image008.PNG
 
 This example dataset is produced by running the Macro FlexCylEllipXModel, using 200 data points, *qmin* = 0.001 |Ang^-1|,
@@ -1763 +1763 @@
 ==============  ========  =============
 
-.. image:: img/image078.jpg
+.. image:: img/olddocs/image078.jpg
 
 *Figure. 1D plot using the default values (w/200 data points).*
@@ -1790 +1790 @@
 and SLDs.
 
-.. image:: img/image240.png
+.. image:: img/olddocs/image240.png
 
 *(Graphic from DOI: 10.1039/C0NP00002G)*
@@ -1818 +1818 @@
 and the 1D scattering intensity use the c-library from NIST.
 
-.. image:: img/cscylbicelle_pic.jpg
+.. image:: img/olddocs/cscylbicelle_pic.jpg
 
 *Figure. 1D plot using the default values (w/200 data point).*
 
-.. image:: img/image061.jpg
+.. image:: img/olddocs/image061.jpg
 
 *Figure. Definition of the angles for the oriented CoreShellBicelleModel.*
 
-.. image:: img/image062.jpg
+.. image:: img/olddocs/image062.jpg
 
 *Figure. Examples of the angles for oriented pp against the detector plane.*
@@ -1852 +1852 @@
 The barbell geometry is defined as
 
-.. image:: img/image105.jpg
+.. image:: img/olddocs/image105.jpg
 
 where *r* is the radius of the cylinder. All other parameters are as defined in the diagram.
@@ -1863 +1863 @@
 The scattered intensity *I(q)* is calculated as
 
-.. image:: img/image106.PNG
+.. image:: img/olddocs/image106.PNG
 
 where the amplitude *A(q)* is given as
 
-.. image:: img/image107.PNG
+.. image:: img/olddocs/image107.PNG
 
 The < > brackets denote an average of the structure over all orientations. <*A* :sup:`2`\ *(q)*> is then the form
@@ -1875 +1875 @@
 The volume of the barbell is
 
-.. image:: img/image108.jpg
+.. image:: img/olddocs/image108.jpg
 
 
 and its radius-of-gyration is
 
-.. image:: img/image109.jpg
+.. image:: img/olddocs/image109.jpg
 
 **The requirement that** *R* >= *r* **is not enforced in the model!** It is up to you to restrict this during analysis.
@@ -1899 +1899 @@
 ==============  ========  =============
 
-.. image:: img/image110.jpg
+.. image:: img/olddocs/image110.jpg
 
 *Figure. 1D plot using the default values (w/256 data point).*
@@ -1906 +1906 @@
 |theta| = 45 deg and |phi| = 0 deg with default values for other parameters
 
-.. image:: img/image111.jpg
+.. image:: img/olddocs/image111.jpg
 
 *Figure. 2D plot (w/(256X265) data points).*
 
-.. image:: img/image061.jpg
+.. image:: img/olddocs/image061.jpg
 
 *Figure. Examples of the angles for oriented pp against the detector plane.*
 
-.. image:: img/image062.jpg
+.. image:: img/olddocs/image062.jpg
 
 Figure. Definition of the angles for oriented 2D barbells.
@@ -1940 +1940 @@
 The 2D scattering intensity is the same as 1D, regardless of the orientation of the *q* vector which is defined as
 
-.. image:: img/image008.PNG
+.. image:: img/olddocs/image008.PNG
 
 The returned value is in units of |cm^-1| |sr^-1|, on absolute scale.
@@ -1946 +1946 @@
 *2.1.23.1 Definition*
 
-.. image:: img/image079.gif
+.. image:: img/olddocs/image079.gif
 
 The scattering intensity *I(q)* is
 
-.. image:: img/image081.PNG
+.. image:: img/olddocs/image081.PNG
 
 where the contrast
 
-.. image:: img/image082.PNG
+.. image:: img/olddocs/image082.PNG
 
 and *N* is the number of discs per unit volume, |alpha| is the angle between the axis of the disc and *q*, and *Vt*
 and *Vc* are the total volume and the core volume of a single disc, respectively.
 
-.. image:: img/image083.PNG
+.. image:: img/olddocs/image083.PNG
 
 where *d* = thickness of the layer (*layer_thick*), 2\ *h* = core thickness (*core_thick*), and *R* = radius of the
 disc (*radius*).
 
-.. image:: img/image084.PNG
+.. image:: img/olddocs/image084.PNG
 
 where *n* = the total number of the disc stacked (*n_stacking*), *D* = the next neighbor center-to-center distance
@@ -1990 +1990 @@
 ==============  ========  =============
 
-.. image:: img/image085.jpg
+.. image:: img/olddocs/image085.jpg
 
 *Figure. 1D plot using the default values (w/1000 data point).*
 
-.. image:: img/image086.jpg
+.. image:: img/olddocs/image086.jpg
 
 *Figure. Examples of the angles for oriented stackeddisks against the detector plane.*
 
-.. image:: img/image062.jpg
+.. image:: img/olddocs/image062.jpg
 
 *Figure. Examples of the angles for oriented pp against the detector plane.*
@@ -2021 +2021 @@
 This model provides the form factor, *P(q)*, for a 'pringle' or 'saddle-shaped' object (a hyperbolic paraboloid).
 
-.. image:: img/image241.png
+.. image:: img/olddocs/image241.png
 
 *(Graphic from Matt Henderson, matt@matthen.com)*
@@ -2029 +2029 @@
 The form factor calculated is
 
-.. image:: img/pringle_eqn_1.jpg
+.. image:: img/olddocs/pringle_eqn_1.jpg
 
 where
 
-.. image:: img/pringle_eqn_2.jpg
+.. image:: img/olddocs/pringle_eqn_2.jpg
 
 The parameters of the model and a plot comparing the pringle model with the equivalent cylinder are shown below.
@@ -2050 +2050 @@
 ==============  ========  =============
 
-.. image:: img/pringle-vs-cylinder.png
+.. image:: img/olddocs/pringle-vs-cylinder.png
 
 *Figure. 1D plot using the default values (w/150 data point).*
@@ -2071 +2071 @@
 The output of the 2D scattering intensity function for oriented ellipsoids is given by (Feigin, 1987)
 
-.. image:: img/image059.PNG
+.. image:: img/olddocs/image059.PNG
 
 where
 
-.. image:: img/image119.PNG
+.. image:: img/olddocs/image119.PNG
 
 and
 
-.. image:: img/image120.PNG
+.. image:: img/olddocs/image120.PNG
 
 |alpha| is the angle between the axis of the ellipsoid and the *q*\ -vector, *V* is the volume of the ellipsoid, *Ra*
@@ -2111 +2111 @@
 above.
 
-.. image:: img/image121.jpg
+.. image:: img/olddocs/image121.jpg
 
 The *axis_theta* and *axis_phi* parameters are not used for the 1D output. Our implementation of the scattering
 kernel and the 1D scattering intensity use the c-library from NIST.
 
-.. image:: img/image122.jpg
+.. image:: img/olddocs/image122.jpg
 
 *Figure. The angles for oriented ellipsoid.*
@@ -2126 +2126 @@
 software.
 
-.. image:: img/image123.jpg
+.. image:: img/olddocs/image123.jpg
 
 *Figure 1: Comparison of the SasView scattering intensity for an ellipsoid with the output of the NIST SANS analysis*
@@ -2137 +2137 @@
 cross-check.
 
-.. image:: img/image124.jpg
+.. image:: img/olddocs/image124.jpg
 
 *Figure 2: Comparison of the intensity for uniformly distributed ellipsoids calculated from our 2D model and the*
@@ -2169 +2169 @@
 all orientations for 1D.
 
-.. image:: img/image125.gif
+.. image:: img/olddocs/image125.gif
 
 The returned value is in units of |cm^-1|, on absolute scale.
@@ -2177 +2177 @@
 The form factor calculated is
 
-.. image:: img/image126.PNG
+.. image:: img/olddocs/image126.PNG
 
 To provide easy access to the orientation of the core-shell ellipsoid, we define the axis of the solid ellipsoid using
@@ -2203 +2203 @@
 ==============  ========  =============
 
-.. image:: img/image127.jpg
+.. image:: img/olddocs/image127.jpg
 
 *Figure. 1D plot using the default values (w/1000 data point).*
 
-.. image:: img/image122.jpg
+.. image:: img/olddocs/image122.jpg
 
 *Figure. The angles for oriented CoreShellEllipsoid.*
@@ -2234 +2234 @@
 *2.1.27.1. Definition*
 
-.. image:: img/image125.gif
+.. image:: img/olddocs/image125.gif
 
 The geometric parameters of this model are
@@ -2301 +2301 @@
 where the volume *V* = (4/3)\ |pi| (*Ra* *Rb* *Rc*), and the averaging < > is applied over all orientations for 1D.
 
-.. image:: img/image128.jpg
+.. image:: img/olddocs/image128.jpg
 
 The returned value is in units of |cm^-1|, on absolute scale.
@@ -2309 +2309 @@
 The form factor calculated is
 
-.. image:: img/image129.PNG
+.. image:: img/olddocs/image129.PNG
 
 To provide easy access to the orientation of the triaxial ellipsoid, we define the axis of the cylinder using the
@@ -2337 +2337 @@
 ==============  ========  =============
 
-.. image:: img/image130.jpg
+.. image:: img/olddocs/image130.jpg
 
 *Figure. 1D plot using the default values (w/1000 data point).*
@@ -2348 +2348 @@
 angles of |theta|, |phi|, and |psi| respectively).
 
-.. image:: img/image131.gif
+.. image:: img/olddocs/image131.gif
 
 *Figure. Comparison between 1D and averaged 2D.*
 
-.. image:: img/image132.jpg
+.. image:: img/olddocs/image132.jpg
 
 *Figure. The angles for oriented ellipsoid.*
@@ -2377 +2377 @@
 The scattering intensity *I(q)* is
 
-.. image:: img/image133.PNG
+.. image:: img/olddocs/image133.PNG
 
 The form factor is
 
-.. image:: img/image134.PNG
+.. image:: img/olddocs/image134.PNG
 
 where |delta| = bilayer thickness.
@@ -2387 +2387 @@
 The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 The returned value is in units of |cm^-1|, on absolute scale. In the parameters, *sld_bi* = SLD of the bilayer,
@@ -2402 +2402 @@
 ==============  ========  =============
 
-.. image:: img/image135.jpg
+.. image:: img/olddocs/image135.jpg
 
 *Figure. 1D plot using the default values (w/1000 data point).*
@@ -2428 +2428 @@
 The scattering intensity *I(q)* is
 
-.. image:: img/image136.PNG
+.. image:: img/olddocs/image136.PNG
 
 The form factor is
 
-.. image:: img/image137.jpg
+.. image:: img/olddocs/image137.jpg
 
 where |delta|\ T = tail length (or *t_length*), |delta|\ H = head thickness (or *h_thickness*),
@@ -2439 +2439 @@
 The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 The returned value is in units of |cm^-1|, on absolute scale. In the parameters, *sld_tail* = SLD of the tail group,
@@ -2456 +2456 @@
 ==============  ========  =============
 
-.. image:: img/image138.jpg
+.. image:: img/olddocs/image138.jpg
 
 *Figure. 1D plot using the default values (w/1000 data point).*
@@ -2484 +2484 @@
 The scattering intensity *I(q)* is
 
-.. image:: img/image139.PNG
+.. image:: img/olddocs/image139.PNG
 
 The form factor is
 
-.. image:: img/image134.PNG
+.. image:: img/olddocs/image134.PNG
 
 and the structure factor is
 
-.. image:: img/image140.PNG
+.. image:: img/olddocs/image140.PNG
 
 where
 
-.. image:: img/image141.PNG
+.. image:: img/olddocs/image141.PNG
 
 Here *d* = (repeat) spacing, |delta| = bilayer thickness, the contrast |drho| = SLD(headgroup) - SLD(solvent),
@@ -2507 +2507 @@
 The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 The returned value is in units of |cm^-1|, on absolute scale.
@@ -2523 +2523 @@
 ==============  ========  =============
 
-.. image:: img/image142.jpg
+.. image:: img/olddocs/image142.jpg
 
 *Figure. 1D plot using the default values (w/6000 data point).*
@@ -2550 +2550 @@
 The scattering intensity *I(q)* is
 
-.. image:: img/image139.PNG
+.. image:: img/olddocs/image139.PNG
 
 The form factor is
 
-.. image:: img/image143.PNG
+.. image:: img/olddocs/image143.PNG
 
 The structure factor is
 
-.. image:: img/image140.PNG
+.. image:: img/olddocs/image140.PNG
 
 where
 
-.. image:: img/image141.PNG
+.. image:: img/olddocs/image141.PNG
 
 where |delta|\ T = tail length (or *t_length*), |delta|\ H = head thickness (or *h_thickness*),
@@ -2575 +2575 @@
 The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 The returned value is in units of |cm^-1|, on absolute scale. In the parameters, *sld_tail* = SLD of the tail group,
@@ -2595 +2595 @@
 ==============  ========  =============
 
-.. image:: img/image144.jpg
+.. image:: img/olddocs/image144.jpg
 
 *Figure. 1D plot using the default values (w/6000 data point).*
@@ -2622 +2622 @@
 The scattering intensity *I(q)* is calculated as
 
-.. image:: img/image145.jpg
+.. image:: img/olddocs/image145.jpg
 
 The form factor of the bilayer is approximated as the cross section of an infinite, planar bilayer of thickness *t*
 
-.. image:: img/image146.jpg
+.. image:: img/olddocs/image146.jpg
 
 Here, the scale factor is used instead of the mass per area of the bilayer (*G*). The scale factor is the volume
@@ -2635 +2635 @@
 Non-integer numbers of stacks are calculated as a linear combination of the lower and higher values
 
-.. image:: img/image147.jpg
+.. image:: img/olddocs/image147.jpg
 
 The 2D scattering intensity is the same as 1D, regardless of the orientation of the *q* vector which is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 The parameters of the model are *Nlayers* = no. of layers, and *pd_spacing* = polydispersity of spacing.
@@ -2656 +2656 @@
 ==============  ========  =============
 
-.. image:: img/image148.jpg
+.. image:: img/olddocs/image148.jpg
 
 *Figure. 1D plot using the default values above (w/20000 data point).*
@@ -2683 +2683 @@
 The scattering intensity *I(q)* is calculated as
 
-.. image:: img/image149.jpg
+.. image:: img/olddocs/image149.jpg
 
 where *scale* is the volume fraction of spheres, *Vp* is the volume of the primary particle, *V(lattice)* is a volume
@@ -2695 +2695 @@
 and nearest neighbor separation *D* is
 
-.. image:: img/image150.jpg
+.. image:: img/olddocs/image150.jpg
 
 The distortion factor (one standard deviation) of the paracrystal is included in the calculation of *Z(q)*
 
-.. image:: img/image151.jpg
+.. image:: img/olddocs/image151.jpg
 
 where *g* is a fractional distortion based on the nearest neighbor distance.
@@ -2705 +2705 @@
 The simple cubic lattice is
 
-.. image:: img/image152.jpg
+.. image:: img/olddocs/image152.jpg
 
 For a crystal, diffraction peaks appear at reduced *q*\ -values given by
 
-.. image:: img/image153.jpg
+.. image:: img/olddocs/image153.jpg
 
 where for a simple cubic lattice any *h*\ , *k*\ , *l* are allowed and none are forbidden. Thus the peak positions
 correspond to (just the first 5)
 
-.. image:: img/image154.jpg
+.. image:: img/olddocs/image154.jpg
 
 **NB: The calculation of** *Z(q)* **is a double numerical integral that must be carried out with a high density of**
@@ -2736 +2736 @@
 default values.
 
-.. image:: img/image155.jpg
+.. image:: img/olddocs/image155.jpg
 
 *Figure. 1D plot in the linear scale using the default values (w/200 data point).*
@@ -2744 +2744 @@
 computation.
 
-.. image:: img/image156.jpg
-
-.. image:: img/image157.jpg
+.. image:: img/olddocs/image156.jpg
+
+.. image:: img/olddocs/image157.jpg
 
 *Figure. 2D plot using the default values (w/200X200 pixels).*
@@ -2774 +2774 @@
 The scattering intensity *I(q)* is calculated as
 
-.. image:: img/image158.jpg
+.. image:: img/olddocs/image158.jpg
 
 where *scale* is the volume fraction of spheres, *Vp* is the volume of the primary particle, *V(lattice)* is a volume
@@ -2786 +2786 @@
 *R* and nearest neighbor separation *D* is
 
-.. image:: img/image159.jpg
+.. image:: img/olddocs/image159.jpg
 
 The distortion factor (one standard deviation) of the paracrystal is included in the calculation of *Z(q)*
 
-.. image:: img/image160.jpg
+.. image:: img/olddocs/image160.jpg
 
 where *g* is a fractional distortion based on the nearest neighbor distance.
@@ -2796 +2796 @@
 The face-centered cubic lattice is
 
-.. image:: img/image161.jpg
+.. image:: img/olddocs/image161.jpg
 
 For a crystal, diffraction peaks appear at reduced q-values given by
 
-.. image:: img/image162.jpg
+.. image:: img/olddocs/image162.jpg
 
 where for a face-centered cubic lattice *h*\ , *k*\ , *l* all odd or all even are allowed and reflections where
 *h*\ , *k*\ , *l* are mixed odd/even are forbidden. Thus the peak positions correspond to (just the first 5)
 
-.. image:: img/image163.jpg
+.. image:: img/olddocs/image163.jpg
 
 **NB: The calculation of** *Z(q)* **is a double numerical integral that must be carried out with a high density of**
@@ -2827 +2827 @@
 default values.
 
-.. image:: img/image164.jpg
+.. image:: img/olddocs/image164.jpg
 
 *Figure. 1D plot in the linear scale using the default values (w/200 data point).*
@@ -2835 +2835 @@
 computation.
 
-.. image:: img/image165.gif
-
-.. image:: img/image166.jpg
+.. image:: img/olddocs/image165.gif
+
+.. image:: img/olddocs/image166.jpg
 
 *Figure. 2D plot using the default values (w/200X200 pixels).*
@@ -2865 +2865 @@
 The scattering intensity *I(q)* is calculated as
 
-.. image:: img/image167.jpg
+.. image:: img/olddocs/image167.jpg
 
 where *scale* is the volume fraction of spheres, *Vp* is the volume of the primary particle, *V(lattice)* is a volume
@@ -2877 +2877 @@
 *R* and nearest neighbor separation *D* is
 
-.. image:: img/image159.jpg
+.. image:: img/olddocs/image159.jpg
 
 The distortion factor (one standard deviation) of the paracrystal is included in the calculation of *Z(q)*
 
-.. image:: img/image160.jpg
+.. image:: img/olddocs/image160.jpg
 
 where *g* is a fractional distortion based on the nearest neighbor distance.
@@ -2887 +2887 @@
 The body-centered cubic lattice is
 
-.. image:: img/image168.jpg
+.. image:: img/olddocs/image168.jpg
 
 For a crystal, diffraction peaks appear at reduced q-values given by
 
-.. image:: img/image162.jpg
+.. image:: img/olddocs/image162.jpg
 
 where for a body-centered cubic lattice, only reflections where (\ *h* + *k* + *l*\ ) = even are allowed and
 reflections where (\ *h* + *k* + *l*\ ) = odd are forbidden. Thus the peak positions correspond to (just the first 5)
 
-.. image:: img/image169.jpg
+.. image:: img/olddocs/image169.jpg
 
 **NB: The calculation of** *Z(q)* **is a double numerical integral that must be carried out with a high density of**
@@ -2918 +2918 @@
 default values.
 
-.. image:: img/image170.jpg
+.. image:: img/olddocs/image170.jpg
 
 *Figure. 1D plot in the linear scale using the default values (w/200 data point).*
@@ -2926 +2926 @@
 computation.
 
-.. image:: img/image165.gif
-
-.. image:: img/image171.jpg
+.. image:: img/olddocs/image165.gif
+
+.. image:: img/olddocs/image171.jpg
 
 *Figure. 2D plot using the default values (w/200X200 pixels).*
@@ -2955 +2955 @@
 For information about polarised and magnetic scattering, click here_.
 
-.. image:: img/image087.jpg
+.. image:: img/olddocs/image087.jpg
 
 *2.1.37.1. Definition*
@@ -2962 +2962 @@
 *b* = *B* / *B* = 1, and *c* = *C* / *B* > 1, the form factor is
 
-.. image:: img/image088.PNG
+.. image:: img/olddocs/image088.PNG
 
 and the contrast is defined as
 
-.. image:: img/image089.PNG
+.. image:: img/olddocs/image089.PNG
 
 The scattering intensity per unit volume is returned in units of |cm^-1|; ie, *I(q)* = |phi| *P(q)*\ .
@@ -2979 +2979 @@
 parallel to the *x*-axis of the detector.
 
-.. image:: img/image090.jpg
+.. image:: img/olddocs/image090.jpg
 
 *Figure. Definition of angles for 2D*.
 
-.. image:: img/image091.jpg
+.. image:: img/olddocs/image091.jpg
 
 *Figure. Examples of the angles for oriented pp against the detector plane.*
@@ -2998 +2998 @@
 ==============  ========  =============
 
-.. image:: img/image092.jpg
+.. image:: img/olddocs/image092.jpg
 
 *Figure. 1D plot using the default values (w/1000 data point).*
@@ -3009 +3009 @@
 angles of |theta|, |phi|, and |psi| respectively).
 
-.. image:: img/image093.gif
+.. image:: img/olddocs/image093.gif
 
 *Figure. Comparison between 1D and averaged 2D.*
@@ -3043 +3043 @@
 dimensions *A*, *B*, *C* such that *A* < *B* < *C*.
 
-.. image:: img/image087.jpg
+.. image:: img/olddocs/image087.jpg
 
 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
 
-.. image:: img/image094.jpg
+.. image:: img/olddocs/image094.jpg
 
 The volume of the solid is
 
-.. image:: img/image095.PNG
+.. image:: img/olddocs/image095.PNG
 
 **meaning that there are "gaps" at the corners of the solid.**
@@ -3084 +3084 @@
 parallel to the *x*-axis of the detector.
 
-.. image:: img/image090.jpg
+.. image:: img/olddocs/image090.jpg
 
 *Figure. Definition of angles for 2D*.
 
-.. image:: img/image091.jpg
+.. image:: img/olddocs/image091.jpg
 
 *Figure. Examples of the angles for oriented cspp against the detector plane.*
@@ -3113 +3113 @@
 ==============  ========  =============
 
-.. image:: img/image096.jpg
+.. image:: img/olddocs/image096.jpg
 
 *Figure. 1D plot using the default values (w/256 data points).*
 
-.. image:: img/image097.jpg
+.. image:: img/olddocs/image097.jpg
 
 *Figure. 2D plot using the default values (w/(256X265) data points).*
@@ -3398 +3398 @@
 calculation. **NB: No size polydispersity is included in this model, use the** Poly_GaussCoil_ **Model instead**
 
-.. image:: img/image172.PNG
+.. image:: img/olddocs/image172.PNG
 
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -3412 +3412 @@
 ==============  ========  =============
 
-.. image:: img/image173.jpg
+.. image:: img/olddocs/image173.jpg
 
 *Figure. 1D plot using the default values (w/200 data point).*
@@ -3439 +3439 @@
 The scattering intensity *I(q)* is calculated as
 
-.. image:: img/image174.jpg
+.. image:: img/olddocs/image174.jpg
 
 Here the peak position is related to the d-spacing as *Q0* = 2|pi| / *d0*.
@@ -3445 +3445 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==================  ========  =============
@@ -3459 +3459 @@
 ==================  ========  =============
 
-.. image:: img/image175.jpg
+.. image:: img/olddocs/image175.jpg
 
 *Figure. 1D plot using the default values (w/200 data point).*
@@ -3483 +3483 @@
 The scattering intensity *I(q)* is calculated as
 
-.. image:: img/image176.jpg
+.. image:: img/olddocs/image176.jpg
 
 The first term describes Porod scattering from clusters (exponent = n) and the second term is a Lorentzian function
@@ -3494 +3494 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ====================  ========  =============
@@ -3507 +3507 @@
 ====================  ========  =============
 
-.. image:: img/image177.jpg
+.. image:: img/olddocs/image177.jpg
 
 *Figure. 1D plot using the default values (w/500 data points).*
@@ -3528 +3528 @@
 The Ornstein-Zernicke model is defined by
 
-.. image:: img/image178.PNG
+.. image:: img/olddocs/image178.PNG
 
 The parameter *L* is the screening length.
@@ -3534 +3534 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -3544 +3544 @@
 ==============  ========  =============
 
-.. image:: img/image179.jpg
+.. image:: img/olddocs/image179.jpg
 
 *Â Figure. 1D plot using the default values (w/200 data point).*
@@ -3567 +3567 @@
 *2.2.5.1. Definition*
 
-.. image:: img/image180_corrected.PNG
+.. image:: img/olddocs/image180_corrected.PNG
 
 The parameter *L* is the correlation length.
@@ -3573 +3573 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -3583 +3583 @@
 ==============  ========  =============
 
-.. image:: img/image181.jpg
+.. image:: img/olddocs/image181.jpg
 
 *Â Figure. 1D plot using the default values (w/200 data point).*
@@ -3604 +3604 @@
 This model describes a simple power law with background.
 
-.. image:: img/image182.PNG
+.. image:: img/olddocs/image182.PNG
 
 Note the minus sign in front of the exponent. The parameter *m* should therefore be entered as a **positive** number.
@@ -3616 +3616 @@
 ==============  ========  =============
 
-.. image:: img/image183.jpg
+.. image:: img/olddocs/image183.jpg
 
 *Figure. 1D plot using the default values (w/200 data point).*
@@ -3635 +3635 @@
 *2.2.7.1. Definition*
 
-.. image:: img/image184.PNG
+.. image:: img/olddocs/image184.PNG
 
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -3650 +3650 @@
 ==============  ========  =============
 
-.. image:: img/image185.jpg
+.. image:: img/olddocs/image185.jpg
 
 *Figure. 1D plot using the default values (w/200 data point).*
@@ -3673 +3673 @@
 *2.2.8.1. Definition*
 
-.. image:: img/image186.PNG
+.. image:: img/olddocs/image186.PNG
 
 The *scale* parameter is the volume fraction of the building blocks, *R0* is the radius of the building block, *Df* is
@@ -3683 +3683 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -3697 +3697 @@
 ==============  ========  =============
 
-.. image:: img/image187.jpg
+.. image:: img/olddocs/image187.jpg
 
 *Figure. 1D plot using the default values (w/200 data point).*
@@ -3715 +3715 @@
 *2.2.9.1. Definition*
 
-.. image:: img/mass_fractal_eq1.jpg
+.. image:: img/olddocs/mass_fractal_eq1.jpg
 
 where *R* is the radius of the building block, *Dm* is the **mass** fractal dimension, |zeta| is the cut-off length,
@@ -3734 +3734 @@
 ==============  ========  =============
 
-.. image:: img/mass_fractal_fig1.jpg
+.. image:: img/olddocs/mass_fractal_fig1.jpg
 
 *Figure. 1D plot using default values.*
@@ -3755 +3755 @@
 *2.2.10.1. Definition*
 
-.. image:: img/surface_fractal_eq1.gif
+.. image:: img/olddocs/surface_fractal_eq1.gif
 
 where *R* is the radius of the building block, *Ds* is the **surface** fractal dimension, |zeta| is the cut-off length,
@@ -3774 +3774 @@
 ==============  ========  =============
 
-.. image:: img/surface_fractal_fig1.jpg
+.. image:: img/olddocs/surface_fractal_fig1.jpg
 
 *Figure. 1D plot using default values.*
@@ -3802 +3802 @@
 The scattered intensity *I(q)* is  calculated using a modified Ornstein-Zernicke equation
 
-.. image:: img/masssurface_fractal_eq1.jpg
+.. image:: img/olddocs/masssurface_fractal_eq1.jpg
 
 where *Rg* is the size of the cluster, *rg* is the size of the primary particle, *Ds* is the surface fractal dimension,
@@ -3822 +3822 @@
 ==============  ========  =============
 
-.. image:: img/masssurface_fractal_fig1.jpg
+.. image:: img/olddocs/masssurface_fractal_fig1.jpg
 
 *Figure. 1D plot using default values.*
@@ -3848 +3848 @@
 *2.2.12.1. Definition*
 
-.. image:: img/fractcore_eq1.gif
+.. image:: img/olddocs/fractcore_eq1.gif
 
 The form factor *P(q)* is that from CoreShellModel_ with *bkg* = 0
 
-.. image:: img/image013.PNG
+.. image:: img/olddocs/image013.PNG
 
 while the fractal structure factor S(q) is
 
-.. image:: img/fractcore_eq3.gif
+.. image:: img/olddocs/fractcore_eq3.gif
 
 where *Df* = frac_dim, |xi| = cor_length, *rc* = (core) radius, and *scale* = volume fraction.
@@ -3864 +3864 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -3880 +3880 @@
 ==============  ========  =============
 
-.. image:: img/image188.jpg
+.. image:: img/olddocs/image188.jpg
 
 *Figure. 1D plot using the default values (w/500 data points).*
@@ -3905 +3905 @@
 The scattering intensity *I(q)* is calculated as (eqn 5 from the reference)
 
-.. image:: img/image189.jpg
+.. image:: img/olddocs/image189.jpg
 
 |bigzeta| is the length scale of the static correlations in the gel, which can be attributed to the "frozen-in"
@@ -3917 +3917 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ===================================  ========  =============
@@ -3929 +3929 @@
 ===================================  ========  =============
 
-.. image:: img/image190.jpg
+.. image:: img/olddocs/image190.jpg
 
 *Figure. 1D plot using the default values (w/500 data points).*
@@ -3949 +3949 @@
 *2.2.14.1. Definition*
 
-.. image:: img/image191.PNG
+.. image:: img/olddocs/image191.PNG
 
 where *K* is the contrast factor for the polymer, *Lb* is the Bjerrum length, *h* is the virial parameter, *b* is the
@@ -3957 +3957 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -3992 +3992 @@
 This model fits the Guinier function
 
-.. image:: img/image192.PNG
+.. image:: img/olddocs/image192.PNG
 
 to the data directly without any need for linearisation (*cf*. Ln *I(q)* vs *q*\ :sup:`2`).
@@ -3998 +3998 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -4027 +4027 @@
 The following functional form is used
 
-.. image:: img/image193.jpg
+.. image:: img/olddocs/image193.jpg
 
 This is based on the generalized Guinier law for such elongated objects (see the Glatter reference below). For 3D
@@ -4036 +4036 @@
 Enforcing the continuity of the Guinier and Porod functions and their derivatives yields
 
-.. image:: img/image194.jpg
+.. image:: img/olddocs/image194.jpg
 
 and
 
-.. image:: img/image195.jpg
+.. image:: img/olddocs/image195.jpg
 
 Note that
@@ -4052 +4052 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image008.PNG
+.. image:: img/olddocs/image008.PNG
 
 ==============================  ========  =============
@@ -4064 +4064 @@
 ==============================  ========  =============
 
-.. image:: img/image196.jpg
+.. image:: img/olddocs/image196.jpg
 
 *Figure. 1D plot using the default values (w/500 data points).*
@@ -4083 +4083 @@
 This model fits the Porod function
 
-.. image:: img/image197_corrected.PNG
+.. image:: img/olddocs/image197_corrected.PNG
 
 to the data directly without any need for linearisation (*cf*. Log *I(q)* vs Log *q*).
@@ -4092 +4092 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -4113 +4113 @@
 This model describes a Gaussian shaped peak on a flat background
 
-.. image:: img/image198.PNG
+.. image:: img/olddocs/image198.PNG
 
 with the peak having height of *I0* centered at *q0* and having a standard deviation of *B*.  The FWHM (full-width
@@ -4120 +4120 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -4131 +4131 @@
 ==============  ========  =============
 
-.. image:: img/image199.jpg
+.. image:: img/olddocs/image199.jpg
 
 *Figure. 1D plot using the default values (w/500 data points).*
@@ -4147 +4147 @@
 This model describes a Lorentzian shaped peak on a flat background
 
-.. image:: img/image200.PNG
+.. image:: img/olddocs/image200.PNG
 
 with the peak having height of *I0* centered at *q0* and having a HWHM (half-width half-maximum) of B. 
@@ -4153 +4153 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -4164 +4164 @@
 ==============  ========  =============
 
-.. image:: img/image201.jpg
+.. image:: img/olddocs/image201.jpg
 
 *Figure. 1D plot using the default values (w/500 data points).*
@@ -4188 +4188 @@
 The scattering intensity *I(q)* is calculated as
 
-.. image:: img/image202.PNG
+.. image:: img/olddocs/image202.PNG
 
 where the dimensionless chain dimension is
 
-.. image:: img/image203.PNG
+.. image:: img/olddocs/image203.PNG
 
 and the polydispersity is
 
-.. image:: img/image204.PNG
+.. image:: img/olddocs/image204.PNG
 
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 This example dataset is produced using 200 data points, using 200 data points,
@@ -4214 +4214 @@
 ==============  ========  =============
 
-.. image:: img/image205.jpg
+.. image:: img/olddocs/image205.jpg
 
 *Figure. 1D plot using the default values (w/200 data point).*
@@ -4240 +4240 @@
 The form factor  was originally presented in the following integral form (Benoit, 1957)
 
-.. image:: img/image206.jpg
+.. image:: img/olddocs/image206.jpg
 
 where |nu| is the excluded volume parameter (which is related to the Porod exponent *m* as |nu| = 1 / *m*), *a* is the
@@ -4246 +4246 @@
 into an almost analytical form as follows (Hammouda, 1993)
 
-.. image:: img/image207.jpg
+.. image:: img/olddocs/image207.jpg
 
 where |gamma|\ *(x,U)* is the incomplete gamma function
 
-.. image:: img/image208.jpg
+.. image:: img/olddocs/image208.jpg
 
 and the variable *U* is given in terms of the scattering vector *Q* as
 
-.. image:: img/image209.jpg
+.. image:: img/olddocs/image209.jpg
 
 The square of the radius-of-gyration is defined as
 
-.. image:: img/image210.jpg
+.. image:: img/olddocs/image210.jpg
 
 Note that this model applies only in the mass fractal range (ie, 5/3 <= *m* <= 3) and **does not** apply to surface
@@ -4266 +4266 @@
 A low-*Q* expansion yields the Guinier form and a high-*Q* expansion yields the Porod form which is given by
 
-.. image:: img/image211.jpg
+.. image:: img/olddocs/image211.jpg
 
 Here |biggamma|\ *(x)* = |gamma|\ *(x,inf)* is the gamma function.
@@ -4272 +4272 @@
 The asymptotic limit is dominated by the first term
 
-.. image:: img/image212.jpg
+.. image:: img/olddocs/image212.jpg
 
 The special case when |nu| = 0.5 (or *m* = 1/|nu| = 2) corresponds to Gaussian chains for which the form factor is given
 by the familiar Debye_ function.
 
-.. image:: img/image213.jpg
+.. image:: img/olddocs/image213.jpg
 
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 This example dataset is produced using 200 data points, *qmin* = 0.001 |Ang^-1|, *qmax* = 0.2 |Ang^-1| and the default
@@ -4295 +4295 @@
 ===================  ========  =============
 
-.. image:: img/image214.jpg
+.. image:: img/olddocs/image214.jpg
 
 *Figure. 1D plot using the default values (w/500 data points).*
@@ -4379 +4379 @@
 =======================  ========  =============
 
-.. image:: img/image215.jpg
+.. image:: img/olddocs/image215.jpg
 
 *Figure. 1D plot using the default values (w/500 data points).*
@@ -4401 +4401 @@
 The scattering intensity *I(q)* is calculated as
 
-.. image:: img/image216.jpg 
+.. image:: img/olddocs/image216.jpg 
 
 where *A* = Lorentzian scale factor #1, *C* = Lorentzian scale #2, |xi|\ :sub:`1` and |xi|\ :sub:`2` are the
@@ -4409 +4409 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ===============================  ========  =============
@@ -4423 +4423 @@
 ===============================  ========  =============
 
-.. image:: img/image217.jpg
+.. image:: img/olddocs/image217.jpg
 
 *Figure. 1D plot using the default values (w/500 data points).*
@@ -4445 +4445 @@
 The scattering intensity *I(q)* is calculated as
 
-.. image:: img/image218.jpg
+.. image:: img/olddocs/image218.jpg
 
 where *qc* is the location of the crossover from one slope to the other. The scaling *coef_A* sets the overall
@@ -4455 +4455 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -4467 +4467 @@
 ==============  ========  =============
 
-.. image:: img/image219.jpg
+.. image:: img/olddocs/image219.jpg
 
 *Figure. 1D plot using the default values (w/500 data points).*
@@ -4496 +4496 @@
 The empirical fit function is 
 
-.. image:: img/image220.jpg
+.. image:: img/olddocs/image220.jpg
 
 For each level, the four parameters *Gi*, *Rg,i*, *Bi* and *Pi* must be chosen. 
@@ -4507 +4507 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -4524 +4524 @@
 ==============  ========  =============
 
-.. image:: img/image221.jpg
+.. image:: img/olddocs/image221.jpg
 
 *Figure. 1D plot using the default values (w/500 data points).*
@@ -4542 +4542 @@
 This calculates the simple linear function
 
-.. image:: img/image222.PNG
+.. image:: img/olddocs/image222.PNG
 
 **NB: For 2D plots,** *I(q)* = *I(qx)*\ *\ *I(qy)*, **which is a different definition to other shape independent models.**
@@ -4577 +4577 @@
 The scattered intensity *I(q)* is calculated as
 
-.. image:: img/image233.gif
+.. image:: img/olddocs/image233.gif
 
 where
 
-.. image:: img/image234.gif
+.. image:: img/olddocs/image234.gif
 
 Note that the first term reduces to the Ornstein-Zernicke equation when *D* = 2; ie, when the Flory exponent is 0.5
@@ -4597 +4597 @@
 ============================  ========  =============
 
-.. image:: img/image235.gif
+.. image:: img/olddocs/image235.gif
 
 *Figure. 1D plot using the default values (w/300 data points).*
@@ -4619 +4619 @@
 For a star with *f* arms:
 
-.. image:: img/star1.png
+.. image:: img/olddocs/star1.png
 
 where
 
-.. image:: img/star2.png
+.. image:: img/olddocs/star2.png
 
 and
 
-.. image:: img/star3.png
+.. image:: img/olddocs/star3.png
 
 is the square of the ensemble average radius-of-gyration of an arm.
@@ -4656 +4656 @@
 Also see ReflectivityIIModel_.
 
-.. image:: img/image231.bmp
+.. image:: img/olddocs/image231.bmp
 
 *Figure. Comparison (using the SLD profile below) with the NIST web calculation (circles)*
 http://www.ncnr.nist.gov/resources/reflcalc.html
 
-.. image:: img/image232.gif
+.. image:: img/olddocs/image232.gif
 
 *Figure. SLD profile used for the calculation (above).*
@@ -4685 +4685 @@
 1) Erf
 
-.. image:: img/image051.gif
+.. image:: img/olddocs/image051.gif
 
 2) Power-Law
 
-.. image:: img/image050.gif
+.. image:: img/olddocs/image050.gif
 
 3) Exp
 
-.. image:: img/image049.gif
+.. image:: img/olddocs/image049.gif
 
 The constant *A* in the expressions above (but the parameter *nu* in the model!) is an input.
@@ -4717 +4717 @@
 The calculation uses the Percus-Yevick closure where the interparticle potential is
 
-.. image:: img/image223.PNG
+.. image:: img/olddocs/image223.PNG
 
 where *r* is the distance from the center of the sphere of a radius *R*.
@@ -4723 +4723 @@
 For a 2D plot, the wave transfer is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -4732 +4732 @@
 ==============  ========  =============
 
-.. image:: img/image224.jpg
+.. image:: img/olddocs/image224.jpg
 
 *Figure. 1D plot using the default values (in linear scale).*
@@ -4758 +4758 @@
 The interaction potential is:
 
-.. image:: img/image225.PNG
+.. image:: img/olddocs/image225.PNG
 
 where *r* is the distance from the center of the sphere of a radius *R*.
@@ -4764 +4764 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  =========  =============
@@ -4775 +4775 @@
 ==============  =========  =============
 
-.. image:: img/image226.jpg
+.. image:: img/olddocs/image226.jpg
 
 *Figure. 1D plot using the default values (in linear scale).*
@@ -4803 +4803 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -4816 +4816 @@
 ==============  ========  =============
 
-.. image:: img/image227.jpg
+.. image:: img/olddocs/image227.jpg
 
 *Figure. 1D plot using the default values (in linear scale).*
@@ -4842 +4842 @@
 that smaller |tau| means stronger attraction.
 
-.. image:: img/image228.PNG
+.. image:: img/olddocs/image228.PNG
 
 where the interaction potential is
 
-.. image:: img/image229.PNG
+.. image:: img/olddocs/image229.PNG
 
 The Percus-Yevick (PY) closure was used for this calculation, and is an adequate closure for an attractive interparticle
@@ -4862 +4862 @@
 For 2D data: The 2D scattering intensity is calculated in the same way as 1D, where the *q* vector is defined as
 
-.. image:: img/image040.gif
+.. image:: img/olddocs/image040.gif
 
 ==============  ========  =============
@@ -4873 +4873 @@
 ==============  ========  =============
 
-.. image:: img/image230.jpg
+.. image:: img/olddocs/image230.jpg
 
 *Figure. 1D plot using the default values (in linear scale).*