r20511 - /trunk/pipe_control/spectrum.py -- August 02, 2013 - 20:58

Author: bugman
Date: Fri Aug  2 20:58:55 2013
New Revision: 20511

URL: http://svn.gna.org/viewcvs/relax?rev=20511&view=rev
Log:
Added check for number of supplied spectra ID's and the number of returned 
intensity columns.

Progress sr #3043: (https://gna.org/support/index.php?3043) - support for 
NMRPipe seriesTab format *.ser.

Troels E. Linnet provided this patch. Commit by: tlinset _aaattt_ 
gmail_dot_com

Signed-off-by: Edward d'Auvergne <edward@xxxxxxxxxxxxx>

Modified:
    trunk/pipe_control/spectrum.py

Modified: trunk/pipe_control/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/spectrum.py?rev=20511&r1=20510&r2=20511&view=diff
==============================================================================
--- trunk/pipe_control/spectrum.py (original)
+++ trunk/pipe_control/spectrum.py Fri Aug  2 20:58:55 2013
@@ -663,6 +663,13 @@
         # Extract the data.
         intensity_data = 
nmrpipe.read_list_intensity_seriestab(file_data=file_data, int_col=int_col)
 
+        # Extract the expected number of spectrum ID's.
+        nr_int_col = len(intensity_data[0][3])
+
+        # Checks.
+        if (isinstance(spectrum_id, list) and len(spectrum_id) != 
nr_int_col) or (not isinstance(spectrum_id, list) and nr_int_col > 1):
+            raise RelaxError("The spectrum ID list %s has a different number 
of elements to the intensity column list %s." % (spectrum_id, nr_int_col))
+
         # Convert the residue number to a spin ID.
         for i in range(len(intensity_data)):
             # Generate the spin_id.