r23543 - in /branches/frame_order_cleanup: ./ specific_analyses/frame_order/uf.py -- May 28, 2014 - 17:47

Author: bugman
Date: Wed May 28 17:47:33 2014
New Revision: 23543

URL: http://svn.gna.org/viewcvs/relax?rev=23543&view=rev
Log:
Merged revisions 23542 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r23542 | bugman | 2014-05-28 17:47:00 +0200 (Wed, 28 May 2014) | 3 lines
  
  Fixes for the frame order PDB presentation in the frame_order.pdb_model 
user function backend.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/specific_analyses/frame_order/uf.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 28 17:47:33 2014
@@ -1 +1 @@
-/trunk:1-23540
+/trunk:1-23542

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=23543&r1=23542&r2=23543&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/uf.py    
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/uf.py    Wed 
May 28 17:47:33 2014
@@ -212,7 +212,7 @@
 
         # The axis.
         if cdp.model in ['rotor']:
-            axis = create_rotor_axis_alpha(alpha=cdp.axis_alpha, 
pivot=pivot, point=pivot)
+            axis = create_rotor_axis_alpha(alpha=cdp.axis_alpha, 
pivot=pivot, point=com)
         else:
             axis = create_rotor_axis_spherical(theta=cdp.axis_theta, 
phi=cdp.axis_phi)
         print(("Central axis: %s." % axis))
@@ -231,7 +231,7 @@
             # Fill the structure.
             for i in range(cdp.sim_number):
                 if cdp.model in ['rotor']:
-                    axis_sim[i] = 
create_rotor_axis_alpha(alpha=cdp.axis_alpha_sim[i], pivot=pivot, point=pivot)
+                    axis_sim[i] = 
create_rotor_axis_alpha(alpha=cdp.axis_alpha_sim[i], pivot=pivot, point=com)
                 else:
                     axis_sim[i] = 
create_rotor_axis_spherical(theta=cdp.axis_theta_sim[i], 
phi=cdp.axis_phi_sim[i])