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

File:

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

sasmodels/models/capped_cylinder.py

@@ -71 +71 @@
 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 cylinders.
@@ -91 +91 @@
 
 """
-from numpy import inf, sin, cos, pi
+from numpy import inf
 
 name = "capped_cylinder"
@@ -129 +129 @@
               ["radius_cap", "Ang",     20, [0, inf],    "volume", "Cap radius"],
               ["length",     "Ang",    400, [0, inf],    "volume", "Cylinder length"],
-              ["theta",      "degrees", 60, [-360, 360], "orientation", "cylinder axis to beam angle"],
-              ["phi",        "degrees", 60, [-360, 360], "orientation", "rotation about beam"],
+              ["theta",      "degrees", 60, [-inf, inf], "orientation", "inclination angle"],
+              ["phi",        "degrees", 60, [-inf, inf], "orientation", "deflection angle"],
              ]
 # pylint: enable=bad-whitespace, line-too-long
@@ -145 +145 @@
             theta_pd=15, theta_pd_n=45,
             phi_pd=15, phi_pd_n=1)
-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, 26.0698570695],
-        [{'theta':80., 'phi':10.}, (qx, qy), 0.561811990502],
-        ]
-del qx, qy  # not necessary to delete, but cleaner