r7475 - in /branches/pipe_refs/generic_fns/structure: internal.py scientific.py -- October 01, 2008 - 13:46

Author: bugman
Date: Wed Oct  1 13:46:39 2008
New Revision: 7475

URL: http://svn.gna.org/viewcvs/relax?rev=7475&view=rev
Log:
The structure objects now use the pipe_loop() in their load_pdb() methods.


Modified:
    branches/pipe_refs/generic_fns/structure/internal.py
    branches/pipe_refs/generic_fns/structure/scientific.py

Modified: branches/pipe_refs/generic_fns/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/pipe_refs/generic_fns/structure/internal.py?rev=7475&r1=7474&r2=7475&view=diff
==============================================================================
--- branches/pipe_refs/generic_fns/structure/internal.py (original)
+++ branches/pipe_refs/generic_fns/structure/internal.py Wed Oct  1 13:46:39 
2008
@@ -33,7 +33,6 @@
 
 # relax module imports.
 from api_base import Base_struct_API
-from data import Relax_data_store; ds = Relax_data_store()
 from generic_fns import pipes, relax_re
 from generic_fns.mol_res_spin import Selection
 from relax_errors import RelaxError
@@ -861,14 +860,7 @@
             name = name + "_" + `model`
 
         # Use pointers (references) if the PDB data exists in another pipe.
-        for key in ds:
-            # Skip the current pipe.
-            if key == pipes.cdp_name():
-                continue
-
-            # Get the data pipe.
-            data_pipe = pipes.get_pipe(key)
-
+        for data_pipe in pipes.pipe_loop():
             # Structure exists.
             if hasattr(data_pipe, 'structure'):
                 # Loop over the structures.

Modified: branches/pipe_refs/generic_fns/structure/scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/pipe_refs/generic_fns/structure/scientific.py?rev=7475&r1=7474&r2=7475&view=diff
==============================================================================
--- branches/pipe_refs/generic_fns/structure/scientific.py (original)
+++ branches/pipe_refs/generic_fns/structure/scientific.py Wed Oct  1 
13:46:39 2008
@@ -37,7 +37,6 @@
 
 # relax module imports.
 from api_base import Base_struct_API
-from data import Relax_data_store; ds = Relax_data_store()
 from generic_fns import pipes, relax_re
 from generic_fns.mol_res_spin import Selection, parse_token, tokenise
 from relax_errors import RelaxError, RelaxPdbLoadError
@@ -548,14 +547,7 @@
             name = name + "_" + `model`
 
         # Use pointers (references) if the PDB data exists in another data 
pipe.
-        for key in ds:
-            # Skip the current pipe.
-            if key == pipes.cdp_name():
-                continue
-
-            # Get the data pipe.
-            data_pipe = pipes.get_pipe(key)
-
+        for data_pipe in pipes.pipe_loop():
             # Structure exists.
             if hasattr(data_pipe, 'structure'):
                 # Loop over the structures.