r15241 - /branches/frame_order_testing/specific_fns/frame_order.py -- January 25, 2012 - 09:17

Author: bugman
Date: Wed Jan 25 09:17:18 2012
New Revision: 15241

URL: http://svn.gna.org/viewcvs/relax?rev=15241&view=rev
Log:
More fixes for the frame order minimisation RDC setup for the spin parameter 
name changes.


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=15241&r1=15240&r2=15241&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/frame_order.py (original)
+++ branches/frame_order_testing/specific_fns/frame_order.py Wed Jan 25 
09:17:18 2012
@@ -735,11 +735,11 @@
                 raise RelaxNoValueError("bond length")
 
             # Gyromagnetic ratios.
-            gx = return_gyromagnetic_ratio(spin.heteronucleus)
-            gh = return_gyromagnetic_ratio(spin.proton)
+            gx = return_gyromagnetic_ratio(spin.heteronuc_type)
+            gh = return_gyromagnetic_ratio(spin.proton_type)
 
             # Calculate the RDC dipolar constant (in Hertz, and the 3 comes 
from the alignment tensor), and append it to the list.
-            rdc_const.append(3.0/(2.0*pi) * dipolar_constant(gx, gh, 
spin.bond_length))
+            rdc_const.append(3.0/(2.0*pi) * dipolar_constant(gx, gh, spin.r))
 
         # The RDC data.
         for align_id in cdp.align_ids: