Changeset 15a90c1 in sasmodels for sasmodels/models/core_shell_parallelepiped.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/core_shell_parallelepiped.py (modified) (3 diffs)

sasmodels/models/core_shell_parallelepiped.py

@@ -33 +33 @@
 $(=t_C)$ faces. The projection in the $AB$ plane is then
 
-.. image:: img/core_shell_parallelepiped_projection.jpg
+.. image:: img/core_shell_parallelepiped_projection.png
 
 The volume of the solid is
@@ -80 +80 @@
 NB: The 2nd virial coefficient of the core_shell_parallelepiped is calculated
 based on the the averaged effective radius $(=\sqrt{(A+2t_A)(B+2t_B)/\pi})$
-and length $(C+2t_C)$ values, and used as the effective radius
-for $S(Q)$ when $P(Q) * S(Q)$ is applied.
+and length $(C+2t_C)$ values, after appropriately
+sorting the three dimensions to give an oblate or prolate particle, to give an 
+effective radius, for $S(Q)$ when $P(Q) * S(Q)$ is applied.
 
 To provide easy access to the orientation of the parallelepiped, we define the
@@ -90 +91 @@
 *x*-axis of the detector.
 
-.. figure:: img/parallelepiped_angle_definition.jpg
+.. figure:: img/parallelepiped_angle_definition.png
 
     Definition of the angles for oriented core-shell parallelepipeds.