r22121 - in /branches/double_rotor: ./ specific_analyses/noe/main.py -- February 04, 2014 - 16:05

Author: bugman
Date: Tue Feb  4 16:05:41 2014
New Revision: 22121

URL: http://svn.gna.org/viewcvs/relax?rev=22121&view=rev
Log:
Merged revisions 22117 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r22117 | bugman | 2014-02-04 15:46:47 +0100 (Tue, 04 Feb 2014) | 9 lines
  
  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:
    branches/double_rotor/   (props changed)
    branches/double_rotor/specific_analyses/noe/main.py

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb  4 16:05:41 2014
@@ -1,1 +1,1 @@
-/trunk:1-22112,22115-22116
+/trunk:1-22112,22115-22117

Modified: branches/double_rotor/specific_analyses/noe/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/noe/main.py?rev=22121&r1=22120&r2=22121&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/noe/main.py (original)
+++ branches/double_rotor/specific_analyses/noe/main.py Tue Feb  4 16:05:41 
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