Author: bugman
Date: Thu Apr 3 19:41:29 2014
New Revision: 22631
URL: http://svn.gna.org/viewcvs/relax?rev=22631&view=rev
Log:
Merged revisions 22066-22067 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/double_rotor
........
r22066 | bugman | 2014-01-29 17:07:10 +0100 (Wed, 29 Jan 2014) | 5 lines
Fix for the Frame_order.test_generate_rotor2_distribution system test.
The rotation() method now must accept the motion_index keyword argument.
........
r22067 | bugman | 2014-01-29 17:23:26 +0100 (Wed, 29 Jan 2014) | 5 lines
Created the Frame_order.test_cam_double_rotor system test for the CaM
synthetic data.
This will be used to implement the frame order double rotor model.
........
Added:
trunk/test_suite/system_tests/scripts/frame_order/cam/double_rotor.py
- copied unchanged from r22067,
branches/double_rotor/test_suite/system_tests/scripts/frame_order/cam/double_rotor.py
Modified:
trunk/ (props changed)
trunk/test_suite/system_tests/frame_order.py
trunk/test_suite/system_tests/scripts/frame_order/cam/generate_rotor2_distribution.py
Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 3 19:41:29 2014
@@ -1 +1 @@
-/branches/double_rotor:1-21950,22022-22023,22039-22040,22047-22048,22056-22064
+/branches/double_rotor:1-21950,22022-22023,22039-22040,22047-22048,22056-22064,22066-22067
Modified: trunk/test_suite/system_tests/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/frame_order.py?rev=22631&r1=22630&r2=22631&view=diff
==============================================================================
--- trunk/test_suite/system_tests/frame_order.py (original)
+++ trunk/test_suite/system_tests/frame_order.py Thu Apr 3 19:41:29
2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2006-2013 Edward d'Auvergne
#
+# Copyright (C) 2006-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -70,6 +70,8 @@
# Tests to skip.
blacklist = [
+ 'test_cam_double_rotor_pcs',
+ 'test_cam_double_rotor_rdc',
'test_cam_free_rotor_pcs',
'test_cam_free_rotor_rdc',
'test_cam_free_rotor2_pcs',
@@ -251,6 +253,33 @@
setattr(cdp, param, curr)
+ def test_cam_double_rotor(self):
+ """Test the double rotor frame order model of CaM."""
+
+ # The flags, execute the script, and then check the chi2 value.
+ self.flags()
+ self.interpreter.run(script_file=self.cam_path+'double_rotor.py')
+ self.check_chi2(0.081769384900455433)
+
+
+ def test_cam_double_rotor_pcs(self):
+ """Test the double rotor frame order model of CaM (with only PCS
data)."""
+
+ # The flags, execute the script, and then check the chi2 value.
+ self.flags(rdc=False)
+ self.interpreter.run(script_file=self.cam_path+'double_rotor.py')
+ self.check_chi2(0.0010998457430728529)
+
+
+ def test_cam_double_rotor_rdc(self):
+ """Test the double rotor frame order model of CaM (with only RDC
data)."""
+
+ # The flags, execute the script, and then check the chi2 value.
+ self.flags(pcs=False)
+ self.interpreter.run(script_file=self.cam_path+'double_rotor.py')
+ self.check_chi2(0.080669539157379247)
+
+
def test_cam_free_rotor(self):
"""Test the free rotor frame order model of CaM."""
Modified:
trunk/test_suite/system_tests/scripts/frame_order/cam/generate_rotor2_distribution.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/generate_rotor2_distribution.py?rev=22631&r1=22630&r2=22631&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/cam/generate_rotor2_distribution.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/cam/generate_rotor2_distribution.py
Thu Apr 3 19:41:29 2014
@@ -29,11 +29,11 @@
self.build_axes = self.build_axes_alt
- def rotation(self, i):
+ def rotation(self, i, motion_index=0):
"""Set up the rotation for state i."""
# The rotation angle.
- angle = (i - (self.N-1)/2) * self.INC / 360.0 * 2.0 * pi
+ angle = (i - (self.N-1)/2) * self.INC[motion_index] / 360.0 * 2.0 *
pi
# The rotation matrix.
axis_angle_to_R(self.axes[:, 2], angle, self.R)
r22631 - in /trunk: ./ test_suite/system_tests/ test_suite/system_tests/scripts/frame_order/cam/