r4806 - /branches/N_state_model/specific_fns/__init__.py -- January 17, 2008 - 10:51

Author: bugman
Date: Thu Jan 17 10:51:14 2008
New Revision: 4806

URL: http://svn.gna.org/viewcvs/relax?rev=4806&view=rev
Log:
Renamed the class instance n_state_model to n_state_model_obj to avoid a name 
clash with the module.


Modified:
    branches/N_state_model/specific_fns/__init__.py

Modified: branches/N_state_model/specific_fns/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/__init__.py?rev=4806&r1=4805&r2=4806&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/__init__.py (original)
+++ branches/N_state_model/specific_fns/__init__.py Thu Jan 17 10:51:14 2008
@@ -50,7 +50,7 @@
 jw_mapping_obj = Jw_mapping()
 model_free_obj = Model_free()
 noe_obj = Noe()
-n_state_model = N_state_model()
+n_state_model_obj = N_state_model()
 relax_fit_obj = Relax_fit()
 
 
@@ -232,7 +232,7 @@
 
     # The N-state model.
     if function_type == 'N-state':
-        return n_state_model
+        return n_state_model_obj
 
     # Relaxation curve fitting.
     if function_type == 'relax_fit':