Changeset 43dc17e in sasmodels for sasmodels/models/core_shell_ellipsoid.py

Timestamp:

Mar 16, 2016 3:07:50 PM (8 years ago)

Author:

krzywon

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:

5be92e8

Parents:

092933d (diff), 2f0c07d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master'

File:

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

sasmodels/models/core_shell_ellipsoid.py

@@ -10 +10 @@
 applied over all orientations for 1D.
 
-.. figure:: img/core_shell_ellipsoid_fig1.gif
+.. figure:: img/core_shell_ellipsoid_geometry.gif
 
     The returned value is in units of $cm^{-1}$, on absolute scale.
@@ -36 +36 @@
 To provide easy access to the orientation of the core-shell ellipsoid,
 we define the axis of the solid ellipsoid using two angles $\theta$ and $\phi$.
-These angles are defined on Figure 2 of the CylinderModel.
+These angles are defined as for
+:ref:`cylinder orientation <cylinder-angle-definition>`.
 The contrast is defined as SLD(core) - SLD(shell) and SLD(shell) - SLD(solvent).
 
@@ -48 +49 @@
     and used as the effective radius for *S(Q)* when $P(Q) * S(Q)$ is applied.
 
-.. figure:: img/core_shell_ellipsoid_1d.jpg
-
-    1D plot using the default values (w/200 data point).
-
-.. figure:: img/core_shell_ellipsoid_fig2.jpg
+.. figure:: img/core_shell_ellipsoid_angle_projection.jpg
 
     The angles for oriented core_shell_ellipsoid.