Author: bugman Date: Wed Aug 11 11:36:40 2010 New Revision: 11465 URL: http://svn.gna.org/viewcvs/relax?rev=11465&view=rev Log: daeg_to_rotational_superoperator() now operates on the Kronecker product form. 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=11465&r1=11464&r2=11465&view=diff ============================================================================== --- 1.3/maths_fns/frame_order_matrix_ops.py (original) +++ 1.3/maths_fns/frame_order_matrix_ops.py Wed Aug 11 11:36:40 2010 @@ -295,11 +295,14 @@ def daeg_to_rotational_superoperator(daeg, Rsuper): """Convert the frame order matrix (daeg) to the rotational superoperator. - @param daeg: The second degree frame order matrix, daeg. + @param daeg: The second degree frame order matrix, daeg. This must be in the Kronecker product layout. @type daeg: numpy 9D, rank-2 array or numpy 3D, rank-4 array @param Rsuper: The rotational superoperator structure to be populated. @type Rsuper: numpy 5D, rank-2 array """ + + # First perform the T23 transpose. + transpose_23(daeg) # Convert to rank-4. orig_shape = daeg.shape @@ -342,6 +345,9 @@ # Revert the shape. daeg.shape = orig_shape + + # Undo the T23 transpose. + transpose_23(daeg) def part_int_daeg1_pseudo_ellipse_xx(phi, x, y, smax):