r4974 - in /branches/N_state_model/specific_fns: __init__.py setup.py -- February 13, 2008 - 14:40

Author: bugman
Date: Wed Feb 13 14:40:44 2008
New Revision: 4974

URL: http://svn.gna.org/viewcvs/relax?rev=4974&view=rev
Log:
Fixes for all the N-state model specific code which was lost in r4972.


Modified:
    branches/N_state_model/specific_fns/__init__.py
    branches/N_state_model/specific_fns/setup.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=4974&r1=4973&r2=4974&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/__init__.py (original)
+++ branches/N_state_model/specific_fns/__init__.py Wed Feb 13 14:40:44 2008
@@ -29,6 +29,7 @@
             'hybrid',
             'jw_mapping',
             'model_free',
+            'n_state_model',
             'noe',
             'relax_data',
             'relax_fit']

Modified: branches/N_state_model/specific_fns/setup.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/setup.py?rev=4974&r1=4973&r2=4974&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/setup.py (original)
+++ branches/N_state_model/specific_fns/setup.py Wed Feb 13 14:40:44 2008
@@ -24,6 +24,7 @@
 from specific_fns.hybrid import Hybrid
 from specific_fns.jw_mapping import Jw_mapping
 from specific_fns.model_free import Model_free
+from specific_fns.n_state_model import N_state_model
 from specific_fns.noe import Noe
 from specific_fns.relax_fit import Relax_fit
 from relax_errors import RelaxError, RelaxFuncSetupError
@@ -33,6 +34,7 @@
 hybrid_obj = Hybrid()
 jw_mapping_obj = Jw_mapping()
 model_free_obj = Model_free()
+n_state_model_obj = N_state_model()
 noe_obj = Noe()
 relax_fit_obj = Relax_fit()
 
@@ -229,6 +231,10 @@
     if function_type == 'noe':
         return noe_obj
 
+    # The N-state model.
+    if function_type == 'n_state_model':
+        return n_state_model_obj
+
     # Relaxation curve fitting.
     if function_type == 'relax_fit':
         return relax_fit_obj
@@ -256,6 +262,10 @@
     if function_type == 'noe':
         return "NOE calculations"
 
+    # The N-state model.
+    if function_type == 'N-state':
+        return "the N-state model"
+
     # Relaxation curve fitting.
     if function_type == 'relax_fit':
         return "relaxation curve fitting"