r12760 - /branches/relax_data/specific_fns/consistency_tests.py -- March 03, 2011 - 11:19

Author: bugman
Date: Thu Mar  3 11:19:05 2011
New Revision: 12760

URL: http://svn.gna.org/viewcvs/relax?rev=12760&view=rev
Log:
Some fixes for the consistency testing calculate() method.


Modified:
    branches/relax_data/specific_fns/consistency_tests.py

Modified: branches/relax_data/specific_fns/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data/specific_fns/consistency_tests.py?rev=12760&r1=12759&r2=12760&view=diff
==============================================================================
--- branches/relax_data/specific_fns/consistency_tests.py (original)
+++ branches/relax_data/specific_fns/consistency_tests.py Thu Mar  3 11:19:05 
2011
@@ -145,23 +145,23 @@
                 # R1.
                 if cdp.ri_type[ri_id] == 'R1':
                     if sim_index == None:
-                        r1 = spin.ri_data[j]
+                        r1 = spin.ri_data[ri_id]
                     else:
-                        r1 = spin.ri_data_sim[sim_index][j]
+                        r1 = spin.ri_data_sim[ri_id][sim_index]
 
                 # R2.
                 if cdp.ri_type[ri_id] == 'R2':
                     if sim_index == None:
-                        r2 = spin.ri_data[j]
+                        r2 = spin.ri_data[ri_id]
                     else:
-                        r2 = spin.ri_data_sim[sim_index][j]
+                        r2 = spin.ri_data_sim[ri_id][sim_index]
 
                 # NOE.
                 if cdp.ri_type[ri_id] == 'NOE':
                     if sim_index == None:
-                        noe = spin.ri_data[j]
+                        noe = spin.ri_data[ri_id]
                     else:
-                        noe = spin.ri_data_sim[sim_index][j]
+                        noe = spin.ri_data_sim[ri_id][sim_index]
 
             # Skip the residue if not all of the three value exist.
             if r1 == None or r2 == None or noe == None: