r7423 - in /1.3/generic_fns/structure: geometric.py internal.py scientific.py -- September 27, 2008 - 20:07

Author: bugman
Date: Sat Sep 27 20:07:40 2008
New Revision: 7423

URL: http://svn.gna.org/viewcvs/relax?rev=7423&view=rev
Log:
Renamed all __add_struct() methods to add_struct().


Modified:
    1.3/generic_fns/structure/geometric.py
    1.3/generic_fns/structure/internal.py
    1.3/generic_fns/structure/scientific.py

Modified: 1.3/generic_fns/structure/geometric.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/geometric.py?rev=7423&r1=7422&r2=7423&view=diff
==============================================================================
--- 1.3/generic_fns/structure/geometric.py (original)
+++ 1.3/generic_fns/structure/geometric.py Sat Sep 27 20:07:40 2008
@@ -182,7 +182,7 @@
     structure = Internal()
 
     # Add a structure.
-    structure.__add_struct(name='diff_tensor')
+    structure.add_struct(name='diff_tensor')
 
     # Loop over the pipes.
     for pipe_index in xrange(len(pipes)):

Modified: 1.3/generic_fns/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/internal.py?rev=7423&r1=7422&r2=7423&view=diff
==============================================================================
--- 1.3/generic_fns/structure/internal.py (original)
+++ 1.3/generic_fns/structure/internal.py Sat Sep 27 20:07:40 2008
@@ -54,7 +54,7 @@
     id = 'internal'
 
 
-    def __add_struct(self, name=None, model=None, file=None, path=None, 
str=None, struct_index=None):
+    def add_struct(self, name=None, model=None, file=None, path=None, 
str=None, struct_index=None):
         """Add the given structure to the store.
 
         @keyword name:          The structural identifier.
@@ -875,7 +875,7 @@
                 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)
+                        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:
@@ -899,7 +899,7 @@
                 continue
 
             # Add an empty structure.
-            self.__add_struct(name=name, model=model_num, file=file, 
path=path, str=Structure_container(), struct_index=struct_index)
+            self.add_struct(name=name, model=model_num, file=file, 
path=path, str=Structure_container(), struct_index=struct_index)
 
             # Fill the structural data object.
             self.__fill_object_from_pdb(records, struct_index=struct_index)

Modified: 1.3/generic_fns/structure/scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/scientific.py?rev=7423&r1=7422&r2=7423&view=diff
==============================================================================
--- 1.3/generic_fns/structure/scientific.py (original)
+++ 1.3/generic_fns/structure/scientific.py Sat Sep 27 20:07:40 2008
@@ -61,7 +61,7 @@
         Base_struct_API.__init__(self)
 
 
-    def __add_struct(self, name=None, model=None, file=None, path=None, 
str=None, struct_index=None):
+    def add_struct(self, name=None, model=None, file=None, path=None, 
str=None, struct_index=None):
         """Add the given structure to the store.
 
         @keyword name:          The structural identifier.
@@ -562,7 +562,7 @@
                 for i in xrange(data_pipe.structure.num):
                     if data_pipe.structure.name[i] == name and 
data_pipe.structure.id == 'scientific':
                         # 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)
+                        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:
@@ -590,7 +590,7 @@
                 print str
 
             # Add the structure.
-            self.__add_struct(name=name, model=model, file=file, path=path, 
str=str, struct_index=struct_index)
+            self.add_struct(name=name, model=model, file=file, path=path, 
str=str, struct_index=struct_index)
 
 
         # Load all structures.
@@ -623,7 +623,7 @@
                     print str
 
                 # Place the structure in 'self.structural_data'.
-                self.__add_struct(name=name, model=i, file=file, path=path, 
str=str, struct_index=struct_index)
+                self.add_struct(name=name, model=i, file=file, path=path, 
str=str, struct_index=struct_index)
 
                 # Increment i.
                 i = i + 1