r8440 - in /branches/multi_structure/generic_fns/structure: internal.py scientific.py -- January 14, 2009 - 14:50

Author: bugman
Date: Wed Jan 14 14:50:33 2009
New Revision: 8440

URL: http://svn.gna.org/viewcvs/relax?rev=8440&view=rev
Log:
Deletion of commented out code.

This includes the pointers to other structural objects.  These pointers, 
rather than using new
structures could be dangerous additional data is added to the object.  
Therefore this code must be
eliminated.


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

Modified: branches/multi_structure/generic_fns/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_structure/generic_fns/structure/internal.py?rev=8440&r1=8439&r2=8440&view=diff
==============================================================================
--- branches/multi_structure/generic_fns/structure/internal.py (original)
+++ branches/multi_structure/generic_fns/structure/internal.py Wed Jan 14 
14:50:33 2009
@@ -639,40 +639,6 @@
         if set_model_num and type(set_model_num) != list:
             set_model_num = [set_model_num]
 
-        # The ID name.
-        #name = file
-        #if model != None:
-        #    name = name + "_" + `model`
-
-        # 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.
-        #        for i in xrange(data_pipe.structure.num):
-        #            if data_pipe.structure.name[i] == name and 
data_pipe.structure.id == 'internal':
-        #                # Add the structure.
-        #                self.add_struct(name=name, model=model, file=file, 
path=path, str=data_pipe.structure.structural_data[i], 
struct_index=struct_index)
-
-        #                # Print out.
-        #                if verbosity:
-        #                    print "Using the structures from the data pipe 
" + `pipe_name` + "."
-        #                    print self.structural_data[i]
-
-        #                # Exit this function.
-        #                return True
-
-        # Print out.
-        #if verbosity:
-        #    if type(model) == int:
-        #        print "Loading structure " + `model` + " from the PDB file."
-        #    else:
-        #        print "Loading all structures from the PDB file."
-
         # Loop over all models in the PDB file.
         model_index = 0
         for model_num, model_records in self.__parse_models(file_path):

Modified: branches/multi_structure/generic_fns/structure/scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_structure/generic_fns/structure/scientific.py?rev=8440&r1=8439&r2=8440&view=diff
==============================================================================
--- branches/multi_structure/generic_fns/structure/scientific.py (original)
+++ branches/multi_structure/generic_fns/structure/scientific.py Wed Jan 14 
14:50:33 2009
@@ -568,28 +568,6 @@
         if set_model_num and type(set_model_num) != list:
             set_model_num = [set_model_num]
 
-        # 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.
-        #        for i in xrange(data_pipe.structure.num):
-        #            if data_pipe.structure.name[i] == name and 
data_pipe.structure.id == 'scientific' and 
len(data_pipe.structure.structural_data):
-        #                # Add the structure.
-        #                self.add_struct(name=name, model=model, file=file, 
path=path, str=data_pipe.structure.structural_data[i], 
struct_index=struct_index)
-
-        #                # Print out.
-        #                if verbosity:
-        #                    print "Using the structures from the data pipe 
" + `pipe_name` + "."
-        #                    print self.structural_data[i]
-
-        #                # Exit this function.
-        #                return True
-
         # Load the structure i from the PDB file.
         #if type(model) == int:
         #    # Print out.