r25720 - /branches/frame_order_cleanup/specific_analyses/frame_order/uf.py -- September 09, 2014 - 19:13

Author: bugman
Date: Tue Sep  9 19:13:17 2014
New Revision: 25720

URL: http://svn.gna.org/viewcvs/relax?rev=25720&view=rev
Log:
The frame_order.permute_axes user function can now handle the torsionless 
pseudo-ellipse.

This model does not have the variable cdp.cone_sigma_max set.


Modified:
    branches/frame_order_cleanup/specific_analyses/frame_order/uf.py

Modified: branches/frame_order_cleanup/specific_analyses/frame_order/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/uf.py?rev=25720&r1=25719&r2=25720&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/uf.py    
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/uf.py    Tue 
Sep  9 19:13:17 2014
@@ -113,6 +113,9 @@
         raise RelaxError("The parameter values are not set up.")
 
     # The angles.  Note that cone_theta_x corresponds to a rotation about 
the y-axis!
+    cone_sigma_max = 0.0
+    if cdp.model == MODEL_PSEUDO_ELLIPSE:
+        cone_sigma_max = cdp.cone_sigma_max
     angles = array([cdp.cone_theta_y, cdp.cone_theta_x, cdp.cone_sigma_max], 
float64)
 
     # Generate the eigenframe of the motion.
@@ -128,7 +131,8 @@
     # Permute the angles.
     cdp.cone_theta_y = angles[perm[0]]
     cdp.cone_theta_x = angles[perm[1]]
-    cdp.cone_sigma_max = angles[perm[2]]
+    if cdp.model == MODEL_PSEUDO_ELLIPSE:
+        cdp.cone_sigma_max = angles[perm[2]]
 
     # Permute the axes.
     frame_new = transpose(array([frame[:, perm[0]], frame[:, perm[1]], 
frame[:, perm[2]]], float64))