r22089 - in /branches/double_rotor: ./ specific_analyses/noe/main.py -- January 31, 2014 - 10:43

Author: bugman
Date: Fri Jan 31 10:43:43 2014
New Revision: 22089

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

........
  r22088 | bugman | 2014-01-31 10:42:52 +0100 (Fri, 31 Jan 2014) | 10 lines
  
  Fix for bug #21562, the failure of the NOE analysis when spectra are 
replicated.
  
  This bug (https://gna.org/bugs/?21562) was reported by Dhanas Muthu 
(https://gna.org/users/dhanas).
  
  The problem was that the NOE overfit_deselect() method was deselecting all 
spins which do not have
  exactly 2 intensity values.  This is incompatible with replicated spectra 
as the number will be
  greater than two.  The check has been modified to deselect spins only when 
the number of intensity
  values are zero or one (i.e. < 2 rather than != 2).
........

Modified:
    branches/double_rotor/   (props changed)
    branches/double_rotor/specific_analyses/noe/main.py

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 31 10:43:43 2014
@@ -1,1 +1,1 @@
-/trunk:1-22080,22082-22084
+/trunk:1-22080,22082-22084,22088

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=22089&r1=22088&r2=22089&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/noe/main.py (original)
+++ branches/double_rotor/specific_analyses/noe/main.py Fri Jan 31 10:43:43 
2014
@@ -166,14 +166,14 @@
                 continue
 
             # Check for sufficient data.
-            if not hasattr(spin, 'intensities') or not len(spin.intensities) 
== 2:
+            if not hasattr(spin, 'intensities') or not len(spin.intensities) 
> 2:
                 warn(RelaxDeselectWarning(spin_id, 'insufficient data'))
                 spin.select = False
                 deselect_flag = True
                 continue
 
             # Check for sufficient errors.
-            elif not hasattr(spin, 'intensity_err') or not 
len(spin.intensity_err) == 2:
+            elif not hasattr(spin, 'intensity_err') or not 
len(spin.intensity_err) > 2:
                 warn(RelaxDeselectWarning(spin_id, 'missing errors'))
                 spin.select = False
                 deselect_flag = True