r17953 - /branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py -- November 02, 2012 - 17:33

Author: bugman
Date: Fri Nov  2 17:33:52 2012
New Revision: 17953

URL: http://svn.gna.org/viewcvs/relax?rev=17953&view=rev
Log:
Shifted to using maths_fns.rotation_matrix.tilt_torsion_to_R() in for 
pcs_pivot_motion_full_qrint().

This is a code simplification as the rotation matrix calculation code already 
exists in
tilt_torsion_to_R(), and this removes a potential source of bugs.


Modified:
    branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py

Modified: branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py?rev=17953&r1=17952&r2=17953&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py 
(original)
+++ branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py Fri Nov  
2 17:33:52 2012
@@ -29,6 +29,7 @@
 
 # relax module imports.
 from maths_fns.kronecker_product import transpose_23
+from maths_fns.rotation_matrix import tilt_torsion_to_R
 
 
 def daeg_to_rotational_superoperator(daeg, Rsuper):
@@ -188,23 +189,7 @@
     """
 
     # The rotation matrix.
-    c_theta = cos(theta_i)
-    s_theta = sin(theta_i)
-    c_phi = cos(phi_i)
-    s_phi = sin(phi_i)
-    c_sigma_phi = cos(sigma_i - phi_i)
-    s_sigma_phi = sin(sigma_i - phi_i)
-    c_phi_c_theta = c_phi * c_theta
-    s_phi_c_theta = s_phi * c_theta
-    Ri_prime[0, 0] =  c_phi_c_theta*c_sigma_phi - s_phi*s_sigma_phi
-    Ri_prime[0, 1] = -c_phi_c_theta*s_sigma_phi - s_phi*c_sigma_phi
-    Ri_prime[0, 2] =  c_phi*s_theta
-    Ri_prime[1, 0] =  s_phi_c_theta*c_sigma_phi + c_phi*s_sigma_phi
-    Ri_prime[1, 1] = -s_phi_c_theta*s_sigma_phi + c_phi*c_sigma_phi
-    Ri_prime[1, 2] =  s_phi*s_theta
-    Ri_prime[2, 0] = -s_theta*c_sigma_phi
-    Ri_prime[2, 1] =  s_theta*s_sigma_phi
-    Ri_prime[2, 2] =  c_theta
+    tilt_torsion_to_R(phi_i, theta_i, sigma_i, Ri_prime)
 
     # The rotation.
     R_i = dot(R_eigen, dot(Ri_prime, RT_eigen))