Author: bugman
Date: Thu Apr 3 20:01:18 2014
New Revision: 22643
URL: http://svn.gna.org/viewcvs/relax?rev=22643&view=rev
Log:
Merged revisions 22176-22178,22192-22194 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/double_rotor
........
r22176 | bugman | 2014-02-12 14:56:21 +0100 (Wed, 12 Feb 2014) | 7 lines
Changes to the frame_order.pivot user function.
The 'order' argument has been added to allow for multiple pivots to be
present. The user function
backend will store these as cdp.pivot, cdp.pivot2, cdp.pivot3, etc. The
'fix' argument is now
defaulting to False to make sure it is always boolean.
........
r22177 | bugman | 2014-02-12 16:20:38 +0100 (Wed, 12 Feb 2014) | 3 lines
The second pivot is now being passed into the frame order target function
class.
........
r22178 | bugman | 2014-02-13 09:55:09 +0100 (Thu, 13 Feb 2014) | 6 lines
Simplified the CaM frame order system test base script.
The class variables are now always defined, so checking for their existence
is pointless. The
CONE_S1 is now also defined in the base script as a class variable.
........
r22192 | bugman | 2014-02-14 17:25:00 +0100 (Fri, 14 Feb 2014) | 10 lines
Converted the Frame_order.test_cam_rotor system script test to use the new
rotor model parameters.
The rotor frame order parameters {P_alpha, P_beta, P_gamma, T_x, T_y, T_z,
E_theta, E_phi, p_x, p_y,
p_z}, where P_i are the Euler angles defining the average domain position,
T_i are the translations
defining the average domain position, E_i are the Eigenframe angles
defining the rotation axis, and
p_i are the pivot point coordinates, will be converted to {P_alpha, P_beta,
P_gamma, T_x, T_y, T_z,
Ax_alpha, p_x, p_y, p_z}. Ax_alpha is the new parameter which defines the
rotation axis together
with the pivot using the minimal parameter set {p_x, p_y, p_z, Ax_alpha}.
........
r22193 | bugman | 2014-02-14 17:26:33 +0100 (Fri, 14 Feb 2014) | 3 lines
Added support for the new axis_alpha frame order parameter to the
specific_analyses.frame_order package.
........
r22194 | bugman | 2014-02-14 17:54:31 +0100 (Fri, 14 Feb 2014) | 6 lines
Implemented the new frame order rotor model parameters in the target
function.
The parameters {axis_theta, axis_phi} have been replaced by the single
axis_alpha. To support the
new model construct, the CoM of the entire system is now passed into the
target function.
........
Modified:
trunk/ (props changed)
trunk/specific_analyses/frame_order/api.py
trunk/specific_analyses/frame_order/optimisation.py
trunk/specific_analyses/frame_order/parameters.py
trunk/specific_analyses/frame_order/user_functions.py
trunk/target_functions/frame_order.py
trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py
trunk/user_functions/frame_order.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/specific_analyses/frame_order/api.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/api.py?rev=22643&r1=22642&r2=22643&view=diff
Modified: trunk/specific_analyses/frame_order/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/optimisation.py?rev=22643&r1=22642&r2=22643&view=diff
Modified: trunk/specific_analyses/frame_order/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/parameters.py?rev=22643&r1=22642&r2=22643&view=diff
Modified: trunk/specific_analyses/frame_order/user_functions.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/user_functions.py?rev=22643&r1=22642&r2=22643&view=diff
Modified: trunk/target_functions/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/frame_order.py?rev=22643&r1=22642&r2=22643&view=diff
Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py?rev=22643&r1=22642&r2=22643&view=diff
Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py?rev=22643&r1=22642&r2=22643&view=diff
Modified: trunk/user_functions/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/frame_order.py?rev=22643&r1=22642&r2=22643&view=diff
r22643 - in /trunk: ./ specific_analyses/frame_order/ target_functions/ test_suite/system_tests/scripts/frame_order/cam/ use...