r13749 - in /1.3/specific_fns: consistency_tests.py jw_mapping.py model_free/main.py -- July 19, 2011 - 18:00

Author: bugman
Date: Tue Jul 19 18:00:13 2011
New Revision: 13749

URL: http://svn.gna.org/viewcvs/relax?rev=13749&view=rev
Log:
All of the overfit_deselect() methods now skip deselected spins, avoiding 
confusing warnings.


Modified:
    1.3/specific_fns/consistency_tests.py
    1.3/specific_fns/jw_mapping.py
    1.3/specific_fns/model_free/main.py

Modified: 1.3/specific_fns/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/consistency_tests.py?rev=13749&r1=13748&r2=13749&view=diff
==============================================================================
--- 1.3/specific_fns/consistency_tests.py (original)
+++ 1.3/specific_fns/consistency_tests.py Tue Jul 19 18:00:13 2011
@@ -344,6 +344,10 @@
 
         # Loop over spin data.
         for spin, spin_id in spin_loop(return_id=True):
+            # Skip deselected spins.
+            if not spin.select:
+                continue
+
             # Check if data exists.
             if not hasattr(spin, 'ri_data'):
                 warn(RelaxDeselectWarning(spin_id, 'missing relaxation 
data'))

Modified: 1.3/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/jw_mapping.py?rev=13749&r1=13748&r2=13749&view=diff
==============================================================================
--- 1.3/specific_fns/jw_mapping.py (original)
+++ 1.3/specific_fns/jw_mapping.py Tue Jul 19 18:00:13 2011
@@ -318,6 +318,10 @@
 
         # Loop over spin data.
         for spin, spin_id in spin_loop(return_id=True):
+            # Skip deselected spins.
+            if not spin.select:
+                continue
+
             # Check if data exists.
             if not hasattr(spin, 'ri_data'):
                 warn(RelaxDeselectWarning(spin_id, 'missing relaxation 
data'))

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=13749&r1=13748&r2=13749&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Tue Jul 19 18:00:13 2011
@@ -2043,6 +2043,10 @@
 
         # Loop over the sequence.
         for spin, spin_id in spin_loop(return_id=True):
+            # Skip deselected spins.
+            if not spin.select:
+                continue
+
             # Relaxation data must exist!
             if not hasattr(spin, 'ri_data'):
                 warn(RelaxDeselectWarning(spin_id, 'missing relaxation 
data'))