Changeset 15a90c1 in sasmodels for sasmodels/models/triaxial_ellipsoid.py

Timestamp:

Apr 6, 2017 11:20:47 AM (7 years ago)

Author:

richardh

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

14207bb

Parents:

4aaf89a

Message:

more changes for new axes, and a bug in cylinder.py docs

File:

• sasmodels/models/triaxial_ellipsoid.py (modified) (3 diffs)

sasmodels/models/triaxial_ellipsoid.py

@@ -65 +65 @@
 To provide easy access to the orientation of the triaxial ellipsoid,
 we define the axis of the cylinder using the angles $\theta$, $\phi$
-and $\psi$. These angles are defined on
-:numref:`triaxial-ellipsoid-angles` .
+and $\psi$. These angles are defined analogously to the elliptical_cylinder below
+
+.. figure:: img/elliptical_cylinder_angle_definition.png
+
+    Definition of angles for oriented triaxial ellipsoid, where radii shown here are $a < b << c$
+    and angle $\Psi$ is a rotation around the axis of the particle.
+
 The angle $\psi$ is the rotational angle around its own $c$ axis
 against the $q$ plane. For example, $\psi = 0$ when the
@@ -73 +78 @@
 .. _triaxial-ellipsoid-angles:
 
-.. figure:: img/triaxial_ellipsoid_angle_projection.jpg
+.. figure:: img/triaxial_ellipsoid_angle_projection.png
 
-    The angles for oriented ellipsoid.
+    Some example angles for oriented ellipsoid.
 
 The radius-of-gyration for this system is  $R_g^2 = (R_a R_b R_c)^2/5$.
@@ -81 +86 @@
 The contrast $\Delta\rho$ is defined as SLD(ellipsoid) - SLD(solvent).  In the
 parameters, $R_a$ is the minor equatorial radius, $R_b$ is the major
-equatorial radius, and $R_c$ is the polar radius of the ellipsoid.
+equatorial radius, and $R_c$ is the polar radius of the ellipsoid. 
 
 NB: The 2nd virial coefficient of the triaxial solid ellipsoid is