r8046 - /branches/spectral_errors/generic_fns/spectrum.py -- November 27, 2008 - 17:41

Author: bugman
Date: Thu Nov 27 17:41:34 2008
New Revision: 8046

URL: http://svn.gna.org/viewcvs/relax?rev=8046&view=rev
Log:
Added a check for the value of int_method in the spectrum.read_intensities() 
user function.


Modified:
    branches/spectral_errors/generic_fns/spectrum.py

Modified: branches/spectral_errors/generic_fns/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/generic_fns/spectrum.py?rev=8046&r1=8045&r2=8046&view=diff
==============================================================================
--- branches/spectral_errors/generic_fns/spectrum.py (original)
+++ branches/spectral_errors/generic_fns/spectrum.py Thu Nov 27 17:41:34 2008
@@ -535,6 +535,10 @@
     if hasattr(cdp, 'int_method') and cdp.int_method != int_method:
         raise RelaxError, "The '%s' measure of peak intensities does not 
match '%s' of the previously loaded spectra." % (int_method, cdp.int_method)
 
+    # Check the intensity measure.
+    if not int_method in ['height', 'volume', 'other']:
+        raise RelaxError, "The intensity measure '%s' is not one of 
'height', 'volume', 'other'." % int_method
+
     # Set the peak intensity measure.
     cdp.int_method = int_method