r17403 - /trunk/generic_fns/spectrum.py -- August 31, 2012 - 22:05

Author: bugman
Date: Fri Aug 31 22:05:56 2012
New Revision: 17403

URL: http://svn.gna.org/viewcvs/relax?rev=17403&view=rev
Log:
Bug fix for the loading of peak intensities via spectrum.read_intensities.

The user function could not be applied twice, preventing the loading of data 
from different spin
systems such as Trp indole NH data.


Modified:
    trunk/generic_fns/spectrum.py

Modified: trunk/generic_fns/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/spectrum.py?rev=17403&r1=17402&r2=17403&view=diff
==============================================================================
--- trunk/generic_fns/spectrum.py (original)
+++ trunk/generic_fns/spectrum.py Fri Aug 31 22:05:56 2012
@@ -1103,9 +1103,7 @@
         cdp.spectrum_ids = []
         if ncproc != None:
             cdp.ncproc = {}
-    if spectrum_id in cdp.spectrum_ids:
-        raise RelaxError("The spectrum identification string '%s' already 
exists." % spectrum_id)
-    else:
+    if not spectrum_id in cdp.spectrum_ids:
         cdp.spectrum_ids.append(spectrum_id)
         if ncproc != None:
             cdp.ncproc[spectrum_id] = ncproc