r8119 - /1.3/generic_fns/spectrum.py -- December 04, 2008 - 02:22

Author: semor
Date: Thu Dec  4 02:22:24 2008
New Revision: 8119

URL: http://svn.gna.org/viewcvs/relax?rev=8119&view=rev
Log:
Brought back revision 8096.

The command used was:
svn merge -r8095:8096 .

This was done since r8117 reverted accidentally both r8096 and r8097, while 
only r8097 had to be
reverted.


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=8119&r1=8118&r2=8119&view=diff
==============================================================================
--- 1.3/generic_fns/spectrum.py (original)
+++ 1.3/generic_fns/spectrum.py Thu Dec  4 02:22:24 2008
@@ -424,8 +424,40 @@
     @raises RelaxError: When the expected peak intensity is not a float.
     """
 
-
-    # Not implemented yet...
+    # Determine the number of delays (and associated intensities).
+    i = 5
+    while 1:
+        i = i + 1
+        try:
+            current_field = line[i-1]
+        except:
+            num_delays = int(i - 6)
+            if num_delays == 0:
+                raise RelaxError, "Generic file with no associated delays 
(and intensities)."
+            break
+
+    # The residue number.
+    res_num = ''
+    try:
+        res_num = int(line[1])
+    except:
+        raise RelaxError, "Improperly formatted generic file."
+
+    # Nuclei names.
+    x_name = ''
+    x_name = line[4]
+    #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
 
 
 def intensity_nmrview(line, int_col):