r8121 - /1.3/generic_fns/spectrum.py -- December 04, 2008 - 02:46

Author: semor
Date: Thu Dec  4 02:46:41 2008
New Revision: 8121

URL: http://svn.gna.org/viewcvs/relax?rev=8121&view=rev
Log:
Still more for the generic peak intensity support.

The intensity is now returned for the first delay only.

Further work is needed for the code to return all available intensities (for 
the different delays).


Modified:
    1.3/generic_fns/spectrum.py

Modified: 1.3/generic_fns/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/spectrum.py?rev=8121&r1=8120&r2=8121&view=diff
==============================================================================
--- 1.3/generic_fns/spectrum.py (original)
+++ 1.3/generic_fns/spectrum.py Thu Dec  4 02:46:41 2008
@@ -449,15 +449,21 @@
     h_name = ''
     h_name = line[5]
 
-    ## The peak intensity column.
-
-    ## Intensity.
-    #try:
-    #    intensity = float(line[int_col])
-    #except ValueError:
-    #    raise RelaxError, "The peak intensity value " + `intensity` + " 
from the line " + `line` + " is invalid."
-    ## Return the data.
-    #return res_num, h_name, x_name, intensity
+    # Extract intensities.
+    try:
+        intensity = float(line[6])
+    except ValueError:
+        raise RelaxError, "The peak intensity value " + `intensity` + " from 
the line " + `line` + " is invalid."
+
+    print intensity
+
+    #i = 0
+    #while i < num_delays:
+    #    i = i + 1
+    #    intensity = line[i + 5]
+
+    # Return the data.
+    return res_num, h_name, x_name, intensity
 
 
 def intensity_nmrview(line, int_col):