r7466 - /branches/pipe_refs/generic_fns/model_selection.py -- September 30, 2008 - 18:09

Author: bugman
Date: Tue Sep 30 18:09:42 2008
New Revision: 7466

URL: http://svn.gna.org/viewcvs/relax?rev=7466&view=rev
Log:
Removed the dependence on the relax data store.


Modified:
    branches/pipe_refs/generic_fns/model_selection.py

Modified: branches/pipe_refs/generic_fns/model_selection.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/pipe_refs/generic_fns/model_selection.py?rev=7466&r1=7465&r2=7466&view=diff
==============================================================================
--- branches/pipe_refs/generic_fns/model_selection.py (original)
+++ branches/pipe_refs/generic_fns/model_selection.py Tue Sep 30 18:09:42 2008
@@ -27,7 +27,6 @@
 from math import log
 
 # relax module imports.
-from data import Relax_data_store; ds = Relax_data_store()
 from pipes import get_type, switch
 from relax_errors import RelaxError, RelaxPipeError
 from specific_fns.setup import get_specific_fn
@@ -116,13 +115,13 @@
     """
 
     # Test if the pipe already exists.
-    if ds.has_key(modsel_pipe):
+    if pipes.has_pipe(modsel_pipe):
         raise RelaxPipeError, modsel_pipe
 
     # Use all pipes.
     if pipes == None:
         # Get all data pipe names from the relax data store.
-        pipes = ds.keys()
+        pipes = pipes.pipe_names()
 
     # Select the model selection technique.
     if method == 'AIC':