r10178 - /1.3/maths_fns/frame_order.py -- January 12, 2010 - 13:20

Author: bugman
Date: Tue Jan 12 13:20:36 2010
New Revision: 10178

URL: http://svn.gna.org/viewcvs/relax?rev=10178&view=rev
Log:
Modified the import of euler_zyz_to_R to allow easy switching later on to a 
different notation.


Modified:
    1.3/maths_fns/frame_order.py

Modified: 1.3/maths_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/frame_order.py?rev=10178&r1=10177&r2=10178&view=diff
==============================================================================
--- 1.3/maths_fns/frame_order.py (original)
+++ 1.3/maths_fns/frame_order.py Tue Jan 12 13:20:36 2010
@@ -32,7 +32,7 @@
 from maths_fns.alignment_tensor import to_5D, to_tensor
 from maths_fns.chi2 import chi2
 from maths_fns.frame_order_matrix_ops import compile_2nd_matrix_iso_cone, 
reduce_alignment_tensor
-from maths_fns.rotation_matrix import euler_zyz_to_R
+from maths_fns.rotation_matrix import euler_zyz_to_R as euler_to_R
 from relax_errors import RelaxError
 
 
@@ -196,7 +196,7 @@
         alpha, beta, gamma = params
 
         # Alignment tensor rotation.
-        euler_zyz_to_R(alpha, beta, gamma, self.rot)
+        euler_to_R(alpha, beta, gamma, self.rot)
 
         # Back calculate the rotated tensors.
         for i in range(self.num_tensors):
@@ -244,7 +244,7 @@
         self.frame_order_2nd = 
compile_2nd_matrix_iso_cone(self.frame_order_2nd, self.rot, self.z_axis, 
self.cone_axis, theta, phi, theta_cone)
 
         # Reduced alignment tensor rotation.
-        euler_zyz_to_R(alpha, beta, gamma, self.rot)
+        euler_to_R(alpha, beta, gamma, self.rot)
 
         # Back calculate the reduced tensors.
         for i in range(self.num_tensors):