r20607 - /branches/peak_intensities/lib/software/sparky.py -- August 16, 2013 - 18:44

Author: bugman
Date: Fri Aug 16 18:44:54 2013
New Revision: 20607

URL: http://svn.gna.org/viewcvs/relax?rev=20607&view=rev
Log:
Fix for the assignment handling in the lib.software.sparky.read_peak_list() 
function.

The first element is usually the indirect dimension or w2.


Modified:
    branches/peak_intensities/lib/software/sparky.py

Modified: branches/peak_intensities/lib/software/sparky.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_intensities/lib/software/sparky.py?rev=20607&r1=20606&r2=20607&view=diff
==============================================================================
--- branches/peak_intensities/lib/software/sparky.py (original)
+++ branches/peak_intensities/lib/software/sparky.py Fri Aug 16 18:44:54 2013
@@ -65,18 +65,12 @@
     # Loop over the file data.
     data = []
     for line in file_data:
-        # The Sparky assignment.
-        assignment = ''
-        name1 = ''
-        name2 = ''
-        intensity = ''
-
         # Skip non-assigned peaks.
         if line[0] == '?-?':
             continue
 
         # First split by the 2D separator.
-        assign1, assign2 = split('-', line[0])
+        assign2, assign1 = split('-', line[0])
 
         # The assignment of the first dimension.
         row1 = split('([A-Z]+)', assign1)
@@ -88,7 +82,7 @@
 
         # The residue number.
         try:
-            res_num = int(row1[-3])
+            res_num = int(row2[-3])
         except:
             raise RelaxError("Improperly formatted Sparky file, cannot 
process the assignment '%s'." % line[0])