r11411 - /1.3/maths_fns/frame_order_matrix_ops.py -- August 04, 2010 - 19:04

Author: bugman
Date: Wed Aug  4 19:04:53 2010
New Revision: 11411

URL: http://svn.gna.org/viewcvs/relax?rev=11411&view=rev
Log:
Reverted r11410 as the change did not take into account the rotation of the 
frame order matrix.

The command used was:
svn merge -r11410:11409 .


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=11411&r1=11410&r2=11411&view=diff
==============================================================================
--- 1.3/maths_fns/frame_order_matrix_ops.py (original)
+++ 1.3/maths_fns/frame_order_matrix_ops.py Wed Aug  4 19:04:53 2010
@@ -161,12 +161,12 @@
     matrix[0, 0] = fact * quad(part_int_daeg2_pseudo_ellipse_00, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
     matrix[1, 1] = fact * quad(part_int_daeg2_pseudo_ellipse_11, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
     matrix[2, 2] = fact * quad(part_int_daeg2_pseudo_ellipse_22, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
-    #matrix[3, 3] = fact * quad(part_int_daeg2_pseudo_ellipse_33, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
+    matrix[3, 3] = fact * quad(part_int_daeg2_pseudo_ellipse_33, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
     matrix[4, 4] = fact * quad(part_int_daeg2_pseudo_ellipse_44, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
     matrix[5, 5] = fact * quad(part_int_daeg2_pseudo_ellipse_55, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
-    #matrix[6, 6] = fact * quad(part_int_daeg2_pseudo_ellipse_66, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
-    #matrix[7, 7] = fact * quad(part_int_daeg2_pseudo_ellipse_77, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
-    #matrix[8, 8] = fact * quad(part_int_daeg2_pseudo_ellipse_88, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
+    matrix[6, 6] = fact * quad(part_int_daeg2_pseudo_ellipse_66, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
+    matrix[7, 7] = fact * quad(part_int_daeg2_pseudo_ellipse_77, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
+    matrix[8, 8] = fact * quad(part_int_daeg2_pseudo_ellipse_88, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
 
     # Off diagonal set 1.
     m04 = fact * quad(part_int_daeg2_pseudo_ellipse_04, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]