r9598 - /1.3/generic_fns/sequence.py -- October 06, 2009 - 18:40

Author: bugman
Date: Tue Oct  6 18:40:24 2009
New Revision: 9598

URL: http://svn.gna.org/viewcvs/relax?rev=9598&view=rev
Log:
Fix for the validate_sequence().

The shifted column numbers were not being taken into account.


Modified:
    1.3/generic_fns/sequence.py

Modified: 1.3/generic_fns/sequence.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/sequence.py?rev=9598&r1=9597&r2=9598&view=diff
==============================================================================
--- 1.3/generic_fns/sequence.py (original)
+++ 1.3/generic_fns/sequence.py Tue Oct  6 18:40:24 2009
@@ -284,6 +284,7 @@
     # Generate the sequence.
     for id in read_spin_data_file(file=file, dir=dir, file_data=file_data, 
spin_id_col=spin_id_col, mol_name_col=mol_name_col, res_num_col=res_num_col, 
res_name_col=res_name_col, spin_num_col=spin_num_col, 
spin_name_col=spin_name_col, sep=sep, spin_id=spin_id):
         # Add the spin.
+        print "id:", repr(id)
         generate(*spin_id_to_data_list(id))
 
 
@@ -310,7 +311,7 @@
     # Molecule name data.
     if mol_name_col:
         try:
-            data[mol_name_col]
+            data[mol_name_col-1]
         except IndexError:
             raise RelaxInvalidSeqError(data)
 
@@ -318,20 +319,20 @@
     if res_num_col:
         # No data in column.
         try:
-            data[res_num_col]
+            data[res_num_col-1]
         except IndexError:
             raise RelaxInvalidSeqError(data)
 
         # Bad data in column.
         try:
-            int(data[res_num_col])
+            int(data[res_num_col-1])
         except ValueError:
             raise RelaxInvalidSeqError(data)
 
     # Residue name data.
     if res_name_col:
         try:
-            data[res_name_col]
+            data[res_name_col-1]
         except IndexError:
             raise RelaxInvalidSeqError(data)
 
@@ -339,20 +340,20 @@
     if spin_num_col:
         # No data in column.
         try:
-            data[spin_num_col]
+            data[spin_num_col-1]
         except IndexError:
             raise RelaxInvalidSeqError(data)
 
         # Bad data in column.
         try:
-            int(data[spin_num_col])
+            int(data[spin_num_col-1])
         except ValueError:
             raise RelaxInvalidSeqError(data)
 
     # Spin name data.
     if spin_name_col:
         try:
-            data[spin_name_col]
+            data[spin_name_col-1]
         except IndexError:
             raise RelaxInvalidSeqError(data)