r23488 - /trunk/specific_analyses/frame_order/parameters.py -- May 28, 2014 - 08:59

Author: bugman
Date: Wed May 28 08:59:22 2014
New Revision: 23488

URL: http://svn.gna.org/viewcvs/relax?rev=23488&view=rev
Log:
Modified the frame order constraints so that cone_theta_x <= cone_theta_y.

The linear_constraints() function docstring has been updated to include this 
constraint.


Modified:
    trunk/specific_analyses/frame_order/parameters.py

Modified: trunk/specific_analyses/frame_order/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/parameters.py?rev=23488&r1=23487&r2=23488&view=diff
==============================================================================
--- trunk/specific_analyses/frame_order/parameters.py   (original)
+++ trunk/specific_analyses/frame_order/parameters.py   Wed May 28 08:59:22 
2014
@@ -96,8 +96,7 @@
     The parameter constraints for the motional amplitude parameters are::
 
         0 <= theta <= pi,
-        0 <= theta_x <= pi,
-        0 <= theta_y <= pi,
+        0 <= theta_x <= theta_y <= pi,
         -0.125 <= S <= 1,
         0 <= sigma_max <= pi,
 
@@ -114,15 +113,17 @@
         |-1  0  0  0  0 |                        |  -pi   |
         |               |                        |        |
         | 0  1  0  0  0 |                        |   0    |
-        |               |     |   theta   |      |        |
-        | 0 -1  0  0  0 |     |           |      |  -pi   |
-        |               |     |  theta_x  |      |        |
-        | 0  0  1  0  0 |     |           |      |   0    |
-        |               |  .  |  theta_y  |  >=  |        |
-        | 0  0 -1  0  0 |     |           |      |  -pi   |
-        |               |     |    S      |      |        |
-        | 0  0  0  1  0 |     |           |      | -0.125 |
-        |               |     | sigma_max |      |        |
+        |               |                        |        |
+        | 0 -1  0  0  0 |     |   theta   |      |  -pi   |
+        |               |     |           |      |        |
+        | 0 -1  1  0  0 |     |  theta_x  |      |   0    |
+        |               |     |           |      |        |
+        | 0  0  1  0  0 |  .  |  theta_y  |  >=  |   0    |
+        |               |     |           |      |        |
+        | 0  0 -1  0  0 |     |    S      |      |  -pi   |
+        |               |     |           |      |        |
+        | 0  0  0  1  0 |     | sigma_max |      | -0.125 |
+        |               |                        |        |
         | 0  0  0 -1  0 |                        |  -1    |
         |               |                        |        |
         | 0  0  0  0  1 |                        |   0    |
@@ -157,10 +158,10 @@
             b.append(-pi / scaling_matrix[i, i])
             j = j + 2
 
-            # The pseudo-ellipse restriction (theta_x >= theta_y).
-            if cdp.params[i] == 'cone_theta_x':
+            # The pseudo-ellipse restriction (theta_x <= theta_y).
+            if cdp.params[i] == 'cone_theta_y':
                 for m in range(n):
-                    if cdp.params[m] == 'cone_theta_y':
+                    if cdp.params[m] == 'cone_theta_x':
                         A.append(zero_array * 0.0)
                         A[j][i] = 1.0
                         A[j][m] = -1.0