Changes in sasmodels/models/barbell.py [9802ab3:fcb33e4] in sasmodels

File:

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

sasmodels/models/barbell.py

@@ -68 +68 @@
 The 2D scattering intensity is calculated similar to the 2D cylinder model.
 
-.. figure:: img/cylinder_angle_definition.png
+.. figure:: img/cylinder_angle_definition.jpg
 
     Definition of the angles for oriented 2D barbells.
@@ -87 +87 @@
 * **Last Reviewed by:** Richard Heenan **Date:** January 4, 2017
 """
-from numpy import inf, sin, cos, pi
+from numpy import inf
 
 name = "barbell"
@@ -108 +108 @@
               ["radius",      "Ang",         20, [0, inf],    "volume",      "Cylindrical bar radius"],
               ["length",      "Ang",        400, [0, inf],    "volume",      "Cylinder bar length"],
-              ["theta",       "degrees",     60, [-360, 360], "orientation", "Barbell axis to beam angle"],
-              ["phi",         "degrees",     60, [-360, 360], "orientation", "Rotation about beam"],
+              ["theta",       "degrees",     60, [-inf, inf], "orientation", "In plane angle"],
+              ["phi",         "degrees",     60, [-inf, inf], "orientation", "Out of plane angle"],
              ]
 # pylint: enable=bad-whitespace, line-too-long
@@ -125 +125 @@
             phi_pd=15, phi_pd_n=0,
            )
-q = 0.1
-# april 6 2017, rkh add unit tests, NOT compared with any other calc method, assume correct!
-qx = q*cos(pi/6.0)
-qy = q*sin(pi/6.0)
-tests = [[{}, 0.075, 25.5691260532],
-        [{'theta':80., 'phi':10.}, (qx, qy), 3.04233067789],
-        ]
-del qx, qy  # not necessary to delete, but cleaner