r26435 - /branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py -- November 07, 2014 - 09:52

Author: bugman
Date: Fri Nov  7 09:52:09 2014
New Revision: 26435

URL: http://svn.gna.org/viewcvs/relax?rev=26435&view=rev
Log:
Simplification of some 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=26435&r1=26434&r2=26435&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 09:52:09 2014
@@ -311,7 +311,7 @@
     sin_phi2 = sin(phi)**2
 
     # The integral.
-    a = sinc(2.0*smax/pi) * ((4.0*cos_phi2*((1.0 - cos_phi2)*cos_tmax + 
3.0*(cos_phi2-1)) + 3.0)*sin(tmax)**2 - 16.0*cos_phi2*sin_phi2*cos_tmax) + 
3.0*sin(tmax)**2
+    a = sinc(2.0*smax/pi) * ((4.0*cos_phi2*sin_phi2*(cos_tmax - 3.0) + 
3.0)*sin(tmax)**2 - 16.0*cos_phi2*sin_phi2*cos_tmax) + 3.0*sin(tmax)**2
 
     # The theta-sigma integral.
     return a
@@ -366,9 +366,10 @@
     # Repetitive trig.
     cos_tmax = cos(tmax)
     cos_phi2 = cos(phi)**2
+    sin_phi2 = sin(phi)**2
 
     # Components.
-    a = 2.0*cos_phi2*cos_tmax**3 + 3.0*(1.0 - cos_phi2)*cos_tmax**2
+    a = 2.0*cos_phi2*cos_tmax**3 + 3.0*sin_phi2*cos_tmax**2
 
     # Return the theta-sigma integral.
     return a