r23812 - /branches/frame_order_cleanup/specific_analyses/frame_order/uf.py -- June 11, 2014 - 08:21

Author: bugman
Date: Wed Jun 11 08:21:48 2014
New Revision: 23812

URL: http://svn.gna.org/viewcvs/relax?rev=23812&view=rev
Log:
Fixes for the rotor object created by the frame_order.pdb_model user function.

The rotor is now also shown for the free rotor pseudo-ellipse, despite it 
being a useless model, and
the propeller blades are no longer staggered for all the free rotor models so 
that two circles are
no longer produced.


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=23812&r1=23811&r2=23812&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/uf.py    
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/uf.py    Wed 
Jun 11 08:21:48 2014
@@ -163,7 +163,7 @@
     pivot = array([cdp.pivot_x, cdp.pivot_y, cdp.pivot_z])
 
     # The rotor object.
-    if cdp.model in ['rotor', 'free rotor', 'iso cone', 'iso cone, free 
rotor', 'pseudo-ellipse']:
+    if cdp.model in ['rotor', 'free rotor', 'iso cone', 'iso cone, free 
rotor', 'pseudo-ellipse', 'pseudo-ellipse, free rotor']:
         # The rotor angle.
         if cdp.model in ['free rotor', 'iso cone, free rotor']:
             rotor_angle = pi
@@ -189,8 +189,13 @@
         else:
             span = 35e-10
 
+        # Stagger the propeller blades.
+        staggered = True
+        if cdp.model in ['free rotor', 'iso cone, free rotor', 
'pseudo-ellipse, free rotor']:
+            staggered = False
+
         # Add the rotor object to the structure as a new molecule.
-        rotor_pdb(structure=structure, rotor_angle=rotor_angle, axis=axis, 
axis_pt=pivot, centre=com, span=span, blade_length=5e-10, staggered=True)
+        rotor_pdb(structure=structure, rotor_angle=rotor_angle, axis=axis, 
axis_pt=pivot, centre=com, span=span, blade_length=5e-10, staggered=staggered)
 
     # Create the molecule.
     structure.add_molecule(name='rest')