r9100 - /branches/frame_order/maths_fns/frame_order_matrix_ops.py -- June 19, 2009 - 16:03

Author: bugman
Date: Fri Jun 19 16:03:20 2009
New Revision: 9100

URL: http://svn.gna.org/viewcvs/relax?rev=9100&view=rev
Log:
Shifted more code into the compile_2nd_matrix_iso_cone() function.


Modified:
    branches/frame_order/maths_fns/frame_order_matrix_ops.py

Modified: branches/frame_order/maths_fns/frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order/maths_fns/frame_order_matrix_ops.py?rev=9100&r1=9099&r2=9100&view=diff
==============================================================================
--- branches/frame_order/maths_fns/frame_order_matrix_ops.py (original)
+++ branches/frame_order/maths_fns/frame_order_matrix_ops.py Fri Jun 19 
16:03:20 2009
@@ -26,18 +26,27 @@
 # Python module imports.
 from math import cos
 
+# relax module imports.
+from maths_fns.kronecker_product import kron_prod, transpose_14
+from maths_fns.rotation_matrix import R_euler_zyz
 
 
-def compile_2nd_matrix_iso_cone(matrix, R_kron, theta):
+def compile_2nd_matrix_iso_cone(matrix, R, theta):
     """Generate the rotated 2nd degree Frame Order matrix.
 
-    @param matrix:  The Frame Order matrix, 2nd degree.
+    @param matrix:  The Frame Order matrix, 2nd degree to be populated.
     @type matrix:   numpy 9D, rank-2 array
-    @param R_kron:  The 2nd degree Kronecker product of the rotation.
-    @type R_kron:   numpy 9D, rank-2 array
+    @param R:       The rotation matrix to be populated.
+    @type R:        numpy 3D, rank-2 array
     @param theta:   The cone angle in radians.
     @type theta:    float
     """
+
+    # Generate the rotation matrix.
+    R_euler_zyz(R, alpha, beta, gamma)
+
+    # The outer product of R.
+    R_kron = kron_prod(R, R)
 
     # Populate the Frame Order matrix in the eigenframe.
     populate_2nd_eigenframe_iso_cone(matrix, theta)