Author: bugman
Date: Wed Mar 27 14:29:34 2013
New Revision: 19213
URL: http://svn.gna.org/viewcvs/relax?rev=19213&view=rev
Log:
Ported r8396 from the old relax_disp branch into the new branch.
The command used was:
svn merge -r8395:8396
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123
specific_analyses
.....
r8396 | semor | 2009-01-11 21:29:53 +0100 (Sun, 11 Jan 2009) | 10 lines
Changed paths:
M /branches/relax_disp/specific_fns/relax_disp.py
Changed the object names so they are lower case as they should be, based on
the rest of the code.
Made the equivalent change in the function assemble_param_vector() to allow
the system-test to go
further..
This was spotted by Ed in a post at:
https://mail.gna.org/public/relax-devel/2009-01/msg00058.html
(Message-id: <7f080ed10901111041n65ecd976ie058ed0500d47746@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=19213&r1=19212&r2=19213&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 14:29:34
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:
@@ -1032,15 +1032,15 @@
| Data type | Object name
| Patterns |
|___________________________________________________|________________|__________________________|
| |
| |
- | Transversal relaxation rate | 'R2'
| '^[Rr]2$' |
+ | Transversal relaxation rate | 'r2'
| '^[Rr]2$' |
| |
| |
- | Chemical exchange contribution to 'R2' | 'Rex'
| '^[Rr]ex$' |
+ | Chemical exchange contribution to 'R2' | 'rex'
| '^[Rr]ex$' |
| |
| |
| Exchange rate | 'kex'
| '^[Kk]ex$' |
| |
| |
- | Transversal relaxation rate for state A | 'R2A'
| '^[Rr]2A$' |
+ | Transversal relaxation rate for state A | 'r2a'
| '^[Rr]2A$' |
| |
| |
- | Exchange rate from state A to state B | 'kA'
| '^[Kk]A$' |
+ | Exchange rate from state A to state B | 'ka'
| '^[Kk]A$' |
| |
| |
| Chemical shift difference between states A and B | 'dw'
| '^[Dd]w$' |
| |
| |
r19213 - /branches/relax_disp/specific_analyses/relax_disp.py