r17859 - /branches/frame_order_testing/specific_fns/frame_order.py -- October 16, 2012 - 14:18

Author: bugman
Date: Tue Oct 16 14:18:03 2012
New Revision: 17859

URL: http://svn.gna.org/viewcvs/relax?rev=17859&view=rev
Log:
Fix for a bad edit of an svnmerge back at r17835.


Modified:
    branches/frame_order_testing/specific_fns/frame_order.py

Modified: branches/frame_order_testing/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/frame_order.py?rev=17859&r1=17858&r2=17859&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/frame_order.py (original)
+++ branches/frame_order_testing/specific_fns/frame_order.py Tue Oct 16 
14:18:03 2012
@@ -462,9 +462,9 @@
                     axis_sim_neg = axes_sim_neg[:, :, j]
 
                 # The vectors.
-                res_num = geometric.generate_vector_residues(mol=mol, 
vector=axes_pos[:, j], atom_name='%s-ax'%label[j], 
res_name_vect='%sAX'%label[i].upper(), sim_vectors=axis_sim_pos, 
res_num=res_num+1, origin=cdp.pivot, scale=size)
+                res_num = geometric.generate_vector_residues(mol=mol, 
vector=axes_pos[:, j], atom_name='%s-ax'%label[j], res_name_vect='AXE', 
sim_vectors=axis_sim_pos, res_num=2, origin=cdp.pivot, scale=size)
                 if neg_cone:
-                    res_num = 
geometric.generate_vector_residues(mol=mol_neg, vector=axes_neg[:, j], 
atom_name='%s-ax'%label[j], res_name_vect='%sAX'%label[i].upper(), 
sim_vectors=axis_sim_neg, res_num=res_num, origin=cdp.pivot, scale=size)
+                    res_num = 
geometric.generate_vector_residues(mol=mol_neg, vector=axes_neg[:, j], 
atom_name='%s-ax'%label[j], res_name_vect='AXE', sim_vectors=axis_sim_neg, 
res_num=2, origin=cdp.pivot, scale=size)
 
 
         # The cone object.