Author: bugman
Date: Wed May 28 09:01:53 2014
New Revision: 23489
URL: http://svn.gna.org/viewcvs/relax?rev=23489&view=rev
Log:
Merged revisions 23480-23481,23488 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r23480 | tlinnet | 2014-05-27 18:47:25 +0200 (Tue, 27 May 2014) | 3 lines
Modified py_type from "list" to "float_array" in uf_object type in user
function dx.map.
Bug #22035: (https://gna.org/bugs/?22035) The dx.map user function is
broken in the GUI.
........
r23481 | tlinnet | 2014-05-27 18:47:30 +0200 (Tue, 27 May 2014) | 3 lines
Added py_type "list_val_or_list_of_list_val" to be handled in GUI
uf_objects.
Bug #22035: (https://gna.org/bugs/?22035) The dx.map user function is
broken in the GUI.
........
r23488 | bugman | 2014-05-28 08:59:22 +0200 (Wed, 28 May 2014) | 5 lines
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:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/gui/uf_objects.py
branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py
branches/frame_order_cleanup/user_functions/dx.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 28 09:01:53 2014
@@ -1 +1 @@
-/trunk:1-23478
+/trunk:1-23488
Modified: branches/frame_order_cleanup/gui/uf_objects.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/gui/uf_objects.py?rev=23489&r1=23488&r2=23489&view=diff
==============================================================================
--- branches/frame_order_cleanup/gui/uf_objects.py (original)
+++ branches/frame_order_cleanup/gui/uf_objects.py Wed May 28 09:01:53
2014
@@ -565,15 +565,15 @@
self.uf_args[arg['name']] = Selector_bool(name=arg['name'],
parent=self, element_type=arg['wiz_element_type'], sizer=sizer, desc=desc,
tooltip=arg['desc'], default=arg['default'], divider=self._div_left,
height_element=self.height_element)
# Sequence types.
- elif arg['py_type'] in ['float_list', 'int_list', 'num_list',
'str_list', 'float_tuple', 'int_tuple', 'num_tuple', 'str_tuple',
'float_array', 'int_array', 'float_or_float_list', 'int_or_int_list',
'num_or_num_list', 'str_or_str_list', 'float_or_float_tuple',
'int_or_int_tuple', 'num_or_num_tuple', 'str_or_str_tuple', 'val_or_list',
'float_object']:
+ elif arg['py_type'] in ['float_list', 'int_list', 'num_list',
'str_list', 'float_tuple', 'int_tuple', 'num_tuple', 'str_tuple',
'float_array', 'int_array', 'float_or_float_list', 'int_or_int_list',
'num_or_num_list', 'str_or_str_list', 'float_or_float_tuple',
'int_or_int_tuple', 'num_or_num_tuple', 'str_or_str_tuple', 'val_or_list',
'float_object', 'list_val_or_list_of_list_val']:
# The sequence type.
- if arg['py_type'] in ['float_list', 'int_list', 'num_list',
'str_list', 'float_array', 'int_array', 'float_or_float_list',
'int_or_int_list', 'num_or_num_list', 'str_or_str_list', 'val_or_list',
'float_object']:
+ if arg['py_type'] in ['float_list', 'int_list', 'num_list',
'str_list', 'float_array', 'int_array', 'float_or_float_list',
'int_or_int_list', 'num_or_num_list', 'str_or_str_list', 'val_or_list',
'float_object', 'list_val_or_list_of_list_val']:
seq_type = 'list'
else:
seq_type = 'tuple'
# The value type.
- if arg['py_type'] in ['float_list', 'num_list',
'float_tuple', 'num_tuple', 'float_array', 'float_or_float_list',
'num_or_num_list', 'float_or_float_tuple', 'num_or_num_tuple',
'float_object']:
+ if arg['py_type'] in ['float_list', 'num_list',
'float_tuple', 'num_tuple', 'float_array', 'float_or_float_list',
'num_or_num_list', 'float_or_float_tuple', 'num_or_num_tuple',
'float_object', 'list_val_or_list_of_list_val']:
value_type = 'float'
elif arg['py_type'] in ['int_list', 'int_tuple',
'int_array', 'int_or_int_list', 'int_or_int_tuple']:
value_type = 'int'
Modified:
branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py?rev=23489&r1=23488&r2=23489&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py
Wed May 28 09:01:53 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
Modified: branches/frame_order_cleanup/user_functions/dx.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/user_functions/dx.py?rev=23489&r1=23488&r2=23489&view=diff
==============================================================================
--- branches/frame_order_cleanup/user_functions/dx.py (original)
+++ branches/frame_order_cleanup/user_functions/dx.py Wed May 28 09:01:53
2014
@@ -189,7 +189,7 @@
uf.add_keyarg(
name = "chi_surface",
default = None,
- py_type = "list",
+ py_type = "float_array",
desc_short = "Set the chi2 surface level for the Innermost, Inner,
Middle and Outer Isosurface.",
desc = "A list of 4 numbers, setting the level for the 4 isosurfaces.
Useful in scripting if you create a set of OpenDX maps with all the same
contour levels. Ideal for comparisons.",
can_be_none = True
r23489 - in /branches/frame_order_cleanup: ./ gui/ specific_analyses/frame_order/ user_functions/