r7490 - in /branches/pipe_refs/generic_fns/structure: internal.py scientific.py -- October 02, 2008 - 13:37

Author: bugman
Date: Thu Oct  2 13:37:14 2008
New Revision: 7490

URL: http://svn.gna.org/viewcvs/relax?rev=7490&view=rev
Log:
Put back the condition to skip the current data pipe in searching for 
pre-loaded data in load_pdb().


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=7490&r1=7489&r2=7490&view=diff
==============================================================================
--- branches/pipe_refs/generic_fns/structure/internal.py (original)
+++ branches/pipe_refs/generic_fns/structure/internal.py Thu Oct  2 13:37:14 
2008
@@ -862,6 +862,10 @@
 
         # Use pointers (references) if the PDB data exists in another pipe.
         for data_pipe, pipe_name in pipes.pipe_loop(name=True):
+            # Skip the current pipe.
+            if pipe_name = pipes.cdp_name():
+                continue
+
             # 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=7490&r1=7489&r2=7490&view=diff
==============================================================================
--- branches/pipe_refs/generic_fns/structure/scientific.py (original)
+++ branches/pipe_refs/generic_fns/structure/scientific.py Thu Oct  2 
13:37:14 2008
@@ -548,6 +548,10 @@
 
         # Use pointers (references) if the PDB data exists in another data 
pipe.
         for data_pipe, pipe_name in pipes.pipe_loop(name=True):
+            # Skip the current pipe.
+            if pipe_name = pipes.cdp_name():
+                continue
+
             # Structure exists.
             if hasattr(data_pipe, 'structure'):
                 # Loop over the structures.