r26436 - /branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py -- November 07, 2014 - 10:08

Author: bugman
Date: Fri Nov  7 10:08:53 2014
New Revision: 26436

URL: http://svn.gna.org/viewcvs/relax?rev=26436&view=rev
Log:
More simplifications of the pseudo-ellipse 2nd degree frame order matrix 
equations.


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=26436&r1=26435&r2=26436&view=diff
==============================================================================
--- branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py      
(original)
+++ branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py      Fri 
Nov  7 10:08:53 2014
@@ -504,9 +504,10 @@
     # Repetitive trig.
     cos_tmax = cos(tmax)
     sin_phi2 = sin(phi)**2
+    cos_phi2 = cos(phi)**2
 
     # Return the theta-sigma integral.
-    return 2.0*sin_phi2*cos_tmax**3 + 3.0*(1.0 - sin_phi2)*cos_tmax**2
+    return 2.0*sin_phi2*cos_tmax**3 + 3.0*cos_phi2*cos_tmax**2
 
 
 def part_int_daeg2_pseudo_ellipse_57(phi, x, y, smax):