r15254 - /1.3/specific_fns/consistency_tests.py -- January 26, 2012 - 08:48

Author: bugman
Date: Thu Jan 26 08:48:20 2012
New Revision: 15254

URL: http://svn.gna.org/viewcvs/relax?rev=15254&view=rev
Log:
Bug fix for the consistency testing analysis for when relaxation data of None 
is encountered.

This matches the changes of r15247 for the J(w) mapping analysis.


Modified:
    1.3/specific_fns/consistency_tests.py

Modified: 1.3/specific_fns/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/consistency_tests.py?rev=15254&r1=15253&r2=15254&view=diff
==============================================================================
--- 1.3/specific_fns/consistency_tests.py (original)
+++ 1.3/specific_fns/consistency_tests.py Thu Jan 26 08:48:20 2012
@@ -336,9 +336,17 @@
                 spin.select = False
 
             # Require 3 or more data points.
-            elif len(spin.ri_data) < 3:
-                warn(RelaxDeselectWarning(spin_id, 'insufficient relaxation 
data, 3 or more data points are required'))
-                spin.select = False
+            else:
+                # Count the points.
+                data_points = 0
+                for id in cdp.ri_ids:
+                    if spin.ri_data.has_key(id) and spin.ri_data[id] != None:
+                        data_points += 1
+
+                # Not enough.
+                if data_points < 3:
+                    warn(RelaxDeselectWarning(spin_id, 'insufficient 
relaxation data, 3 or more data points are required'))
+                    spin.select = False
 
 
     return_data_name_doc = """