r11436 - /1.3/maths_fns/frame_order_matrix_ops.py -- August 08, 2010 - 17:21

Author: bugman
Date: Sun Aug  8 17:21:18 2010
New Revision: 11436

URL: http://svn.gna.org/viewcvs/relax?rev=11436&view=rev
Log:
Fixed another 2 trig typo bugs in populate_2nd_eigenframe_iso_cone().

These are the same issue, sin(2.0*tmax)**2 should have been sin(tmax)**2.


Modified:
    1.3/maths_fns/frame_order_matrix_ops.py

Modified: 1.3/maths_fns/frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/frame_order_matrix_ops.py?rev=11436&r1=11435&r2=11436&view=diff
==============================================================================
--- 1.3/maths_fns/frame_order_matrix_ops.py (original)
+++ 1.3/maths_fns/frame_order_matrix_ops.py Sun Aug  8 17:21:18 2010
@@ -1092,12 +1092,12 @@
     sin_2smax = sin(2.0*smax)
     cos_tmax = cos(tmax)
     cos_tmax2 = cos_tmax**2
-    sin_2tmax2 = sin(2.0*tmax)**2
+    sin_tmax2 = sin(tmax)**2
     denom_a = 48.0*smax*(cos_tmax - 1.0)
 
     # Diagonal.
     matrix[0, 0] = ((sin_2smax + 4.0*smax)*cos_tmax2 + (4.0*sin_2smax + 
4.0*smax)*cos_tmax + 7.0*sin_2smax + 16.0*smax) / (48.0*smax)
-    matrix[1, 1] = -((sin_2smax*cos_tmax + 3.0*sin_2smax + 
12.0*smax)*sin_2tmax2 - 4.0*sin_2smax*cos_tmax + 4.0*sin_2smax) / denom_a
+    matrix[1, 1] = -((sin_2smax*cos_tmax + 3.0*sin_2smax + 
12.0*smax)*sin_tmax2 - 4.0*sin_2smax*cos_tmax + 4.0*sin_2smax) / denom_a
     matrix[2, 2] = (2.0*sin_smax*cos_tmax2 + 5.0*sin_smax*cos_tmax + 
5.0*sin_smax) / (12.0*smax)
     matrix[3, 3] = matrix[1, 1]
     matrix[4, 4] = matrix[0, 0]
@@ -1107,12 +1107,12 @@
     matrix[8, 8] = (cos_tmax2 + cos_tmax + 1.0) / 3.0
 
     # Off diagonal set 1.
-    matrix[0, 4] = matrix[4, 0] = (((sin_2smax - 4.0*smax)*cos_tmax + 
3.0*sin_2smax)*sin(tmax)**2 + (16.0*smax - 4.0*sin_2smax)*cos_tmax + 
4.0*sin_2smax-16.0*smax) / denom_a
+    matrix[0, 4] = matrix[4, 0] = (((sin_2smax - 4.0*smax)*cos_tmax + 
3.0*sin_2smax)*sin_tmax2 + (16.0*smax - 4.0*sin_2smax)*cos_tmax + 
4.0*sin_2smax-16.0*smax) / denom_a
     matrix[0, 8] = matrix[8, 0] = -(cos_tmax2 + cos_tmax - 2.0) / 6.0
     matrix[4, 8] = matrix[8, 4] = matrix[0, 8]
 
     # Off diagonal set 2.
-    matrix[1, 3] = matrix[3, 1] = -((sin_2smax*cos_tmax + 3.0*sin_2smax - 
12.0*smax)*sin_2tmax2 - 4.0*sin_2smax*cos_tmax + 4.0*sin_2smax) / denom_a
+    matrix[1, 3] = matrix[3, 1] = -((sin_2smax*cos_tmax + 3.0*sin_2smax - 
12.0*smax)*sin_tmax2 - 4.0*sin_2smax*cos_tmax + 4.0*sin_2smax) / denom_a
     matrix[2, 6] = matrix[6, 2] = (sin_smax*cos_tmax2 + sin_smax*cos_tmax - 
2.0*sin_smax) / (6.0*smax)
     matrix[5, 7] = matrix[7, 5] = matrix[2, 6]