r24457 - /branches/frame_order_cleanup/specific_analyses/frame_order/geometric.py -- July 04, 2014 - 15:19

Author: bugman
Date: Fri Jul  4 15:19:18 2014
New Revision: 24457

URL: http://svn.gna.org/viewcvs/relax?rev=24457&view=rev
Log:
Fixes for the titles in the frame order geometric representation from 
frame_order.pdb_model.

There were a few bugs for a number of the frame order models preventing this 
code from working.


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

Modified: 
branches/frame_order_cleanup/specific_analyses/frame_order/geometric.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/geometric.py?rev=24457&r1=24456&r2=24457&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/geometric.py   
  (original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/geometric.py   
  Fri Jul  4 15:19:18 2014
@@ -362,8 +362,8 @@
         if cdp.model not in ['double rotor']:
             # Generate the rotor axis.
             if cdp.model in ['rotor', 'free rotor']:
-                axis = create_rotor_axis_alpha(alpha=cdp.axis_alpha, 
pivot=pivot1, point=com[i])
-            elif cdp.model in ['iso cone', 'iso cone, free rotor']:
+                axis = create_rotor_axis_alpha(alpha=cdp.axis_alpha, 
pivot=pivot1, point=pipe_centre_of_mass(verbosity=0))
+            elif cdp.model in ['iso cone', 'iso cone, free rotor', 'iso 
cone, torsionless']:
                 axis = create_rotor_axis_spherical(theta=cdp.axis_theta, 
phi=cdp.axis_phi)
             else:
                 axis = create_rotor_axis_euler(alpha=cdp.eigen_alpha, 
beta=cdp.eigen_beta, gamma=cdp.eigen_gamma)