Changeset 1916c52 in sasmodels

Timestamp:

Apr 7, 2017 3:56:11 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:

e6ab0d3

Parents:

14207bb

Message:

more bugs in oriened assym particles docs

Location:

sasmodels/models

Files:

• core_shell_parallelepiped.py (modified) (5 diffs)
• img/elliptical_cylinder_angle_projection.png (modified) (previous)
• img/parallelepiped_angle_projection.png (modified) (previous)
• parallelepiped.py (modified) (1 diff)

sasmodels/models/core_shell_parallelepiped.py

@@ -10 +10 @@
 
 .. note::
-   This model was originally ported from NIST IGOR macros. However,t is not
-   yet fully understood by the SasView developers and is currently review.
+   This model was originally ported from NIST IGOR macros. However, it is not
+   yet fully understood by the SasView developers and is currently under review.
 
 The form factor is normalized by the particle volume $V$ such that
@@ -33 +33 @@
 $(=t_C)$ faces. The projection in the $AB$ plane is then
 
-.. image:: img/core_shell_parallelepiped_projection.png
+.. image:: img/core_shell_parallelepiped_projection.jpg
 
 The volume of the solid is
@@ -51 +51 @@
 
     F_{a}(Q,\alpha,\beta)=
-    \left[\frac{\tfrac{1}{2}\sin(Q(L_A+2t_A)\sin\alpha \sin\beta)}{\tfrac{1}{2}Q(L_A+2t_A)\sin\alpha\sin\beta}
+    \left[\frac{\sin(\tfrac{1}{2}Q(L_A+2t_A)\sin\alpha \sin\beta)}{\tfrac{1}{2}Q(L_A+2t_A)\sin\alpha\sin\beta}
     - \frac{\sin(\tfrac{1}{2}QL_A\sin\alpha \sin\beta)}{\tfrac{1}{2}QL_A\sin\alpha \sin\beta} \right]
     \left[\frac{\sin(\tfrac{1}{2}QL_B\sin\alpha \sin\beta)}{\tfrac{1}{2}QL_B\sin\alpha \sin\beta} \right]
@@ -58 +58 @@
 .. note::
 
+    Why does t_B not appear in the above equation?
     For the calculation of the form factor to be valid, the sides of the solid
-    MUST be chosen such that** $A < B < C$.
+    MUST (perhaps not any more?) be chosen such that** $A < B < C$.
     If this inequality is not satisfied, the model will not report an error,
     but the calculation will not be correct and thus the result wrong.
@@ -95 +96 @@
     Definition of the angles for oriented core-shell parallelepipeds.
 
-.. figure:: img/parallelepiped_angle_projection.jpg
+.. figure:: img/parallelepiped_angle_projection.png
 
     Examples of the angles for oriented core-shell parallelepipeds against the

sasmodels/models/parallelepiped.py

@@ -14 +14 @@
 
 .. _parallelepiped-image:
+
 
 .. figure:: img/parallelepiped_geometry.jpg