r10089 - in /1.3/specific_fns: consistency_tests.py jw_mapping.py model_free/main.py relax_fit.py -- December 14, 2009 - 11:42

Author: bugman
Date: Mon Dec 14 11:42:51 2009
New Revision: 10089

URL: http://svn.gna.org/viewcvs/relax?rev=10089&view=rev
Log:
Improved the warning messages for over-fit spin deselection.


Modified:
    1.3/specific_fns/consistency_tests.py
    1.3/specific_fns/jw_mapping.py
    1.3/specific_fns/model_free/main.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=10089&r1=10088&r2=10089&view=diff
==============================================================================
--- 1.3/specific_fns/consistency_tests.py (original)
+++ 1.3/specific_fns/consistency_tests.py Mon Dec 14 11:42:51 2009
@@ -365,7 +365,7 @@
 
             # Check for sufficient data
             if not hasattr(spin, 'relax_data'):
-                warn(RelaxDeselectWarning(spin_id, 'relaxation data is 
missing'))
+                warn(RelaxDeselectWarning(spin_id, 'missing relaxation 
data'))
                 spin.select = False
 
             # Require 3 or more data points

Modified: 1.3/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/jw_mapping.py?rev=10089&r1=10088&r2=10089&view=diff
==============================================================================
--- 1.3/specific_fns/jw_mapping.py (original)
+++ 1.3/specific_fns/jw_mapping.py Mon Dec 14 11:42:51 2009
@@ -339,7 +339,7 @@
         for spin in spin_loop():
             # Check if data exists.
             if not hasattr(spin, 'relax_data'):
-                warn(RelaxDeselectWarning(spin_id, 'relaxation data is 
missing'))
+                warn(RelaxDeselectWarning(spin_id, 'missing relaxation 
data'))
                 spin.select = False
 
             # Require 3 or more data points.

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=10089&r1=10088&r2=10089&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Mon Dec 14 11:42:51 2009
@@ -2028,7 +2028,7 @@
         for spin, spin_id in spin_loop(return_id=True):
             # Relaxation data must exist!
             if not hasattr(spin, 'relax_data'):
-                warn(RelaxDeselectWarning(spin_id, 'relaxation data is 
missing'))
+                warn(RelaxDeselectWarning(spin_id, 'missing relaxation 
data'))
                 spin.select = False
 
             # Require 3 or more relaxation data points.
@@ -2043,10 +2043,10 @@
 
             # Test for structural data if required.
             elif need_vect and not hasattr(spin, 'xh_vect'):
-                warn(RelaxDeselectWarning(spin_id, 'structural data 
missing'))
+                warn(RelaxDeselectWarning(spin_id, 'missing structural 
data'))
                 spin.select = False
             elif need_vect and spin.xh_vect == None:
-                warn(RelaxDeselectWarning(spin_id, 'structural data 
missing'))
+                warn(RelaxDeselectWarning(spin_id, 'missing structural 
data'))
                 spin.select = False
 
 

Modified: 1.3/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=10089&r1=10088&r2=10089&view=diff
==============================================================================
--- 1.3/specific_fns/relax_fit.py (original)
+++ 1.3/specific_fns/relax_fit.py Mon Dec 14 11:42:51 2009
@@ -852,7 +852,7 @@
         for spin in spin_loop():
             # Check if data exists.
             if not hasattr(spin, 'intensities'):
-                warn(RelaxDeselectWarning(spin_id, 'intensity data is 
missing'))
+                warn(RelaxDeselectWarning(spin_id, 'missing intensity data'))
                 spin.select = False
 
             # Require 3 or more data points.