r23201 - /branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py -- May 16, 2014 - 14:20

Author: bugman
Date: Fri May 16 14:20:39 2014
New Revision: 23201

URL: http://svn.gna.org/viewcvs/relax?rev=23201&view=rev
Log:
Alphabetical ordering of functions in the lib.frame_order.pseudo_ellipse 
module.


Modified:
    branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py

Modified: branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py?rev=23201&r1=23200&r2=23201&view=diff
==============================================================================
--- branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py      
(original)
+++ branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py      Fri 
May 16 14:20:39 2014
@@ -625,29 +625,6 @@
 
     # Return the value.
     return c * result[0] / SA
-
-
-def tmax_pseudo_ellipse(phi, theta_x, theta_y):
-    """The pseudo-ellipse tilt-torsion polar angle.
-
-    @param phi:     The azimuthal tilt-torsion angle.
-    @type phi:      float
-    @param theta_x: The cone opening angle along x.
-    @type theta_x:  float
-    @param theta_y: The cone opening angle along y.
-    @type theta_y:  float
-    @return:        The theta max angle for the given phi angle.
-    @rtype:         float
-    """
-
-    # Zero points.
-    if theta_x == 0.0:
-        return 0.0
-    elif theta_y == 0.0:
-        return 0.0
-
-    # Return the maximum angle.
-    return theta_x * theta_y / sqrt((cos(phi)*theta_y)**2 + 
(sin(phi)*theta_x)**2)
 
 
 def pcs_numeric_int_pseudo_ellipse_qrint(points=None, theta_x=None, 
theta_y=None, sigma_max=None, c=None, full_in_ref_frame=None, 
r_pivot_atom=None, r_pivot_atom_rev=None, r_ln_pivot=None, A=None, 
R_eigen=None, RT_eigen=None, Ri_prime=None, pcs_theta=None, 
pcs_theta_err=None, missing_pcs=None, error_flag=False):
@@ -728,3 +705,26 @@
                 pcs_theta_err[i, j] = abs(pcs_theta_err[i, j] / float(num)  
-  pcs_theta[i, j]**2) / float(num)
                 pcs_theta_err[i, j] = c[i] * sqrt(pcs_theta_err[i, j])
                 print("%8.3f +/- %-8.3f" % (pcs_theta[i, j]*1e6, 
pcs_theta_err[i, j]*1e6))
+
+
+def tmax_pseudo_ellipse(phi, theta_x, theta_y):
+    """The pseudo-ellipse tilt-torsion polar angle.
+
+    @param phi:     The azimuthal tilt-torsion angle.
+    @type phi:      float
+    @param theta_x: The cone opening angle along x.
+    @type theta_x:  float
+    @param theta_y: The cone opening angle along y.
+    @type theta_y:  float
+    @return:        The theta max angle for the given phi angle.
+    @rtype:         float
+    """
+
+    # Zero points.
+    if theta_x == 0.0:
+        return 0.0
+    elif theta_y == 0.0:
+        return 0.0
+
+    # Return the maximum angle.
+    return theta_x * theta_y / sqrt((cos(phi)*theta_y)**2 + 
(sin(phi)*theta_x)**2)