r20514 - /trunk/pipe_control/spectrum.py -- August 02, 2013 - 20:59

Author: bugman
Date: Fri Aug  2 20:59:00 2013
New Revision: 20514

URL: http://svn.gna.org/viewcvs/relax?rev=20514&view=rev
Log:
Moved checks for matching length of spectrum IDs and intensities 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=20514&r1=20513&r2=20514&view=diff
==============================================================================
--- trunk/pipe_control/spectrum.py (original)
+++ trunk/pipe_control/spectrum.py Fri Aug  2 20:59:00 2013
@@ -672,10 +672,6 @@
             for i in range(nr_int_col):
                 spectrum_id.append('Z_A%s'%i)
 
-        # 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.
@@ -744,6 +740,10 @@
         if not isinstance(spectrum_id, list):
             spectrum_id = [spectrum_id]
 
+        # Checks for matching length of spectrum IDs and intensities columns.
+        if len(spectrum_id) != len(intensity):
+            raise RelaxError("The spectrum ID list %s has a different number 
of elements to the intensity column list %s." % (spectrum_id, nr_int_col))
+
         # Loop over the data.
         for i in range(len(intensity)):
             # Sanity check.