r13750 - in /branches/gui_testing: ./ specific_fns/ specific_fns/model_free/ -- July 19, 2011 - 18:00

Author: bugman
Date: Tue Jul 19 18:00:47 2011
New Revision: 13750

URL: http://svn.gna.org/viewcvs/relax?rev=13750&view=rev
Log:
Merged revisions 13748-13749 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r13748 | bugman | 2011-07-19 17:58:00 +0200 (Tue, 19 Jul 2011) | 5 lines
  
  The relax_fit overfit_deselect() method now skips deselected spins.
  
  This prevents unnecessary warnings about missing data for deselected spins.
........
  r13749 | bugman | 2011-07-19 18:00:13 +0200 (Tue, 19 Jul 2011) | 3 lines
  
  All of the overfit_deselect() methods now skip deselected spins, avoiding 
confusing warnings.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/specific_fns/consistency_tests.py
    branches/gui_testing/specific_fns/jw_mapping.py
    branches/gui_testing/specific_fns/model_free/main.py
    branches/gui_testing/specific_fns/relax_fit.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 19 18:00:47 2011
@@ -1,1 +1,1 @@
-/1.3:1-13743
+/1.3:1-13749

Modified: branches/gui_testing/specific_fns/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/specific_fns/consistency_tests.py?rev=13750&r1=13749&r2=13750&view=diff
==============================================================================
--- branches/gui_testing/specific_fns/consistency_tests.py (original)
+++ branches/gui_testing/specific_fns/consistency_tests.py Tue Jul 19 
18:00:47 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: branches/gui_testing/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/specific_fns/jw_mapping.py?rev=13750&r1=13749&r2=13750&view=diff
==============================================================================
--- branches/gui_testing/specific_fns/jw_mapping.py (original)
+++ branches/gui_testing/specific_fns/jw_mapping.py Tue Jul 19 18:00:47 2011
@@ -316,6 +316,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: branches/gui_testing/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/specific_fns/model_free/main.py?rev=13750&r1=13749&r2=13750&view=diff
==============================================================================
--- branches/gui_testing/specific_fns/model_free/main.py (original)
+++ branches/gui_testing/specific_fns/model_free/main.py Tue Jul 19 18:00:47 
2011
@@ -2021,6 +2021,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'))

Modified: branches/gui_testing/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/specific_fns/relax_fit.py?rev=13750&r1=13749&r2=13750&view=diff
==============================================================================
--- branches/gui_testing/specific_fns/relax_fit.py (original)
+++ branches/gui_testing/specific_fns/relax_fit.py Tue Jul 19 18:00:47 2011
@@ -897,6 +897,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, 'intensities'):
                 warn(RelaxDeselectWarning(spin_id, 'missing intensity data'))