r10094 - in /1.3/specific_fns: consistency_tests.py jw_mapping.py relax_fit.py -- December 14, 2009 - 17:25

Author: bugman
Date: Mon Dec 14 17:25:31 2009
New Revision: 10094

URL: http://svn.gna.org/viewcvs/relax?rev=10094&view=rev
Log:
Fixes for the overfit_deselect() methods.

The spin_id was not being returned by the spin_loop().


Modified:
    1.3/specific_fns/consistency_tests.py
    1.3/specific_fns/jw_mapping.py
    1.3/specific_fns/relax_fit.py

Modified: 1.3/specific_fns/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/consistency_tests.py?rev=10094&r1=10093&r2=10094&view=diff
==============================================================================
--- 1.3/specific_fns/consistency_tests.py (original)
+++ 1.3/specific_fns/consistency_tests.py Mon Dec 14 17:25:31 2009
@@ -361,8 +361,7 @@
             raise RelaxNoSequenceError
 
         # Loop over spin data:
-        for spin in spin_loop():
-
+        for spin, spin_id in spin_loop(return_id=True):
             # Check for sufficient data
             if not hasattr(spin, 'relax_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=10094&r1=10093&r2=10094&view=diff
==============================================================================
--- 1.3/specific_fns/jw_mapping.py (original)
+++ 1.3/specific_fns/jw_mapping.py Mon Dec 14 17:25:31 2009
@@ -336,7 +336,7 @@
             raise RelaxNoSequenceError
 
         # Loop over spin data.
-        for spin in spin_loop():
+        for spin, spin_id in spin_loop(return_id=True):
             # Check if data exists.
             if not hasattr(spin, 'relax_data'):
                 warn(RelaxDeselectWarning(spin_id, 'missing relaxation 
data'))

Modified: 1.3/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=10094&r1=10093&r2=10094&view=diff
==============================================================================
--- 1.3/specific_fns/relax_fit.py (original)
+++ 1.3/specific_fns/relax_fit.py Mon Dec 14 17:25:31 2009
@@ -849,7 +849,7 @@
             raise RelaxNoSequenceError
 
         # Loop over spin data.
-        for spin in spin_loop():
+        for spin, spin_id in spin_loop(return_id=True):
             # Check if data exists.
             if not hasattr(spin, 'intensities'):
                 warn(RelaxDeselectWarning(spin_id, 'missing intensity data'))