r7462 - /branches/pipe_refs/sample_scripts/full_analysis.py -- September 30, 2008 - 17:41

Author: bugman
Date: Tue Sep 30 17:41:41 2008
New Revision: 7462

URL: http://svn.gna.org/viewcvs/relax?rev=7462&view=rev
Log:
Removed the dependence on the relax data store by using the pipes API.


Modified:
    branches/pipe_refs/sample_scripts/full_analysis.py

Modified: branches/pipe_refs/sample_scripts/full_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/pipe_refs/sample_scripts/full_analysis.py?rev=7462&r1=7461&r2=7462&view=diff
==============================================================================
--- branches/pipe_refs/sample_scripts/full_analysis.py (original)
+++ branches/pipe_refs/sample_scripts/full_analysis.py Tue Sep 30 17:41:41 
2008
@@ -112,7 +112,6 @@
 from string import lower
 
 # relax module imports.
-from data import Relax_data_store; ds = Relax_data_store()
 from float import floatAsByteArray
 from generic_fns.mol_res_spin import generate_spin_id, spin_index_loop, 
spin_loop
 from generic_fns import pipes
@@ -547,7 +546,7 @@
         """Function for loading the optimised diffusion tensor."""
 
         # Create the data pipe for the previous data (deleting the old data 
pipe first if necessary).
-        if ds.has_key('previous'):
+        if pipes.has_pipe('previous'):
             pipe.delete('previous')
         pipe.create('previous', 'mf')
 
@@ -567,7 +566,7 @@
         eliminate()
 
         # Model selection (delete the model selection pipe if it already 
exists).
-        if ds.has_key(modsel_pipe):
+        if pipes.has_pipe(modsel_pipe):
             pipe.delete(modsel_pipe)
         model_selection(method='AIC', modsel_pipe=modsel_pipe, 
pipes=self.pipes)
 
@@ -588,7 +587,7 @@
         # Loop over the data pipes.
         for name in self.pipes:
             # Create the data pipe.
-            if ds.has_key(name):
+            if pipes.has_pipe(name):
                 pipe.delete(name)
             pipe.create(name, 'mf')