r7891 - /branches/spectral_errors/prompt/spectrum.py -- October 21, 2008 - 16:53

Author: bugman
Date: Tue Oct 21 16:53:04 2008
New Revision: 7891

URL: http://svn.gna.org/viewcvs/relax?rev=7891&view=rev
Log:
Switched from calls to noe_obj to generic_fns.intensity.


Modified:
    branches/spectral_errors/prompt/spectrum.py

Modified: branches/spectral_errors/prompt/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/prompt/spectrum.py?rev=7891&r1=7890&r2=7891&view=diff
==============================================================================
--- branches/spectral_errors/prompt/spectrum.py (original)
+++ branches/spectral_errors/prompt/spectrum.py Tue Oct 21 16:53:04 2008
@@ -26,7 +26,7 @@
 # relax module imports.
 import help
 from relax_errors import RelaxNoneIntError, RelaxNoneIntStrError, 
RelaxNoneStrError, RelaxNumError, RelaxStrError
-from specific_fns.setup import noe_obj
+from generic_fns import intensity
 
 
 class Spectrum:
@@ -84,7 +84,7 @@
             raise RelaxNoneStrError, ('spin identification string', spin_id)
 
         # Execute the functional code.
-        noe_obj.set_error(error=error, spectrum_id=spectrum_id, 
spin_id=spin_id)
+        intensity.set_error(error=error, spectrum_id=spectrum_id, 
spin_id=spin_id)
 
 
     def read_intensities(self, file=None, dir=None, spectrum_id=None, 
heteronuc='N', proton='HN', int_col=None):
@@ -193,4 +193,4 @@
             raise RelaxNoneIntError, ('intensity column', int_col)
 
         # Execute the functional code.
-        noe_obj.read(file=file, dir=dir, spectrum_id=spectrum_id, 
heteronuc=heteronuc, proton=proton, int_col=int_col)
+        intensity.read(file=file, dir=dir, spectrum_id=spectrum_id, 
heteronuc=heteronuc, proton=proton, int_col=int_col)