r12764 - /branches/relax_data/specific_fns/consistency_tests.py -- March 03, 2011 - 11:39

Author: bugman
Date: Thu Mar  3 11:39:37 2011
New Revision: 12764

URL: http://svn.gna.org/viewcvs/relax?rev=12764&view=rev
Log:
Added a check to make sure the relaxation data is of the correct frequency.

The comments have also been updated to be more similar to that of the J(w) 
mapping module.  This is
to allow the J(w) mapping module to be more easily updated to the new design.


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=12764&r1=12763&r2=12764&view=diff
==============================================================================
--- branches/relax_data/specific_fns/consistency_tests.py (original)
+++ branches/relax_data/specific_fns/consistency_tests.py Thu Mar  3 11:39:37 
2011
@@ -142,6 +142,10 @@
 
             # Get the R1, R2, and NOE values corresponding to the set 
frequency.
             for ri_id in cdp.ri_ids:
+                # The frequency does not match.
+                if cdp.frq[ri_id] != cdp.ct_frq:
+                    continue
+
                 # R1.
                 if cdp.ri_type[ri_id] == 'R1':
                     if sim_index == None:
@@ -229,7 +233,7 @@
                 # Add '_sim' to the names.
                 name = name + '_sim'
 
-            # If the name is not in 'data', add it.
+            # If the name is not in 'data_cont', add it.
             if not hasattr(data_cont, name):
                 # Set the attribute.
                 setattr(data_cont, name, None)
@@ -348,18 +352,18 @@
         # Print out.
         print("\n\nOver-fit spin deselection.\n")
 
-        # Test if the sequence data is loaded.
+        # Test the sequence data exists.
         if not exists_mol_res_spin_data():
             raise RelaxNoSequenceError
 
-        # Loop over spin data:
+        # Loop over spin data.
         for spin, spin_id in spin_loop(return_id=True):
-            # Check for sufficient data
+            # Check if data exists.
             if not hasattr(spin, 'ri_data'):
                 warn(RelaxDeselectWarning(spin_id, 'missing relaxation 
data'))
                 spin.select = False
 
-            # Require 3 or more data points
+            # Require 3 or more data points.
             elif len(spin.ri_data) < 3:
                 warn(RelaxDeselectWarning(spin_id, 'insufficient relaxation 
data, 3 or more data points are required'))
                 spin.select = False