r6338 - in /branches/relax_data_rearrange: prompt/relax_data.py specific_fns/model_free/results.py -- June 08, 2008 - 13:37

Author: bugman
Date: Sun Jun  8 13:37:28 2008
New Revision: 6338

URL: http://svn.gna.org/viewcvs/relax?rev=6338&view=rev
Log:
Fixed the relax_data imports again.


Modified:
    branches/relax_data_rearrange/prompt/relax_data.py
    branches/relax_data_rearrange/specific_fns/model_free/results.py

Modified: branches/relax_data_rearrange/prompt/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data_rearrange/prompt/relax_data.py?rev=6338&r1=6337&r2=6338&view=diff
==============================================================================
--- branches/relax_data_rearrange/prompt/relax_data.py (original)
+++ branches/relax_data_rearrange/prompt/relax_data.py Sun Jun  8 13:37:28 
2008
@@ -25,7 +25,7 @@
 
 # relax module imports.
 import help
-from generic_fns.relax_data import relax_data
+from generic_fns import relax_data
 from relax_errors import RelaxBinError, RelaxFloatError, RelaxIntError, 
RelaxNoneIntError, RelaxNoneStrError, RelaxStrError
 
 

Modified: branches/relax_data_rearrange/specific_fns/model_free/results.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data_rearrange/specific_fns/model_free/results.py?rev=6338&r1=6337&r2=6338&view=diff
==============================================================================
--- branches/relax_data_rearrange/specific_fns/model_free/results.py 
(original)
+++ branches/relax_data_rearrange/specific_fns/model_free/results.py Sun Jun  
8 13:37:28 2008
@@ -35,7 +35,7 @@
 from data import Relax_data_store; ds = Relax_data_store()
 import generic_fns
 from generic_fns.mol_res_spin import generate_spin_id, return_spin, spin_loop
-from generic_fns.relax_data import relax_data
+from generic_fns.relax_data import add_data_to_spin
 from relax_errors import RelaxError, RelaxInvalidDataError
 
 
@@ -823,7 +823,7 @@
             sim = False
 
         # Add the relaxation data.
-        relax_data.add_data_to_spin(spin=return_spin(spin_id), 
ri_labels=ri_labels, remap_table=remap_table, frq_labels=frq_labels, frq=frq, 
values=values, errors=errors, sim=sim)
+        add_data_to_spin(spin=return_spin(spin_id), ri_labels=ri_labels, 
remap_table=remap_table, frq_labels=frq_labels, frq=frq, values=values, 
errors=errors, sim=sim)
 
 
     def read_columnar_results(self, file_data, verbosity=1):