r5062 - in /branches/N_state_model: maths_fns/n_state_model.py specific_fns/n_state_model.py -- February 21, 2008 - 09:11

Author: bugman
Date: Thu Feb 21 09:11:09 2008
New Revision: 5062

URL: http://svn.gna.org/viewcvs/relax?rev=5062&view=rev
Log:
Updated the import of the renamed R_euler_zyz() function.


Modified:
    branches/N_state_model/maths_fns/n_state_model.py
    branches/N_state_model/specific_fns/n_state_model.py

Modified: branches/N_state_model/maths_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/n_state_model.py?rev=5062&r1=5061&r2=5062&view=diff
==============================================================================
--- branches/N_state_model/maths_fns/n_state_model.py (original)
+++ branches/N_state_model/maths_fns/n_state_model.py Thu Feb 21 09:11:09 2008
@@ -25,7 +25,7 @@
 
 # relax module imports.
 from chi2 import chi2
-from rotation_matrix import rotation_matrix_zyz
+from rotation_matrix import R_euler_zyz
 
 
 class N_state_opt:
@@ -95,7 +95,7 @@
         # Update the rotation matricies.
         for c in xrange(self.N):
             # The matrix itself.
-            rotation_matrix_zyz(self.R[c], params[self.N-1+3*c], 
params[self.N-1+3*c+1], params[self.N-1+3*c+2])
+            R_euler_zyz(self.R[c], params[self.N-1+3*c], 
params[self.N-1+3*c+1], params[self.N-1+3*c+2])
 
             # Its transpose.
             self.RT[c] = transpose(self.R[c])

Modified: branches/N_state_model/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/n_state_model.py?rev=5062&r1=5061&r2=5062&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/n_state_model.py (original)
+++ branches/N_state_model/specific_fns/n_state_model.py Thu Feb 21 09:11:09 
2008
@@ -31,7 +31,7 @@
 from float import isNaN, isInf
 import generic_fns
 from maths_fns.n_state_model import N_state_opt
-from maths_fns.rotation_matrix import rotation_matrix_zyz
+from maths_fns.rotation_matrix import R_euler_zyz
 from minfx.generic import generic_minimise
 from relax_errors import RelaxError, RelaxInfError, RelaxNaNError, 
RelaxNoModelError, RelaxNoTensorError
 from specific_fns.base_class import Common_functions
@@ -129,7 +129,7 @@
         # Loop over the N states.
         for c in xrange(cdp.N):
             # Generate the rotation matrix.
-            rotation_matrix_zyz(R, cdp.alpha[c], cdp.beta[c], cdp.gamma[c])
+            R_euler_zyz(R, cdp.alpha[c], cdp.beta[c], cdp.gamma[c])
 
             # Rotate the unit vector.
             vectors[c] = dot(R, unit_vect)