r2904 - in /branches/test_suite: generic_fns/ prompt/ -- December 02, 2006 - 05:48

Author: bugman
Date: Sat Dec  2 05:48:23 2006
New Revision: 2904

URL: http://svn.gna.org/viewcvs/relax?rev=2904&view=rev
Log:
Ported r2848 from the 1.3 line.

The command used was:
svn merge -r2847:2848 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3


Added:
    branches/test_suite/generic_fns/structure.py
      - copied unchanged from r2848, 1.3/generic_fns/structure.py
    branches/test_suite/prompt/structure.py
      - copied unchanged from r2848, 1.3/prompt/structure.py
Removed:
    branches/test_suite/generic_fns/pdb.py
    branches/test_suite/prompt/pdb.py
Modified:
    branches/test_suite/generic_fns/main.py
    branches/test_suite/prompt/interpreter.py

Modified: branches/test_suite/generic_fns/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/test_suite/generic_fns/main.py?rev=2904&r1=2903&r2=2904&view=diff
==============================================================================
--- branches/test_suite/generic_fns/main.py (original)
+++ branches/test_suite/generic_fns/main.py Sat Dec  2 05:48:23 2006
@@ -34,7 +34,7 @@
 from monte_carlo import Monte_carlo
 from nuclei import Nuclei
 from palmer import Palmer
-from pdb import PDB
+from structure import Structure
 from pymol import Pymol
 from results import Results
 from runs import Runs
@@ -67,7 +67,7 @@
         self.nuclei = Nuclei(self.relax)
         self.opendx = OpenDX(self.relax)
         self.palmer = Palmer(self.relax)
-        self.pdb = PDB(self.relax)
+        self.structure = Structure(self.relax)
         self.pymol = Pymol(self.relax)
         self.results = Results(self.relax)
         self.runs = Runs(self.relax)

Modified: branches/test_suite/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/test_suite/prompt/interpreter.py?rev=2904&r1=2903&r2=2904&view=diff
==============================================================================
--- branches/test_suite/prompt/interpreter.py (original)
+++ branches/test_suite/prompt/interpreter.py Sat Dec  2 05:48:23 2006
@@ -58,7 +58,7 @@
 from monte_carlo import Monte_carlo
 from noe import Noe
 from palmer import Palmer
-from pdb import PDB
+from structure import Structure
 from pymol import Pymol
 from relax_data import Relax_data
 from relax_fit import Relax_fit
@@ -116,7 +116,7 @@
         self._Monte_carlo = Monte_carlo(relax)
         self._Noe = Noe(relax)
         self._Palmer = Palmer(relax)
-        self._PDB = PDB(relax)
+        self._Structure = Structure(relax)
         self._Pymol = Pymol(relax)
         self._Relax_data = Relax_data(relax)
         self._Relax_fit = Relax_fit(relax)
@@ -174,7 +174,7 @@
         monte_carlo = self._Monte_carlo
         noe = self._Noe
         palmer = self._Palmer
-        pdb = self._PDB
+        structure = self._Structure
         pymol = self._Pymol
         relax_data = self._Relax_data
         relax_fit = self._Relax_fit