r21808 - /trunk/lib/spectrum/nmrpipe.py -- December 06, 2013 - 09:16

Author: tlinnet
Date: Fri Dec  6 09:16:35 2013
New Revision: 21808

URL: http://svn.gna.org/viewcvs/relax?rev=21808&view=rev
Log:
Modified NMRPipe SeriesTab to read residue numbers and name for 
two-dimensional list.

Work in progress for Support Request #3044, 
(https://gna.org/support/index.php?3044) - Load spins from SPARKY list.

Modified:
    trunk/lib/spectrum/nmrpipe.py

Modified: trunk/lib/spectrum/nmrpipe.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/nmrpipe.py?rev=21808&r1=21807&r2=21808&view=diff
==============================================================================
--- trunk/lib/spectrum/nmrpipe.py (original)
+++ trunk/lib/spectrum/nmrpipe.py Fri Dec  6 09:16:35 2013
@@ -109,13 +109,15 @@
 
         # Get the residue number.
         try:
-            res_num = int(row1[-3])
+            res_num1 = int(row1[-3])
+            res_num2 = int(row2[-3])
         except:
             raise RelaxError("Improperly formatted NMRPipe SeriesTab file, 
cannot process the assignment '%s'." % line[0])
 
         # The residue name.
         try:
-            res_name = row1[-4]
+            res_name1 = row1[-4]
+            res_name2 = row2[-4]
         except:
             raise RelaxError("Improperly formatted NMRPipe SeriesTab file, 
cannot process the assignment '%s' for residue name." % line[0])
 
@@ -132,4 +134,4 @@
             raise RelaxError("The peak intensity value %s from the line %s 
is invalid." % (intensity, line))
 
         # Add the assignment to the peak list object.
-        peak_list.add(res_nums=[res_num, res_num], res_names=[res_name, 
res_name], spin_names=[name1, name2], intensity=intensities, 
intensity_name=spectra)
+        peak_list.add(res_nums=[res_num1, res_num2], res_names=[res_name1, 
res_name2], spin_names=[name1, name2], intensity=intensities, 
intensity_name=spectra)