Changeset 9b79f29 in sasmodels for sasmodels/models/sc_paracrystal.py

Timestamp:

Apr 8, 2017 7:48:49 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:

48438f9

Parents:

737679d

Message:

more docs change for new rotation angles

File:

• sasmodels/models/sc_paracrystal.py (modified) (2 diffs)

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
@@ -134 +130 @@
               ["sld",  "1e-6/Ang^2",         3.0, [0.0, inf],  "sld",         "Sphere scattering length density"],
               ["sld_solvent", "1e-6/Ang^2",  6.3, [0.0, inf],  "sld",         "Solvent scattering length density"],
-              ["theta",       "degrees",     0.0, [-inf, inf], "orientation", "Orientation of the a1 axis w/respect incoming beam"],
-              ["phi",         "degrees",     0.0, [-inf, inf], "orientation", "Orientation of the a2 in the plane of the detector"],
-              ["psi",         "degrees",     0.0, [-inf, inf], "orientation", "Orientation of the a3 in the plane of the detector"],
+              ["theta",       "degrees",    0,    [-360, 360], "orientation", "c axis to beam angle"],
+              ["phi",         "degrees",    0,    [-360, 360], "orientation", "rotation about beam"],
+              ["psi",         "degrees",    0,    [-360, 360], "orientation", "rotation about c axis"]
              ]
 # pylint: enable=bad-whitespace, line-too-long