r19193 - /branches/relax_disp/specific_analyses/relax_disp.py -- March 27, 2013 - 14:08

Author: bugman
Date: Wed Mar 27 14:08:20 2013
New Revision: 19193

URL: http://svn.gna.org/viewcvs/relax?rev=19193&view=rev
Log:
Ported r8352 from the old relax_disp branch into the new branch.

The command used was:
svn merge -r8351:8352 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123
 specific_analyses

.....
  r8352 | semor | 2009-01-09 21:27:59 +0100 (Fri, 09 Jan 2009) | 3 lines
  Changed paths:
     M /branches/relax_disp/specific_fns/relax_disp.py
  
  Added the parameters for the slow- and fast-exchange regime in the function 
data_names().
.....


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py

Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19193&r1=19192&r2=19193&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 14:08:20 
2013
@@ -334,9 +334,12 @@
         The names are as follows:
 
             - 'params', an array of the parameter names associated with the 
model.
-            - 'rx', either the R1 or R2 relaxation rate.
-            - 'i0', the initial intensity.
-            - 'iinf', the intensity at infinity.
+            - 'R2', the transversal relaxation rate.
+            - 'Rex', the chemical exchange contribution to 'R2'.
+            - 'kex', the exchange rate.
+            - 'R2A', the transversal relaxation rate for state A.
+            - 'kA', the exchange rate from state A to state B.
+            - 'dw', the chemical shift difference between states A and B.
             - 'chi2', chi-squared value.
             - 'iter', iterations.
             - 'f_count', function count.
@@ -346,9 +349,8 @@
 
 
         @keyword set:           The set of object names to return.  This can 
be set to 'all' for all
-                                names, to 'generic' for generic object 
names, 'params' for
-                                model-free parameter names, or to 'min' for 
minimisation specific
-                                object names.
+                                names, to 'generic' for generic object 
names, 'params' for parameter
+                                names,or to 'min' for minimisation specific 
object names.
         @type set:              str
         @keyword error_names:   A flag which if True will add the error 
object names as well.
         @type error_names:      bool
@@ -368,9 +370,12 @@
 
         # Parameters.
         if set == 'all' or set == 'params':
-            names.append('rx')
-            names.append('i0')
-            names.append('iinf')
+            names.append('r2')
+            names.append('rex')
+            names.append('kex')
+            names.append('r2a')
+            names.append('ka')
+            names.append('dw')
 
         # Minimisation statistics.
         if set == 'all' or set == 'min':
@@ -383,15 +388,21 @@
 
         # Parameter errors.
         if error_names and (set == 'all' or set == 'params'):
-            names.append('rx_err')
-            names.append('i0_err')
-            names.append('iinf_err')
+            names.append('r2_err')
+            names.append('rex_err')
+            names.append('kex_err')
+            names.append('r2a_err')
+            names.append('ka_err')
+            names.append('dw_err')
 
         # Parameter simulation values.
         if sim_names and (set == 'all' or set == 'params'):
-            names.append('rx_sim')
-            names.append('i0_sim')
-            names.append('iinf_sim')
+            names.append('r2_sim')
+            names.append('rex_sim')
+            names.append('kex_sim')
+            names.append('r2a_sim')
+            names.append('ka_sim')
+            names.append('dw_sim')
 
         # Return the names.
         return names