r19774 - /branches/relax_disp/specific_analyses/relax_disp/parameters.py -- May 29, 2013 - 15:57

Author: bugman
Date: Wed May 29 15:57:06 2013
New Revision: 19774

URL: http://svn.gna.org/viewcvs/relax?rev=19774&view=rev
Log:
An upper limit of 200 rad/s has been added to the linear constraints for the 
R2 dispersion parameters.


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

Modified: branches/relax_disp/specific_analyses/relax_disp/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/parameters.py?rev=19774&r1=19773&r2=19774&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/parameters.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/parameters.py Wed May 29 
15:57:06 2013
@@ -409,10 +409,12 @@
 
         | 1  0  0 |     |  R2  |      |    0    |
         |         |     |      |      |         |
-        | 1  0  0 |  .  |  Rex |      |    0    |
+        |-1  0  0 |     |  R2  |      |  -200   |
         |         |     |      |      |         |
-        | 1  0  0 |     |  kex |      |    0    |
-        |         |     |      |  >=  |         |
+        | 1  0  0 |     |  phi |      |    0    |
+        |         |     |      |      |         |
+        | 1  0  0 |  .  |  kex |  >=  |    0    |
+        |         |     |      |      |         |
         | 1  0  0 |     |  R2A |      |    0    |
         |         |     |      |      |         |
         | 1  0  0 |     |  kA  |      |    0    |
@@ -446,9 +448,12 @@
             # The transversal relaxation rate >= 0.
             if spin.params[k] == 'r2':
                 A.append(zero_array * 0.0)
+                A.append(zero_array * 0.0)
                 A[j][i] = 1.0
+                A[j+1][i] = -1.0
                 b.append(0.0)
-                j += 1
+                b.append(-200.0 / scaling_matrix[i, i])
+                j += 2
 
             # Relaxation rates and phi_ex.
             elif spin.params[k] in ['r2a', 'phi_ex']: