Changes in sasmodels/models/triaxial_ellipsoid.py [9b79f29:0881f4e] in sasmodels

File:

• sasmodels/models/triaxial_ellipsoid.py (modified) (8 diffs)

sasmodels/models/triaxial_ellipsoid.py

@@ -16 +16 @@
     \frac{X^2}{R_a^2} + \frac{Y^2}{R_b^2} + \frac{Z^2}{R_c^2} = 1
 
-the scattering for randomly oriented particles is defined by the average over all orientations $\Omega$ of:
+the scattering for randomly oriented particles is defined by the average over
+all orientations $\Omega$ of:
 
 .. math::
 
-    P(q) = \text{scale}(\Delta\rho)^2\frac{V}{4 \pi}\int_\Omega \Phi^2(qr) d\Omega + \text{background}
+    P(q) = \text{scale}(\Delta\rho)^2\frac{V}{4 \pi}\int_\Omega\Phi^2(qr)\,d\Omega
+           + \text{background}
 
 where
@@ -38 +40 @@
  .. math::
 
-     \langle\Phi^2\rangle = \int_0^{2\pi} \int_{-\pi/2}^{\pi/2} \Phi^2(qr) \cos \gamma\,d\gamma d\phi
+     \langle\Phi^2\rangle = \int_0^{2\pi} \int_{-\pi/2}^{\pi/2} \Phi^2(qr)
+                                                \cos \gamma\,d\gamma d\phi
 
 with $e = \cos\gamma \sin\phi$, $f = \cos\gamma \cos\phi$ and $g = \sin\gamma$.
@@ -69 +72 @@
 .. figure:: img/elliptical_cylinder_angle_definition.png
 
-    Definition of angles for oriented triaxial ellipsoid, where radii shown here are $a < b << c$
-    and angle $\Psi$ is a rotation around the axis of the particle.
+    Definition of angles for oriented triaxial ellipsoid, where radii shown
+    here are $a < b << c$ and angle $\Psi$ is a rotation around the axis
+    of the particle.
 
 The angle $\psi$ is the rotational angle around its own $c$ axis
@@ -114 +118 @@
 * **Last Modified by:** Paul Kienzle (improved calculation) **Date:** April 4, 2017
 * **Last Reviewed by:** Paul Kienzle & Richard Heenan **Date:**  April 4, 2017
-
 """
 
@@ -122 +125 @@
 title = "Ellipsoid of uniform scattering length density with three independent axes."
 
-description = """\
+description = """
 Note: During fitting ensure that the inequality ra<rb<rc is not
         violated. Otherwise the calculation will
@@ -140 +143 @@
               ["radius_polar", "Ang", 10, [0, inf], "volume",
                "Polar radius, Rc"],
-              ["theta", "degrees", 60, [-360, 360], "orientation",
-               "polar axis to beam angle"],
-              ["phi", "degrees", 60, [-360, 360], "orientation",
-               "rotation about beam"],
-              ["psi", "degrees", 60, [-360, 360], "orientation",
-               "rotation about polar 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"],
              ]
 
@@ -157 +160 @@
     from .ellipsoid import ER as ellipsoid_ER
 
-    # now that radii can be in any size order, radii need sorting a,b,c where a~b and c is either much smaller
-    # or much larger
+    # now that radii can be in any size order, radii need sorting a,b,c
+    # where a~b and c is either much smaller or much larger
     radii = np.vstack((radius_equat_major, radius_equat_minor, radius_polar))
     radii = np.sort(radii, axis=0)
@@ -178 +181 @@
 
 q = 0.1
-# april 6 2017, rkh add unit tests, NOT compared with any other calc method, assume correct!
+# april 6 2017, rkh add unit tests
+#     NOT compared with any other calc method, assume correct!
 # add 2d test after pull #890
 qx = q*cos(pi/6.0)