Changeset 529b8b4 in sasmodels

Timestamp:

Feb 27, 2015 5:49:48 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

a5d0d00

Parents:

0e20995

Message:

use latex to render hard sphere equations

Location:

sasmodels/models

Files:

• hardsphere.py (modified) (4 diffs)
• img/hardSphere_1d.jpg (moved) (moved from sasmodels/models/img/hardSphere_224.jpg)
• img/hardSphere_223.PNG (deleted)

sasmodels/models/hardsphere.py

@@ -1 +1 @@
 # Note: model title and parameter table are inserted automatically
-r"""This calculates the interparticle structure factor for monodisperse spherical particles interacting through hard
-sphere (excluded volume) interactions.
+r"""Calculate the interparticle structure factor for monodisperse
+spherical particles interacting through hard sphere (excluded volume)
+interactions.
 
-The calculation uses the Percus-Yevick closure where the interparticle potential is
+The calculation uses the Percus-Yevick closure where the interparticle
+potential is
 
-.. image:: img/HardSphere_223.PNG
+.. math:
+
+    U(r) = \begin{cases}
+    \infty & r < 2R \\
+    0 & r \geq 2R
+    \end{cases}
 
 where *r* is the distance from the center of the sphere of a radius *R*.
@@ -13 +20 @@
 .. math::
 
-    Q = \sqrt{Q_x^2 + Q_y^2}
+    q = \sqrt{q_x^2 + q_y^2}
 
 
-==============  ========  =============
-Parameter name  Units     Default value
-==============  ========  =============
-effect_radius   |Ang|     50.0
-volfraction     None      0.2
-==============  ========  =============
-
-.. image:: img/HardSphere_224.jpg
+.. image:: img/HardSphere_1d.jpg
 
 *Figure. 1D plot using the default values (in linear scale).*
@@ -39 +39 @@
         [Hard sphere structure factor, with Percus-Yevick closure]
         Interparticle S(Q) for random, non-interacting spheres.
-                May be a reasonable approximation for other shapes of
-                particles that freely rotate, and for moderately polydisperse
+        May be a reasonable approximation for other shapes of
+        particles that freely rotate, and for moderately polydisperse
         systems. Though strictly the maths needs to be modified - 
-                which sasview does not do yet.
-                effect_radius is the hard sphere radius
-                volfraction is the volume fraction occupied by the spheres.
+        which sasview does not do yet.
+        effect_radius is the hard sphere radius
+        volfraction is the volume fraction occupied by the spheres.
 """
 
@@ -96 +96 @@
 Iqxy = """
     // never called since no orientation or magnetic parameters.
-    return -1.0;
+    return Iq(sqrt(qx*qx+qy*qy), IQ_PARAMETERS);
     """