Changeset 2f0c07d in sasmodels for sasmodels/models/elliptical_cylinder.py

Timestamp:

Mar 16, 2016 3:07:15 PM (8 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:

3a45c2c

Parents:

a98958b

Message:

make figure names regular (geometry, angle_definition, angle_projection)

File:

• sasmodels/models/elliptical_cylinder.py (modified) (2 diffs)

sasmodels/models/elliptical_cylinder.py

@@ -43 +43 @@
 
 To provide easy access to the orientation of the elliptical cylinder, we define the axis of the cylinder using two
-angles |theta|, |phi| and |bigpsi|. As for the case of the cylinder, the angles |theta| and |phi| are defined on
-Figure 2 of CylinderModel. The angle |bigpsi| is the rotational angle around its own long_c axis against the *q* plane.
+angles |theta|, |phi| and |bigpsi| (see :ref:`cylinder orientation <cylinder-angle-definition>`).
+The angle |bigpsi| is the rotational angle around its own long_c axis against the *q* plane.
 For example, |bigpsi| = 0 when the *r_minor* axis is parallel to the *x*\ -axis of the detector.
 
 All angle parameters are valid and given only for 2D calculation; ie, an oriented system.
 
-.. figure:: img/elliptical_cylinder_geometry_2d.jpg
+.. figure:: img/elliptical_cylinder_angle_definition.jpg
 
     Definition of angles for 2D
 
-.. figure:: img/core_shell_bicelle_fig2.jpg
+.. figure:: img/cylinder_angle_projection.jpg
 
     Examples of the angles for oriented elliptical cylinders against the detector plane.
@@ -60 +60 @@
 and length values, and used as the effective radius for *S(Q)* when *P(Q)* \* *S(Q)* is applied.
 
-
-.. figure:: img/elliptical_cylinder_comparison_1d.jpg
-
-    1D plot using the default values (w/1000 data point).
 
 Validation