r7905 - /branches/spectral_errors/prompt/spectrum.py -- October 22, 2008 - 11:20

Author: bugman
Date: Wed Oct 22 11:20:10 2008
New Revision: 7905

URL: http://svn.gna.org/viewcvs/relax?rev=7905&view=rev
Log:
Modified the int_col arg to spectrum.read_intensities() to allow for lists of 
integers.


Modified:
    branches/spectral_errors/prompt/spectrum.py

Modified: branches/spectral_errors/prompt/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/prompt/spectrum.py?rev=7905&r1=7904&r2=7905&view=diff
==============================================================================
--- branches/spectral_errors/prompt/spectrum.py (original)
+++ branches/spectral_errors/prompt/spectrum.py Wed Oct 22 11:20:10 2008
@@ -25,7 +25,7 @@
 
 # relax module imports.
 import help
-from relax_errors import RelaxNoneIntError, RelaxNoneIntStrError, 
RelaxNoneStrError, RelaxNumError, RelaxStrError
+from relax_errors import RelaxListIntError, RelaxNoneIntError, 
RelaxNoneIntListIntError, RelaxNoneStrError, RelaxNumError, RelaxStrError
 from generic_fns import spectrum
 
 
@@ -371,8 +371,18 @@
             raise RelaxStrError, ('proton name', proton)
 
         # The intensity column.
-        if int_col and type(int_col) != int:
-            raise RelaxNoneIntError, ('intensity column', int_col)
+        if int_col != None and type(int_col) != int and type(int_col) != 
list:
+            raise RelaxNoneIntListIntError, ('intensity column', int_col)
+        if type(int_col) == list:
+            # Empty list.
+            if int_col == []:
+                raise RelaxListIntError, ('intensity column', int_col)
+
+            # Check the values.
+            for i in xrange(len(int_col)):
+                if type(int_col[i]) != int:
+                    raise RelaxListIntError, ('intensity column', int_col)
+
 
         # Molecule name column.
         if mol_name_col != None and type(mol_name_col) != int: