r4050 - /branches/N_state_model/generic_fns/align_tensor.py -- November 26, 2007 - 17:21

Author: bugman
Date: Mon Nov 26 17:14:03 2007
New Revision: 4050

URL: http://svn.gna.org/viewcvs/relax?rev=4050&view=rev
Log:
Deleted the redundant unit_axes() function.


Modified:
    branches/N_state_model/generic_fns/align_tensor.py

Modified: branches/N_state_model/generic_fns/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/align_tensor.py?rev=4050&r1=4049&r2=4050&view=diff
==============================================================================
--- branches/N_state_model/generic_fns/align_tensor.py (original)
+++ branches/N_state_model/generic_fns/align_tensor.py Mon Nov 26 17:14:03 
2007
@@ -748,92 +748,3 @@
 
     if orient_params:
         fold_angles()
-
-
-def xxx_unit_axes():
-    """Function for calculating the unit axes of the alignment tensor.
-
-    Spheroid
-    ~~~~~~~~
-
-    The unit Dpar vector is
-
-                 | sin(theta) * cos(phi) |
-        Dpar  =  | sin(theta) * sin(phi) |
-                 |      cos(theta)       |
-
-
-    Ellipsoid
-    ~~~~~~~~~
-
-    The unit Dx vector is
-
-               | -sin(alpha) * sin(gamma) + cos(alpha) * cos(beta) * 
cos(gamma) |
-        Dx  =  | -sin(alpha) * cos(gamma) - cos(alpha) * cos(beta) * 
sin(gamma) |
-               |                    cos(alpha) * sin(beta)                   
   |
-
-    The unit Dy vector is
-
-               | cos(alpha) * sin(gamma) + sin(alpha) * cos(beta) * 
cos(gamma) |
-        Dy  =  | cos(alpha) * cos(gamma) - sin(alpha) * cos(beta) * 
sin(gamma) |
-               |                   sin(alpha) * sin(beta)                    
  |
-
-    The unit Dz vector is
-
-               | -sin(beta) * cos(gamma) |
-        Dz  =  |  sin(beta) * sin(gamma) |
-               |        cos(beta)        |
-
-    """
-
-    # Spheroid.
-    if cdp.diff_tensor.type == 'spheroid':
-        # Initialise.
-        Dpar = zeros(3, Float64)
-
-        # Trig.
-        sin_theta = sin(cdp.diff_tensor.theta)
-        cos_theta = cos(cdp.diff_tensor.theta)
-        sin_phi = sin(cdp.diff_tensor.phi)
-        cos_phi = cos(cdp.diff_tensor.phi)
-
-        # Unit Dpar axis.
-        Dpar[0] = sin_theta * cos_phi
-        Dpar[1] = sin_theta * sin_phi
-        Dpar[2] = cos_theta
-
-        # Return the vector.
-        return Dpar
-
-    # Ellipsoid.
-    if cdp.diff_tensor.type == 'ellipsoid':
-        # Initialise.
-        Dx = zeros(3, Float64)
-        Dy = zeros(3, Float64)
-        Dz = zeros(3, Float64)
-
-        # Trig.
-        sin_alpha = sin(cdp.diff_tensor.alpha)
-        cos_alpha = cos(cdp.diff_tensor.alpha)
-        sin_beta = sin(cdp.diff_tensor.beta)
-        cos_beta = cos(cdp.diff_tensor.beta)
-        sin_gamma = sin(cdp.diff_tensor.gamma)
-        cos_gamma = cos(cdp.diff_tensor.gamma)
-
-        # Unit Dx axis.
-        Dx[0] = -sin_alpha * sin_gamma  +  cos_alpha * cos_beta * cos_gamma
-        Dx[1] = -sin_alpha * cos_gamma  -  cos_alpha * cos_beta * sin_gamma
-        Dx[2] =  cos_alpha * sin_beta
-
-        # Unit Dy axis.
-        Dx[0] = cos_alpha * sin_gamma  +  sin_alpha * cos_beta * cos_gamma
-        Dx[1] = cos_alpha * cos_gamma  -  sin_alpha * cos_beta * sin_gamma
-        Dx[2] = sin_alpha * sin_beta
-
-        # Unit Dz axis.
-        Dx[0] = -sin_beta * cos_gamma
-        Dx[1] =  sin_beta * sin_gamma
-        Dx[2] =  cos_beta
-
-        # Return the vectors.
-        return Dx, Dy, Dz