Changes in sasmodels/models/bcc_paracrystal.py [69e1afc:925ad6e] in sasmodels

File:

• sasmodels/models/bcc_paracrystal.py (modified) (4 diffs)

sasmodels/models/bcc_paracrystal.py

@@ -79 +79 @@
 be accurate.
 
-.. figure:: img/parallelepiped_angle_definition.png
+.. figure:: img/bcc_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).
+    Orientation of the crystal with respect to the scattering plane.
 
 References
@@ -100 +99 @@
 """
 
-from numpy import inf, pi
+from numpy import inf
 
 name = "bcc_paracrystal"
@@ -123 +122 @@
               ["sld",         "1e-6/Ang^2",  4,    [-inf, inf], "sld",         "Particle scattering length density"],
               ["sld_solvent", "1e-6/Ang^2",  1,    [-inf, inf], "sld",         "Solvent scattering length density"],
-              ["theta",       "degrees",    60,    [-360, 360], "orientation", "c axis to beam angle"],
-              ["phi",         "degrees",    60,    [-360, 360], "orientation", "rotation about beam"],
-              ["psi",         "degrees",    60,    [-360, 360], "orientation", "rotation about c axis"]
+              ["theta",       "degrees",    60,    [-inf, inf], "orientation", "In plane angle"],
+              ["phi",         "degrees",    60,    [-inf, inf], "orientation", "Out of plane angle"],
+              ["psi",         "degrees",    60,    [-inf, inf], "orientation", "Out of plane angle"]
              ]
 # pylint: enable=bad-whitespace, line-too-long
@@ -142 +141 @@
     psi_pd=15, psi_pd_n=0,
     )
-# april 6 2017, rkh add unit tests, NOT compared with any other calc method, assume correct!
-# add 2d test later
-q =4.*pi/220.
-tests = [
-    [{ },
-     [0.001, q, 0.215268], [1.46601394721, 2.85851284174, 0.00866710287078]],
-    [{'theta':20.0,'phi':30,'psi':40.0},(-0.017,0.035),2082.20264399 ],
-    [{'theta':20.0,'phi':30,'psi':40.0},(-0.081,0.011),0.436323144781 ]
-    ]