[prev in list] [next in list] [prev in thread] [next in thread] 

List:       relax-commits
Subject:    r3290 - /1.3/specific_fns/relax_data.py
From:       edward () domain ! hid
Date:       2007-05-08 22:50:46
Message-ID: E1HlYW6-000670-IB () subversion ! gna ! org
[Download RAW message or body]

Author: bugman
Date: Wed May  9 00:50:45 2007
New Revision: 3290

URL: http://svn.gna.org/viewcvs/relax?rev=3290&view=rev
Log:
Manually ported the relevent part of r3288 (the fix to bug #9101 (https://gna.org/bugs/?9101)).

The changes to errors.py and specific_fns/model_free.py were not ported.

.....
 r3288 | bugman | 2007-05-08 23:48:05 +0200 (Tue, 08 May 2007) | 6 lines
 Changed paths:
    M /1.2/errors.py
    M /1.2/specific_fns/model_free.py
    M /1.2/specific_fns/relax_data.py

 Fix for bug #9101 (https://gna.org/bugs/?9101).

 The relax_data.read() user function was failing when the data or error column contained the text
 'None' which is the default output for deselected spin systems in the exponential curve fitting
 component of relax.  This is now fixed.
.....



Modified:
    1.3/specific_fns/relax_data.py

Modified: 1.3/specific_fns/relax_data.py
URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_data.py?rev=3290&r1=3289&r2=3290&view=diff
==============================================================================
--- 1.3/specific_fns/relax_data.py (original)
+++ 1.3/specific_fns/relax_data.py Wed May  9 00:50:45 2007
@@ -586,6 +586,8 @@
                 # Skip missing data.
                 if len(file_data[i]) <= min_col_num:
                     continue
+                elif file_data[i][data_col] == 'None' or file_data[i][error_col] == 'None':
+                    continue
 
                 # Test that the data are numbers.
                 try:



[prev in list] [next in list] [prev in thread] [next in thread]