Changeset 43dc17e in sasmodels for sasmodels/models/capped_cylinder.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/capped_cylinder.py (modified) (1 diff)

sasmodels/models/capped_cylinder.py

@@ -69 +69 @@
     It is up to you to restrict this during analysis.
 
-:num:`Figure #capped-cylinder-1d` shows the output produced by
-a running the 1D capped cylinder model, using *qmin* = 0.001 |Ang^-1|,
-*qmax* = 0.7 |Ang^-1| and  the default values of the parameters.
+The 2D scattering intensity is calculated similar to the 2D cylinder model.
 
-.. _capped-cylinder-1d:
-
-.. figure:: img/capped_cylinder_1d.jpg
-
-    1D plot using the default values (w/256 data point).
-
-The 2D scattering intensity is calculated similar to the 2D cylinder model.
-:num:`Figure #capped-cylinder-2d` shows the output for $\theta=45^\circ$
-and $\phi=0^\circ$ with default values for the other parameters.
-
-.. _capped-cylinder-2d:
-
-.. figure:: img/capped_cylinder_2d.jpg
-
-    2D plot (w/(256X265) data points).
-
-.. figure:: img/orientation.jpg
+.. figure:: img/cylinder_angle_definition.jpg
 
     Definition of the angles for oriented 2D cylinders.
 
-.. figure:: img/orientation2.jpg
+.. figure:: img/cylinder_angle_projection.jpg
 
-    Examples of the angles for oriented pp against the detector plane.
+    Examples of the angles for oriented 2D cylinders against the detector plane.
 
 References