r19638 - /branches/relax_disp/specific_analyses/relax_disp/__init__.py -- May 03, 2013 - 15:56

Author: bugman
Date: Fri May  3 15:56:05 2013
New Revision: 19638

URL: http://svn.gna.org/viewcvs/relax?rev=19638&view=rev
Log:
Updated the backend of the relax_disp.select_model to handle the new model 
names.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/__init__.py

Modified: branches/relax_disp/specific_analyses/relax_disp/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/__init__.py?rev=19638&r1=19637&r2=19638&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/__init__.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/__init__.py Fri May  3 
15:56:05 2013
@@ -1214,19 +1214,19 @@
         if model == 'R2eff' and cdp.exp_type in VAR_TIME_EXP and not 
C_module_exp_fn:
             raise RelaxError("The exponential curve-fitting C module cannot 
be found.")
 
-        # Fast-exchange regime.
+        # R2eff/R1rho model.
         if model == 'R2eff':
-            print("R2eff value and error determination.")
+            print("R2eff/R1rho value and error determination.")
             params = ['r2eff', 'i0']
 
-        # Fast-exchange regime.
-        elif model == 'fast 2-site':
-            print("2-site fast-exchange.")
-            params = ['r2', 'rex', 'kex']
-
-        # Slow-exchange regime.
-        elif model == 'slow 2-site':
-            print("2-site slow-exchange.")
+        # LM63 model.
+        elif model == 'LM63':
+            print("The Luz and Meiboom (1963) 2-site fast exchange.")
+            params = ['r2', 'phi_ex', 'kex']
+
+        # CR72 model.
+        elif model == 'CR72':
+            print("The Carver and Richards (1972) 2-site equation for all 
time scales.")
             params = ['r2', 'r2a', 'ka', 'dw']
 
         # Invalid model.