r13683 - /1.3/generic_fns/spectrum.py -- July 18, 2011 - 14:00

Author: bugman
Date: Mon Jul 18 14:00:29 2011
New Revision: 13683

URL: http://svn.gna.org/viewcvs/relax?rev=13683&view=rev
Log:
Bug fix for the spectrum.read_intensities int_method argument for volumes.

Volume integration should be called 'point sum', but the back end code was 
checking against the
string 'volume'.


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=13683&r1=13682&r2=13683&view=diff
==============================================================================
--- 1.3/generic_fns/spectrum.py (original)
+++ 1.3/generic_fns/spectrum.py Mon Jul 18 14:00:29 2011
@@ -632,7 +632,7 @@
             __errors_height_no_repl()
 
     # Peak volume category.
-    if cdp.int_method == 'volume':
+    if cdp.int_method == 'point sum':
         # Print out.
         print("Intensity measure:  Peak volumes.")
 
@@ -1034,8 +1034,8 @@
         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)
+    if not int_method in ['height', 'point sum', 'other']:
+        raise RelaxError("The intensity measure '%s' is not one of 'height', 
'point sum', 'other'." % int_method)
 
     # Set the peak intensity measure.
     cdp.int_method = int_method