r13685 - in /branches/gui_testing: ./ generic_fns/spectrum.py -- July 18, 2011 - 14:14

Author: bugman
Date: Mon Jul 18 14:14:14 2011
New Revision: 13685

URL: http://svn.gna.org/viewcvs/relax?rev=13685&view=rev
Log:
Merged revisions 13683 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r13683 | bugman | 2011-07-18 14:00:29 +0200 (Mon, 18 Jul 2011) | 6 lines
  
  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:
    branches/gui_testing/   (props changed)
    branches/gui_testing/generic_fns/spectrum.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jul 18 14:14:14 2011
@@ -1,1 +1,1 @@
-/1.3:1-13660
+/1.3:1-13684

Modified: branches/gui_testing/generic_fns/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/spectrum.py?rev=13685&r1=13684&r2=13685&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/spectrum.py (original)
+++ branches/gui_testing/generic_fns/spectrum.py Mon Jul 18 14:14:14 2011
@@ -578,7 +578,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.")
 
@@ -980,8 +980,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