r12846 - /1.3/generic_fns/structure/scientific.py -- June 03, 2011 - 17:51

Author: bugman
Date: Fri Jun  3 17:51:24 2011
New Revision: 12846

URL: http://svn.gna.org/viewcvs/relax?rev=12846&view=rev
Log:
Modified the Scientific python PDB reader relax module to use the internal 
module.


Modified:
    1.3/generic_fns/structure/scientific.py

Modified: 1.3/generic_fns/structure/scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/scientific.py?rev=12846&r1=12845&r2=12846&view=diff
==============================================================================
--- 1.3/generic_fns/structure/scientific.py (original)
+++ 1.3/generic_fns/structure/scientific.py Fri Jun  3 17:51:24 2011
@@ -31,8 +31,7 @@
 from numpy import array, dot, float64, zeros
 import os
 from os import F_OK, access, sep
-if dep_check.scientific_pdb_module:
-    import Scientific.IO.PDB
+from extern.scientific_python.IO import PDB
 import sys
 from warnings import warn
 
@@ -57,7 +56,7 @@
 
         # Test for the PDB parser availability.
         if not dep_check.scientific_pdb_module:
-            raise RelaxError("The Scientific python PDB module 
Scientific.IO.PDB could not be imported.")
+            raise RelaxError("The Scientific python PDB module 
scientific_python.IO.PDB could not be imported.")
 
         # Execute the base class __init__() method.
         Base_struct_API.__init__(self)
@@ -542,12 +541,12 @@
                     continue
 
             # Load the PDB file.
-            model = Scientific.IO.PDB.Structure(file_path, model_num)
+            model = PDB.Structure(file_path, model_num)
 
             # No model 1.
             if not len(model) and not len(mol_conts):
                 # Load the PDB without a model number.
-                model = Scientific.IO.PDB.Structure(file_path)
+                model = PDB.Structure(file_path)
                 model_flag = False
 
                 # Ok, nothing is loadable from this file.
@@ -688,7 +687,7 @@
                 return
 
         # Load the PDB file.
-        model = Scientific.IO.PDB.Structure(file_path, self.file_model)
+        model = PDB.Structure(file_path, self.file_model)
 
         # Print out.
         print(("\n" + repr(model)))