Changeset 737679d in sasmodels for sasmodels

Timestamp:

Apr 8, 2017 5:21:45 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:

3a45c2c, 9b79f29

Parents:

1f65db5 (diff), 3fd0499 (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:

docs edits for bcc_ fc_ sc_paracrystal

Location:

sasmodels/models

Files:

• cylinder.py (modified) (2 diffs)
• parallelepiped.py (modified) (3 diffs)
• sc_paracrystal.py (modified) (1 diff)
• triaxial_ellipsoid.py (modified) (1 diff)
• bcc_paracrystal.py (modified) (1 diff)
• core_shell_parallelepiped.py (modified) (1 diff)
• fcc_paracrystal.py (modified) (1 diff)
• img/bcc_angle_definition.png (deleted)
• img/sc_crystal_angle_definition.jpg (deleted)

sasmodels/models/cylinder.py

@@ -38 +38 @@
 
 
-Numerical integration is simplified by a change of variable to $u = cos(\alpha)$ with 
-$sin(\alpha)=\sqrt{1-u^2}$. 
+Numerical integration is simplified by a change of variable to $u = cos(\alpha)$ with
+$sin(\alpha)=\sqrt{1-u^2}$.
 
 The output of the 1D scattering intensity function for randomly oriented
@@ -156 +156 @@
 tests = [[{}, 0.2, 0.042761386790780453],
         [{}, [0.2], [0.042761386790780453]],
-#  new coords    
+#  new coords
         [{'theta':80.1534480601659, 'phi':10.1510817110481}, (qx, qy), 0.03514647218513852],
         [{'theta':80.1534480601659, 'phi':10.1510817110481}, [(qx, qy)], [0.03514647218513852]],

sasmodels/models/parallelepiped.py

@@ -24 +24 @@
    The edge of the solid used to have to satisfy the condition that $A < B < C$.
    After some improvements to the effective radius calculation, used with an S(Q),
-   it is beleived that this is no longer the case. 
+   it is beleived that this is no longer the case.
 
 The 1D scattering intensity $I(q)$ is calculated as:
@@ -189 +189 @@
             mu = q*B
         V: Volume of the rectangular parallelepiped
-        alpha: angle between the long axis of the 
+        alpha: angle between the long axis of the
             parallelepiped and the q-vector for 1D
 """
@@ -219 +219 @@
     Return effective radius (ER) for P(q)*S(q)
     """
-    # now that axes can be in any size order, need to sort a,b,c where a~b and c is either much smaller 
+    # now that axes can be in any size order, need to sort a,b,c where a~b and c is either much smaller
     # or much larger
     abc = np.vstack((length_a, length_b, length_c))

sasmodels/models/sc_paracrystal.py

@@ -83 +83 @@
 model computation.
 
+<<<<<<< HEAD
 .. figure:: img/parallelepiped_angle_definition.png
 
     Orientation of the crystal with respect to the scattering plane, when 
     $\theta = \phi = 0$ the $c$ axis is along the beam direction (the $z$ axis).
+=======
+.. figure:: img/sc_crystal_angle_definition.jpg
+>>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305
 
 Reference

sasmodels/models/triaxial_ellipsoid.py

@@ -113 +113 @@
 * **Author:** NIST IGOR/DANSE **Date:** pre 2010
 * **Last Modified by:** Paul Kienzle (improved calculation) **Date:** April 4, 2017
+<<<<<<< HEAD
 * **Last Reviewed by:** Paul Kienzle &Richard Heenan **Date:**  April 4, 2017
+=======
+* **Last Reviewed by:** Paul Kienzle & Richard Heenan **Date:**  April 4, 2017
+>>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305
 
 """

sasmodels/models/bcc_paracrystal.py

@@ -79 +79 @@
 be accurate.
 
-.. figure:: img/bcc_angle_definition.png
+.. figure:: img/parallelepiped_angle_definition.png
 
-    Orientation of the crystal with respect to the scattering plane.
+    Orientation of the crystal with respect to the scattering plane, when 
+    $\theta = \phi = 0$ the $c$ axis is along the beam direction (the $z$ axis).
 
 References

sasmodels/models/core_shell_parallelepiped.py

@@ -6 +6 @@
 The thickness and the scattering length density of the shell or 
 "rim" can be different on each (pair) of faces. However at this time
-the model does **NOT** actually calculate a c face rim despite the presence of
-the parameter.
+the 1D calculation does **NOT** actually calculate a c face rim despite the presence of
+the parameter. Some other aspects of the 1D calculation may be wrong.
 
 .. note::

sasmodels/models/fcc_paracrystal.py

@@ -76 +76 @@
 2D model computation.
 
-.. figure:: img/bcc_angle_definition.png
+.. figure:: img/parallelepiped_angle_definition.png
 
-    Orientation of the crystal with respect to the scattering plane.
+    Orientation of the crystal with respect to the scattering plane, when 
+    $\theta = \phi = 0$ the $c$ axis is along the beam direction (the $z$ axis).
 
 References