r5297 - /1.3/prompt/structure.py -- April 04, 2008 - 14:48

Author: bugman
Date: Fri Apr  4 14:48:57 2008
New Revision: 5297

URL: http://svn.gna.org/viewcvs/relax?rev=5297&view=rev
Log:
Fixed all the 'structure' user functions to use the new package.


Modified:
    1.3/prompt/structure.py

Modified: 1.3/prompt/structure.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/structure.py?rev=5297&r1=5296&r2=5297&view=diff
==============================================================================
--- 1.3/prompt/structure.py (original)
+++ 1.3/prompt/structure.py Fri Apr  4 14:48:57 2008
@@ -24,7 +24,8 @@
 import sys
 
 # relax module imports.
-import structure
+import generic_fns.structure.geometric
+import generic_fns.structure.structure
 import help
 from relax_errors import RelaxBinError, RelaxFloatError, RelaxIntError, 
RelaxNoneIntError, RelaxNoneStrError, RelaxNumError, RelaxStrError
 
@@ -163,7 +164,7 @@
             raise RelaxBinError, ('force flag', force)
 
         # Execute the functional code.
-        structure.geometric.create_diff_tensor_pdb(scale=scale, file=file, 
dir=dir, force=force)
+        generic_fns.structure.geometric.create_diff_tensor_pdb(scale=scale, 
file=file, dir=dir, force=force)
 
 
     def create_vector_dist(self, length=2e-9, symmetry=1, 
file='XH_dist.pdb', dir=None, force=0):
@@ -229,7 +230,7 @@
             raise RelaxBinError, ('force flag', force)
 
         # Execute the functional code.
-        structure.geometric.create_vector_dist(length=length, 
symmetry=symmetry, file=file, dir=dir, force=force)
+        generic_fns.structure.geometric.create_vector_dist(length=length, 
symmetry=symmetry, file=file, dir=dir, force=force)
 
 
     def read_pdb(self, file=None, dir=None, model=None, parser='scientific', 
load_seq=True, spin_id='@N'):
@@ -320,7 +321,7 @@
             raise RelaxNoneStrError, ('spin identifier', spin_id)
 
         # Execute the functional code.
-        structure.read_pdb(file=file, dir=dir, model=model, parser=parser, 
load_seq=load_seq, spin_id=spin_id)
+        generic_fns.structure.structure.read_pdb(file=file, dir=dir, 
model=model, parser=parser, load_seq=load_seq, spin_id=spin_id)
 
 
     def vectors(self, heteronuc='N', proton='H', spin_id=None, verbosity=1):
@@ -398,4 +399,4 @@
             raise RelaxIntError, ('verbosity level', verbosity)
 
         # Execute the functional code.
-        structure.vectors(heteronuc=heteronuc, proton=proton, 
spin_id=spin_id, verbosity=verbosity)
+        generic_fns.structure.structure.vectors(heteronuc=heteronuc, 
proton=proton, spin_id=spin_id, verbosity=verbosity)