Author: bugman Date: Fri Nov 7 16:14:49 2014 New Revision: 26448 URL: http://svn.gna.org/viewcvs/relax?rev=26448&view=rev Log: Fix for the pseudo-ellipse 1st degree frame order matrix Daeg22 element. 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=26448&r1=26447&r2=26448&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 16:14:49 2014 @@ -68,7 +68,7 @@ # Numerical integration of phi of each element. matrix[0, 0] = fact * sinc_smax * (2.0*pi + quad(part_int_daeg1_pseudo_ellipse_00, -pi, pi, args=(theta_x, theta_y), full_output=1)[0]) matrix[1, 1] = fact * sinc_smax * (2.0*pi + quad(part_int_daeg1_pseudo_ellipse_11, -pi, pi, args=(theta_x, theta_y), full_output=1)[0]) - matrix[2, 2] = 0.5 * fact * quad(part_int_daeg1_pseudo_ellipse_22, -pi, pi, args=(theta_x, theta_y), full_output=1)[0] + matrix[2, 2] = fact * quad(part_int_daeg1_pseudo_ellipse_22, -pi, pi, args=(theta_x, theta_y), full_output=1)[0] # Rotate and return the frame order matrix. return rotate_daeg(matrix, R_eigen)