r11420 - /1.3/maths_fns/frame_order_matrix_ops.py -- August 05, 2010 - 12:50

Author: bugman
Date: Thu Aug  5 12:50:23 2010
New Revision: 11420

URL: http://svn.gna.org/viewcvs/relax?rev=11420&view=rev
Log:
Fix for compile_2nd_matrix_pseudo_ellipse(), the pseudo-ellipse has slight 
asymmetry in daeg.


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=11420&r1=11419&r2=11420&view=diff
==============================================================================
--- 1.3/maths_fns/frame_order_matrix_ops.py (original)
+++ 1.3/maths_fns/frame_order_matrix_ops.py Thu Aug  5 12:50:23 2010
@@ -169,15 +169,12 @@
     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]
-    m40 = fact * quad(part_int_daeg2_pseudo_ellipse_40, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
-    m08 = fact * quad(part_int_daeg2_pseudo_ellipse_08, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
-    m80 = fact * quad(part_int_daeg2_pseudo_ellipse_80, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
-    m48 = fact * quad(part_int_daeg2_pseudo_ellipse_48, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
-    m84 = fact * quad(part_int_daeg2_pseudo_ellipse_84, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
-    matrix[0, 4] = matrix[4, 0] = (m04 + m40)/2.0
-    matrix[0, 8] = matrix[8, 0] = (m08 + m80)/2.0
-    matrix[4, 8] = matrix[8, 4] = (m48 + m84)/2.0
+    matrix[0, 4] = fact * quad(part_int_daeg2_pseudo_ellipse_04, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
+    matrix[4, 0] = fact * quad(part_int_daeg2_pseudo_ellipse_40, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
+    matrix[0, 8] = fact * quad(part_int_daeg2_pseudo_ellipse_08, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
+    matrix[8, 0] = fact * quad(part_int_daeg2_pseudo_ellipse_80, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
+    matrix[4, 8] = fact * quad(part_int_daeg2_pseudo_ellipse_48, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
+    matrix[8, 4] = fact * quad(part_int_daeg2_pseudo_ellipse_84, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
 
     # Off diagonal set 2.
     matrix[1, 3] = matrix[3, 1] = fact * 
quad(part_int_daeg2_pseudo_ellipse_13, -pi, pi, args=(theta_x, theta_y, 
sigma_max), full_output=1)[0]