r22117 - /trunk/specific_analyses/noe/main.py -- February 04, 2014 - 15:46

Author: bugman
Date: Tue Feb  4 15:46:47 2014
New Revision: 22117

URL: http://svn.gna.org/viewcvs/relax?rev=22117&view=rev
Log:
Fix for bug #21591 (https://gna.org/bugs/?21591), the complete failure of the 
NOE analysis.

This bug was reported by Martin Ballaschk (https://gna.org/users/mab).

The issue was introduced in the fix for bug #21562 
(https://gna.org/bugs/?21562).  The problem is
that the overfit_deselect() method was deselecting all spins with two data 
points or less rather
than one or less.


Modified:
    trunk/specific_analyses/noe/main.py

Modified: trunk/specific_analyses/noe/main.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/noe/main.py?rev=22117&r1=22116&r2=22117&view=diff
==============================================================================
--- trunk/specific_analyses/noe/main.py (original)
+++ trunk/specific_analyses/noe/main.py Tue Feb  4 15:46:47 2014
@@ -184,7 +184,7 @@
                 continue
 
             # Check for sufficient data.
-            if not len(spin.intensities) > 2:
+            if not len(spin.intensities) >= 2:
                 warn(RelaxDeselectWarning(spin_id, 'insufficient data (less 
than two data points)'))
                 spin.select = False
                 deselect_flag = True
@@ -198,7 +198,7 @@
                 continue
 
             # Check for sufficient errors.
-            if not len(spin.intensity_err) > 2:
+            if not len(spin.intensity_err) >= 2:
                 warn(RelaxDeselectWarning(spin_id, 'missing errors (less 
than two error points)'))
                 spin.select = False
                 deselect_flag = True