Changes in sasmodels/models/sc_paracrystal.py [69e1afc:3330bb4] in sasmodels

File:

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

sasmodels/models/sc_paracrystal.py

@@ -83 +83 @@
 model computation.
 
-.. 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
 
 Reference
@@ -130 +127 @@
               ["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,    [-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"]
+              ["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"],
              ]
 # pylint: enable=bad-whitespace, line-too-long
@@ -149 +146 @@
 
 tests = [
-    # Accuracy tests based on content in test/utest_extra_models.py, 2d tests added April 10, 2017
+    # Accuracy tests based on content in test/utest_extra_models.py
     [{}, 0.001, 10.3048],
     [{}, 0.215268, 0.00814889],
-    [{}, (0.414467), 0.001313289],
-    [{'theta':10.0,'phi':20,'psi':30.0},(0.045,-0.035),18.0397138402 ],
-    [{'theta':10.0,'phi':20,'psi':30.0},(0.023,0.045),0.0177333171285 ]
+    [{}, (0.414467), 0.001313289]
     ]