r14758 - /1.3/generic_fns/spectrum.py -- September 26, 2011 - 17:17

Author: bugman
Date: Mon Sep 26 17:17:35 2011
New Revision: 14758

URL: http://svn.gna.org/viewcvs/relax?rev=14758&view=rev
Log:
The spectrum.read_intensities user function now throws a RelaxError if no 
data was loaded.

This is to tell the user that something went wrong, and makes more sense in 
the GUI mode.


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=14758&r1=14757&r2=14758&view=diff
==============================================================================
--- 1.3/generic_fns/spectrum.py (original)
+++ 1.3/generic_fns/spectrum.py Mon Sep 26 17:17:35 2011
@@ -1085,6 +1085,7 @@
             cdp.ncproc[spectrum_id] = ncproc
 
     # Loop over the peak intensity data.
+    data_flag = False
     for i in xrange(len(intensity_data)):
         # Extract the data.
         H_name, X_name, spin_id, intensity = intensity_data[i]
@@ -1114,6 +1115,13 @@
 
         # Add the data.
         spin.intensities[spectrum_id] = intensity
+
+        # Switch the flag.
+        data_flag = True
+
+    # No data.
+    if not data_flag:
+        raise RelaxError("No data could be loaded from the peak list")
 
 
 def replicated(spectrum_ids=None):