r24462 - /branches/frame_order_cleanup/lib/frame_order/double_rotor.py -- July 05, 2014 - 15:53

Author: bugman
Date: Sat Jul  5 15:53:30 2014
New Revision: 24462

URL: http://svn.gna.org/viewcvs/relax?rev=24462&view=rev
Log:
Reverted r24332 as this was incorrect - the data input was wrong, not the 
frame order matrix.

The command used was:
svn merge -r24332:r24331 .

.....
  r24332 | bugman | 2014-06-26 16:29:46 +0200 (Thu, 26 Jun 2014) | 6 lines
  Changed paths:
     M /branches/frame_order_cleanup/lib/frame_order/double_rotor.py
  
  Fix for the double rotor frame order matrix assembly function.
  
  The rotations where applied in reverse, hence the 2nd degree frame order 
matrix was the Kronecker
  product transpose of the correct form.
.....


Modified:
    branches/frame_order_cleanup/lib/frame_order/double_rotor.py

Modified: branches/frame_order_cleanup/lib/frame_order/double_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/double_rotor.py?rev=24462&r1=24461&r2=24462&view=diff
==============================================================================
--- branches/frame_order_cleanup/lib/frame_order/double_rotor.py        
(original)
+++ branches/frame_order_cleanup/lib/frame_order/double_rotor.py        Sat 
Jul  5 15:53:30 2014
@@ -72,11 +72,11 @@
     matrix[8, 8] = 0.5 * sinc_2smax1p1 * sinc_2smax2p1
 
     # Off diagonal set 1.
-    matrix[0, 4] = 0.5 * sinc_2smax1n1 * sinc_2smax2n1
-    matrix[0, 8] = -0.5 * sinc_2smax1n1 * sinc_2smax2p1
-    matrix[8, 0] = -sinc_2smax1n1
-    matrix[4, 8] = -sinc_2smax2n1
-    matrix[8, 4] = -0.5 * sinc_2smax1p1 * sinc_2smax2n1
+    matrix[4, 0] = 0.5 * sinc_2smax1n1 * sinc_2smax2n1
+    matrix[0, 8] = -sinc_2smax1n1
+    matrix[8, 0] = -0.5 * sinc_2smax1n1 * sinc_2smax2p1
+    matrix[4, 8] = -0.5 * sinc_2smax1p1 * sinc_2smax2n1
+    matrix[8, 4] = -sinc_2smax2n1
 
     # Off diagonal set 2.
     matrix[2, 6] = matrix[6, 2] = sinc_smax2 * sinc_2smax1n1