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

Author: bugman
Date: Thu Oct  2 13:30:04 2008
New Revision: 7489

URL: http://svn.gna.org/viewcvs/relax?rev=7489&view=rev
Log:
Variable name clash bug fix 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=7489&r1=7488&r2=7489&view=diff
==============================================================================
--- branches/pipe_refs/generic_fns/structure/internal.py (original)
+++ branches/pipe_refs/generic_fns/structure/internal.py Thu Oct  2 13:30:04 
2008
@@ -861,7 +861,7 @@
             name = name + "_" + `model`
 
         # Use pointers (references) if the PDB data exists in another pipe.
-        for data_pipe, name in pipes.pipe_loop(name=True):
+        for data_pipe, pipe_name in pipes.pipe_loop(name=True):
             # Structure exists.
             if hasattr(data_pipe, 'structure'):
                 # Loop over the structures.
@@ -872,7 +872,7 @@
 
                         # Print out.
                         if verbosity:
-                            print "Using the structures from the data pipe " 
+ `name` + "."
+                            print "Using the structures from the data pipe " 
+ `pipe_name` + "."
                             print self.structural_data[i]
 
                         # Exit this function.

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=7489&r1=7488&r2=7489&view=diff
==============================================================================
--- branches/pipe_refs/generic_fns/structure/scientific.py (original)
+++ branches/pipe_refs/generic_fns/structure/scientific.py Thu Oct  2 
13:30:04 2008
@@ -547,7 +547,7 @@
             name = name + "_" + `model`
 
         # Use pointers (references) if the PDB data exists in another data 
pipe.
-        for data_pipe, name in pipes.pipe_loop(name=True):
+        for data_pipe, pipe_name in pipes.pipe_loop(name=True):
             # Structure exists.
             if hasattr(data_pipe, 'structure'):
                 # Loop over the structures.
@@ -558,7 +558,7 @@
 
                         # Print out.
                         if verbosity:
-                            print "Using the structures from the data pipe " 
+ `name` + "."
+                            print "Using the structures from the data pipe " 
+ `pipe_name` + "."
                             print self.structural_data[i]
 
                         # Exit this function.