r4975 - /branches/N_state_model/specific_fns/n_state_model.py -- February 13, 2008 - 15:09

Author: bugman
Date: Wed Feb 13 15:09:14 2008
New Revision: 4975

URL: http://svn.gna.org/viewcvs/relax?rev=4975&view=rev
Log:
Fixed an extremely annoying circular import.


Modified:
    branches/N_state_model/specific_fns/n_state_model.py

Modified: branches/N_state_model/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/n_state_model.py?rev=4975&r1=4974&r2=4975&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/n_state_model.py (original)
+++ branches/N_state_model/specific_fns/n_state_model.py Wed Feb 13 15:09:14 
2008
@@ -28,7 +28,7 @@
 # relax module imports.
 from data import Data as relax_data_store
 from float import isNaN, isInf
-from generic_fns.structure import centre_of_mass
+import generic_fns
 from maths_fns.n_state_model import N_state_opt
 from minfx.generic import generic_minimise
 from relax_errors import RelaxError, RelaxInfError, RelaxNaNError, 
RelaxNoModelError, RelaxNoTensorError
@@ -106,7 +106,7 @@
 
         # Calculate from the PDB file.
         else:
-            cdp.CoM = centre_of_mass()
+            cdp.CoM = generic_fns.structure.centre_of_mass()
 
         # Print out.
         print "The initial centre of mass (prior to rotation) for the moving 
domain is: " + `cdp.CoM`