r8222 - /branches/multi_structure/test_suite/unit_tests/_specific_fns/_model_free/test_main.py -- December 18, 2008 - 17:03

Author: bugman
Date: Thu Dec 18 17:03:27 2008
New Revision: 8222

URL: http://svn.gna.org/viewcvs/relax?rev=8222&view=rev
Log:
Fixes for 3 model-free unit tests using generic_fns.structure.main.read_pdb().


Modified:
    
branches/multi_structure/test_suite/unit_tests/_specific_fns/_model_free/test_main.py

Modified: 
branches/multi_structure/test_suite/unit_tests/_specific_fns/_model_free/test_main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_structure/test_suite/unit_tests/_specific_fns/_model_free/test_main.py?rev=8222&r1=8221&r2=8222&view=diff
==============================================================================
--- 
branches/multi_structure/test_suite/unit_tests/_specific_fns/_model_free/test_main.py
 (original)
+++ 
branches/multi_structure/test_suite/unit_tests/_specific_fns/_model_free/test_main.py
 Thu Dec 18 17:03:27 2008
@@ -75,7 +75,7 @@
         results.read(file='final_results_trunc_1.3', directory=sys.path[-1] 
+ '/test_suite/shared_data/model_free/OMP')
 
         # Load a structure.
-        structure.main.read_pdb(file='Ap4Aase_res1-12.pdb', dir=sys.path[-1] 
+ '/test_suite/shared_data/structures', model=1, parser='internal')
+        structure.main.read_pdb(file='Ap4Aase_res1-12.pdb', dir=sys.path[-1] 
+ '/test_suite/shared_data/structures', read_model=1, parser='internal')
 
         # Duplicate the data.
         self.inst.duplicate_data('orig', 'new', model_index=0)
@@ -94,7 +94,7 @@
         results.read(file='final_results_trunc_1.3', directory=sys.path[-1] 
+ '/test_suite/shared_data/model_free/OMP')
 
         # Load a structure.
-        structure.main.read_pdb(file='Ap4Aase_res1-12.pdb', dir=sys.path[-1] 
+ '/test_suite/shared_data/structures', model=1, parser='internal')
+        structure.main.read_pdb(file='Ap4Aase_res1-12.pdb', dir=sys.path[-1] 
+ '/test_suite/shared_data/structures', read_model=1, parser='internal')
 
         # Duplicate the data, model by model.
         self.inst.duplicate_data('orig', 'new', model_index=0)
@@ -110,13 +110,13 @@
         results.read(file='final_results_trunc_1.3', directory=sys.path[-1] 
+ '/test_suite/shared_data/model_free/OMP')
 
         # Load a structure.
-        structure.main.read_pdb(file='Ap4Aase_res1-12.pdb', dir=sys.path[-1] 
+ '/test_suite/shared_data/structures', model=1, parser='internal')
+        structure.main.read_pdb(file='Ap4Aase_res1-12.pdb', dir=sys.path[-1] 
+ '/test_suite/shared_data/structures', read_model=1, parser='internal')
 
         # Create a new model-free data pipe.
         ds.add(pipe_name='new', pipe_type='mf')
 
         # Load the structure for the second pipe.
-        structure.main.read_pdb(file='Ap4Aase_res1-12.pdb', dir=sys.path[-1] 
+ '/test_suite/shared_data/structures', model=1, parser='internal')
+        structure.main.read_pdb(file='Ap4Aase_res1-12.pdb', dir=sys.path[-1] 
+ '/test_suite/shared_data/structures', read_model=1, parser='internal')
 
         # Modify the structure.
         dp = pipes.get_pipe('new')