r2706 - /1.2/specific_fns/relax_data.py -- October 31, 2006 - 08:27

Author: bugman
Date: Tue Oct 31 08:27:04 2006
New Revision: 2706

URL: http://svn.gna.org/viewcvs/relax?rev=2706&view=rev
Log:
Fix for bug #7583 (https://gna.org/bugs/?7583).

The problem was to statements 'if len(file_data[i]) != 4:' followed by 
'continue'.  These tests were
to avoid lines which contain no data, however it causes failures if there are 
not exactly for
columns!  Now the minimum number of columns, based on the given column 
numbers, is tested for.


Modified:
    1.2/specific_fns/relax_data.py

Modified: 1.2/specific_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/specific_fns/relax_data.py?rev=2706&r1=2705&r2=2706&view=diff
==============================================================================
--- 1.2/specific_fns/relax_data.py (original)
+++ 1.2/specific_fns/relax_data.py Tue Oct 31 08:27:04 2006
@@ -549,6 +549,9 @@
         if self.test_labels(run):
             raise RelaxRiError, (self.ri_label, self.frq_label)
 
+        # Minimum number of columns.
+        min_col_num = max(num_col, name_col, data_col, error_col)
+
         # Extract the data from the file.
         if not file_data:
             # Extract.
@@ -573,7 +576,7 @@
             # Test the validity of the relaxation data.
             for i in xrange(len(file_data)):
                 # Skip missing data.
-                if len(file_data[i]) != 4:
+                if len(file_data[i]) <= min_col_num:
                     continue
 
                 # Test that the data are numbers.
@@ -610,7 +613,7 @@
         # Loop over the relaxation data.
         for i in xrange(len(file_data)):
             # Skip missing data.
-            if len(file_data[i]) != 4:
+            if len(file_data[i]) <= min_col_num:
                 continue
 
             # Convert the data.