r11337 - /1.3/maths_fns/frame_order_matrix_ops.py -- July 22, 2010 - 15:57

Author: bugman
Date: Thu Jul 22 15:57:03 2010
New Revision: 11337

URL: http://svn.gna.org/viewcvs/relax?rev=11337&view=rev
Log:
Silenced the scipy.integrate.quad() warnings by setting the full_output arg 
to 1.


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=11337&r1=11336&r2=11337&view=diff
==============================================================================
--- 1.3/maths_fns/frame_order_matrix_ops.py (original)
+++ 1.3/maths_fns/frame_order_matrix_ops.py Thu Jul 22 15:57:03 2010
@@ -104,9 +104,9 @@
     fact = 1.0 / (2.0 * sigma_max * pec(theta_x, theta_y))
 
     # Numerical integration of phi of each element.
-    matrix[0, 0] = fact * quad(part_int_daeg1_pseudo_ellipse_xx, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
-    matrix[1, 1] = fact * quad(part_int_daeg1_pseudo_ellipse_yy, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
-    matrix[2, 2] = fact * quad(part_int_daeg1_pseudo_ellipse_zz, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
+    matrix[0, 0] = fact * quad(part_int_daeg1_pseudo_ellipse_xx, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
+    matrix[1, 1] = fact * quad(part_int_daeg1_pseudo_ellipse_yy, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
+    matrix[2, 2] = fact * quad(part_int_daeg1_pseudo_ellipse_zz, -pi, pi, 
args=(theta_x, theta_y, sigma_max), full_output=1)[0]
 
 
 def compile_2nd_matrix_pseudo_ellipse(matrix, R, eigen_alpha, eigen_beta, 
eigen_gamma, theta_x, theta_y, sigma_max):
@@ -134,25 +134,25 @@
     fact = 1.0 / (2.0 * sigma_max * pec(theta_x, theta_y))
 
     # Diagonal.
-    matrix[0, 0] = fact * quad(part_int_daeg2_pseudo_ellipse_00, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
-    matrix[1, 1] = fact * quad(part_int_daeg2_pseudo_ellipse_11, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
-    matrix[2, 2] = fact * quad(part_int_daeg2_pseudo_ellipse_22, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
-    matrix[3, 3] = fact * quad(part_int_daeg2_pseudo_ellipse_33, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
-    matrix[4, 4] = fact * quad(part_int_daeg2_pseudo_ellipse_44, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
-    matrix[5, 5] = fact * quad(part_int_daeg2_pseudo_ellipse_55, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
-    matrix[6, 6] = fact * quad(part_int_daeg2_pseudo_ellipse_66, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
-    matrix[7, 7] = fact * quad(part_int_daeg2_pseudo_ellipse_77, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
-    matrix[8, 8] = fact * quad(part_int_daeg2_pseudo_ellipse_88, -pi, pi, 
args=(theta_x, theta_y, sigma_max))[0]
+    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[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]
 
     # Off diagonal set 1.
-    matrix[0, 4] = matrix[4, 0] = fact * 
quad(part_int_daeg2_pseudo_ellipse_04, -pi, pi, args=(theta_x, theta_y, 
sigma_max))[0]
-    matrix[0, 8] = matrix[8, 0] = fact * 
quad(part_int_daeg2_pseudo_ellipse_08, -pi, pi, args=(theta_x, theta_y, 
sigma_max))[0]
-    matrix[4, 8] = matrix[8, 4] = fact * 
quad(part_int_daeg2_pseudo_ellipse_48, -pi, pi, args=(theta_x, theta_y, 
sigma_max))[0]
+    matrix[0, 4] = matrix[4, 0] = fact * 
quad(part_int_daeg2_pseudo_ellipse_04, -pi, pi, args=(theta_x, theta_y, 
sigma_max), full_output=1)[0]
+    matrix[0, 8] = matrix[8, 0] = fact * 
quad(part_int_daeg2_pseudo_ellipse_08, -pi, pi, args=(theta_x, theta_y, 
sigma_max), full_output=1)[0]
+    matrix[4, 8] = matrix[8, 4] = fact * 
quad(part_int_daeg2_pseudo_ellipse_48, -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))[0]
-    matrix[2, 6] = matrix[6, 2] = fact * 
quad(part_int_daeg2_pseudo_ellipse_26, -pi, pi, args=(theta_x, theta_y, 
sigma_max))[0]
-    matrix[5, 7] = matrix[7, 5] = fact * 
quad(part_int_daeg2_pseudo_ellipse_57, -pi, pi, args=(theta_x, theta_y, 
sigma_max))[0]
+    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]
+    matrix[2, 6] = matrix[6, 2] = fact * 
quad(part_int_daeg2_pseudo_ellipse_26, -pi, pi, args=(theta_x, theta_y, 
sigma_max), full_output=1)[0]
+    matrix[5, 7] = matrix[7, 5] = fact * 
quad(part_int_daeg2_pseudo_ellipse_57, -pi, pi, args=(theta_x, theta_y, 
sigma_max), full_output=1)[0]
 
     # Average position rotation.
     euler_to_R_zyz(eigen_alpha, eigen_beta, eigen_gamma, R)