r21314 - /branches/relax_disp/specific_analyses/relax_disp/api.py -- October 29, 2013 - 14:05

Author: bugman
Date: Tue Oct 29 14:05:00 2013
New Revision: 21314

URL: http://svn.gna.org/viewcvs/relax?rev=21314&view=rev
Log:
Fixes for the dispersion specific overfit_deselect() method for when R2eff 
data is read.

This now no longer checks for intensity data but rather R2eff data, as 
intensity data will not be
present if R2eff data is directly read rather than peak intensities.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/api.py

Modified: branches/relax_disp/specific_analyses/relax_disp/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/api.py?rev=21314&r1=21313&r2=21314&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/api.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/api.py Tue Oct 29 
14:05:00 2013
@@ -1132,16 +1132,10 @@
         check_mol_res_spin_data()
 
         # Loop over spin data.
-        for spin, spin_id in spin_loop(return_id=True):
+        for spin, spin_id in spin_loop(return_id=True, skip_desel=True):
             # Check if data exists.
-            if not hasattr(spin, 'intensities'):
-                print("No intensity data could be found, deselecting the 
'%s' spin." % spin_id)
-                spin.select = False
-                continue
-
-            # Require 3 or more data points.
-            if len(spin.intensities) < 3:
-                print("Only %s intensity points could be found but at least 
3 are required, deselecting the '%s' spin." % (len(spin.intensities), 
spin_id))
+            if not hasattr(spin, 'r2eff'):
+                print("No R2eff data could be found, deselecting the '%s' 
spin." % spin_id)
                 spin.select = False
                 continue