Author: bugman Date: Sat Nov 1 17:57:15 2014 New Revision: 26402 URL: http://svn.gna.org/viewcvs/relax?rev=26402&view=rev Log: Modified the rotate_daeg() function as this is independent of the degree of the frame order matrix. This is the lib.frame_order.matrix_ops.rotate_daeg() function. Modified: branches/frame_order_cleanup/lib/frame_order/matrix_ops.py Modified: branches/frame_order_cleanup/lib/frame_order/matrix_ops.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/matrix_ops.py?rev=26402&r1=26401&r2=26402&view=diff ============================================================================== --- branches/frame_order_cleanup/lib/frame_order/matrix_ops.py (original) +++ branches/frame_order_cleanup/lib/frame_order/matrix_ops.py Sat Nov 1 17:57:15 2014 @@ -392,20 +392,20 @@ red_tensor[4] = (D[5, 5] + D[7, 5])*A[4] -def rotate_daeg(matrix, Rx2_eigen): +def rotate_daeg(matrix, R_eigen): """Rotate the given frame order matrix. It is assumed that the frame order matrix is in the Kronecker product form. - @param matrix: The Frame Order matrix, 2nd degree to be populated. - @type matrix: numpy 9D, rank-2 array - @param Rx2_eigen: The Kronecker product of the eigenframe rotation matrix with itself. - @type Rx2_eigen: numpy 9D, rank-2 array + @param matrix: The Frame Order matrix to be populated. All degrees are handled. + @type matrix: numpy rank-2 array + @param R_eigen: The Kronecker product of the eigenframe rotation matrix with itself. + @type R_eigen: numpy rank-2 array """ # Rotate. - matrix_rot = dot(Rx2_eigen, dot(matrix, transpose(Rx2_eigen))) + matrix_rot = dot(R_eigen, dot(matrix, transpose(R_eigen))) # Return the matrix. return matrix_rot