r6143 - in /1.3: generic_fns/structure/geometric.py specific_fns/n_state_model.py -- May 20, 2008 - 11:18

Author: bugman
Date: Tue May 20 11:04:02 2008
New Revision: 6143

URL: http://svn.gna.org/viewcvs/relax?rev=6143&view=rev
Log:
Import fixes for the newly renamed generic_fns.structure.internal() module.


Modified:
    1.3/generic_fns/structure/geometric.py
    1.3/specific_fns/n_state_model.py

Modified: 1.3/generic_fns/structure/geometric.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/geometric.py?rev=6143&r1=6142&r2=6143&view=diff
==============================================================================
--- 1.3/generic_fns/structure/geometric.py (original)
+++ 1.3/generic_fns/structure/geometric.py Tue May 20 11:04:02 2008
@@ -29,7 +29,7 @@
 # relax module imports.
 from data import Data as relax_data_store
 from generic_fns.mol_res_spin import exists_mol_res_spin_data
-from internal_pdb import Internal_PDB
+from internal import Internal
 from maths_fns.rotation_matrix import R_2vect
 from relax_errors import RelaxError, RelaxNoPdbError, RelaxNoPipeError, 
RelaxNoSequenceError, RelaxNoTensorError, RelaxNoVectorsError
 from relax_io import open_write_file
@@ -177,7 +177,7 @@
         pipes = [relax_data_store.current_pipe]
 
     # Create the structural object.
-    structure = Internal_PDB()
+    structure = Internal()
 
     # Loop over the pipes.
     for pipe_index in xrange(len(pipes)):
@@ -353,7 +353,7 @@
     #############
 
     # Create the structural object.
-    structure = Internal_PDB()
+    structure = Internal()
 
     # Initialise the residue number.
     res_num = 1

Modified: 1.3/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/n_state_model.py?rev=6143&r1=6142&r2=6143&view=diff
==============================================================================
--- 1.3/specific_fns/n_state_model.py (original)
+++ 1.3/specific_fns/n_state_model.py Tue May 20 11:04:02 2008
@@ -32,7 +32,7 @@
 import generic_fns
 import generic_fns.structure.geometric
 import generic_fns.structure.mass
-from generic_fns.structure.internal_pdb import Internal_PDB
+from generic_fns.structure.internal import Internal
 from maths_fns.n_state_model import N_state_opt
 from maths_fns.rotation_matrix import R_2vect, R_euler_zyz
 from minfx.generic import generic_minimise
@@ -220,7 +220,7 @@
         R_2vect(R, array([0,0,1], float64), 
cdp.ave_pivot_CoM/norm(cdp.ave_pivot_CoM))
 
         # Create the structural object.
-        structure = Internal_PDB()
+        structure = Internal()
 
         # Add the pivot point.
         structure.atom_add(atom_id='R', record_name='HETATM', atom_name='R', 
res_name='PIV', res_num=1, pos=cdp.pivot_point, element='C')