r8163 - /branches/ave_noe/prompt/noe.py -- December 08, 2008 - 16:46

Author: bugman
Date: Mon Dec  8 16:46:53 2008
New Revision: 8163

URL: http://svn.gna.org/viewcvs/relax?rev=8163&view=rev
Log:
The noe.read_constraints() user function now calls 
generic_fns.noesy.read_constraints().

The noe user functions need not all point to the specific NOE object!  Maybe 
later the steady-state
NOE can be separated from the NOESY, but for now it isn't too illogical for 
both to be in the same
user function class.


Modified:
    branches/ave_noe/prompt/noe.py

Modified: branches/ave_noe/prompt/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/ave_noe/prompt/noe.py?rev=8163&r1=8162&r2=8163&view=diff
==============================================================================
--- branches/ave_noe/prompt/noe.py (original)
+++ branches/ave_noe/prompt/noe.py Mon Dec  8 16:46:53 2008
@@ -29,6 +29,7 @@
 
 # relax module imports.
 import help
+from generic_fns import noesy
 from relax_errors import RelaxNoneIntError, RelaxNoneStrError, RelaxStrError
 from specific_fns.setup import noe_obj
 
@@ -131,7 +132,7 @@
             raise RelaxNoneStrError, ('column separator', sep)
 
         # Execute the functional code.
-        noe_obj.read_constraints(frq=frq, file=file, dir=dir, 
proton1_col=proton1_col, proton2_col=proton2_col, lower_col=lower_col, 
upper_col=upper_col, sep=sep)
+        noesy.read_constraints(frq=frq, file=file, dir=dir, 
proton1_col=proton1_col, proton2_col=proton2_col, lower_col=lower_col, 
upper_col=upper_col, sep=sep)
 
 
     def spectrum_type(self, spectrum_type=None, spectrum_id=None):