r21842 - /trunk/lib/spectrum/sparky.py -- December 06, 2013 - 16:46

Author: tlinnet
Date: Fri Dec  6 16:46:39 2013
New Revision: 21842

URL: http://svn.gna.org/viewcvs/relax?rev=21842&view=rev
Log:
Modified reading of sparky files, when exported from CcpNmr Analysis.

The keyword 'Data' is not present here.

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

Modified:
    trunk/lib/spectrum/sparky.py

Modified: trunk/lib/spectrum/sparky.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/sparky.py?rev=21842&r1=21841&r2=21842&view=diff
==============================================================================
--- trunk/lib/spectrum/sparky.py (original)
+++ trunk/lib/spectrum/sparky.py Fri Dec  6 16:46:39 2013
@@ -71,8 +71,13 @@
             w4_col = i
 
         # The peak height.
-        elif file_data[0][i] == 'Data' and file_data[0][i+1] == 'Height':
+        elif file_data[0][i] == 'Height':
+            # The peak height when exported from CcpNmr Analysis export 
without 'Data'.
             int_col = i
+
+            # The peak height when exported from Sparky.
+            if file_data[0][i-1] == 'Data' and file_data[0][i] == 'Height':
+                int_col = i-1
 
         # The peak volume.
         elif file_data[0][i] == 'Intensity':