r19214 - /branches/relax_disp/specific_analyses/relax_disp.py -- March 27, 2013 - 14:30

Author: bugman
Date: Wed Mar 27 14:30:35 2013
New Revision: 19214

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

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

.....
  r8397 | semor | 2009-01-11 22:38:34 +0100 (Sun, 11 Jan 2009) | 7 lines
  Changed paths:
     M /branches/relax_disp/specific_fns/relax_disp.py
  
  Corrected capitalisation issues for param names.
  
  These were spotted by Ed in a thread starting at:
  https://mail.gna.org/public/relax-devel/2009-01/msg00059.html
  (Message-id: <7f080ed10901111240o15a93096w59b397684b010634@xxxxxxxxxxxxxx>)
.....


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=19214&r1=19213&r2=19214&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 14:30:35 
2013
@@ -62,7 +62,7 @@
         # Loop over the model parameters.
         for i in xrange(len(spin.params)):
             # Transversal relaxation rate.
-            if spin.params[i] == 'r2':
+            if spin.params[i] == 'R2':
                 if sim_index != None:
                     param_vector.append(spin.r2_sim[sim_index])
                 elif spin.r2 == None:
@@ -71,7 +71,7 @@
                     param_vector.append(spin.r2)
 
             # Chemical exchange contribution to 'R2'.
-            elif spin.params[i] == 'rex':
+            elif spin.params[i] == 'Rex':
                 if sim_index != None:
                     param_vector.append(spin.rex_sim[sim_index])
                 elif spin.rex == None:
@@ -89,7 +89,7 @@
                     param_vector.append(spin.kex)
 
             # Transversal relaxation rate for state A.
-            if spin.params[i] == 'r2a':
+            if spin.params[i] == 'R2A':
                 if sim_index != None:
                     param_vector.append(spin.r2a_sim[sim_index])
                 elif spin.r2a == None:
@@ -98,7 +98,7 @@
                     param_vector.append(spin.r2a)
 
             # Exchange rate from state A to state B.
-            if spin.params[i] == 'ka':
+            if spin.params[i] == 'kA':
                 if sim_index != None:
                     param_vector.append(spin.ka_sim[sim_index])
                 elif spin.ka == None:
@@ -335,11 +335,11 @@
         The names are as follows:
 
             - 'params', an array of the parameter names associated with the 
model.
-            - 'R2', the transversal relaxation rate.
-            - 'Rex', the chemical exchange contribution to 'R2'.
+            - '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.
+            - '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.
@@ -371,11 +371,11 @@
 
         # Parameters.
         if set == 'all' or set == 'params':
-            names.append('R2')
-            names.append('Rex')
+            names.append('r2')
+            names.append('rex')
             names.append('kex')
-            names.append('R2A')
-            names.append('kA')
+            names.append('r2a')
+            names.append('ka')
             names.append('dw')
 
         # Minimisation statistics.