Author: bugman Date: Fri Jan 15 13:00:52 2010 New Revision: 10239 URL: http://svn.gna.org/viewcvs/relax?rev=10239&view=rev Log: Merged revisions 10117,10157,10178-10188,10197,10204-10205 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r10117 | bugman | 2010-01-06 18:57:55 +0100 (Wed, 06 Jan 2010) | 6 lines Modified the IO redirection methods. The original IO streams are stored and then restore instead of sys.__stdout__ and sys.__stderr__. This might help in the multi-processor branch where IO redirection has gone haywire. ........ r10157 | bugman | 2010-01-08 10:57:41 +0100 (Fri, 08 Jan 2010) | 6 lines Big bug fix for the model-free grid search!!! The lower and upper bounds were being scaled iteratively for each spin causing the values to be ridiculously bigger and bigger. This caused a total failure of the grid search. ........ r10178 | bugman | 2010-01-12 13:20:36 +0100 (Tue, 12 Jan 2010) | 3 lines Modified the import of euler_zyz_to_R to allow easy switching later on to a different notation. ........ r10179 | bugman | 2010-01-12 13:21:01 +0100 (Tue, 12 Jan 2010) | 3 lines Copyright notice update. ........ r10180 | bugman | 2010-01-12 13:32:12 +0100 (Tue, 12 Jan 2010) | 3 lines Renamed all euler_ijk_to_R() functions to euler_to_R_ijk(). ........ r10181 | bugman | 2010-01-12 13:35:04 +0100 (Tue, 12 Jan 2010) | 3 lines Ordered the euler angle conversion functions. ........ r10182 | bugman | 2010-01-12 13:40:33 +0100 (Tue, 12 Jan 2010) | 3 lines Fixes for all the euler angle to rotation matrix unit tests. ........ r10183 | bugman | 2010-01-12 13:42:00 +0100 (Tue, 12 Jan 2010) | 3 lines Fix for reverse_euler_zyz() due to the function renaming. ........ r10184 | bugman | 2010-01-12 14:22:09 +0100 (Tue, 12 Jan 2010) | 3 lines Created a unit test to check all hard-coded conversion functions for all 12 static axis rotations. ........ r10185 | bugman | 2010-01-12 14:22:52 +0100 (Tue, 12 Jan 2010) | 3 lines Fix for the euler_to_axis_angle_xzx() function. ........ r10186 | bugman | 2010-01-12 15:10:54 +0100 (Tue, 12 Jan 2010) | 5 lines Improvements to the test_euler_cycle_1() unit test. This includes verbose printing of data structures and checking of the rotation matrix at each cycle. ........ r10187 | bugman | 2010-01-12 15:36:01 +0100 (Tue, 12 Jan 2010) | 5 lines Added 12 unit tests for all notations of R -> Euler -> R. This uses a random rotation matrix and sees if the matrix is returned. ........ r10188 | bugman | 2010-01-12 15:39:31 +0100 (Tue, 12 Jan 2010) | 6 lines Important bug fix for the R_to_euler() function. The special angle wrapping when beta was negative is only for the ijk Euler notation when i == k! When i != k, another type of wrapping will be required. ........ r10197 | bugman | 2010-01-13 15:15:37 +0100 (Wed, 13 Jan 2010) | 3 lines Removed the alpha Euler angle from the isotropic code frame order model. ........ r10204 | bugman | 2010-01-13 17:33:24 +0100 (Wed, 13 Jan 2010) | 5 lines Bug fix for the frame order isotropic cone target function. The optimised rotation matrix for the alignment tensor orientations was being applied in reverse!!! ........ r10205 | bugman | 2010-01-13 19:21:19 +0100 (Wed, 13 Jan 2010) | 6 lines Reverted r10204 as this was a not a bug and the revision introduced a bug!!! The command used was: svn merge -r10204:10203 . ........ Modified: branches/bieri_gui/ (props changed) branches/bieri_gui/maths_fns/frame_order.py branches/bieri_gui/maths_fns/n_state_model.py branches/bieri_gui/maths_fns/rotation_matrix.py branches/bieri_gui/specific_fns/frame_order.py branches/bieri_gui/specific_fns/model_free/mf_minimise.py branches/bieri_gui/specific_fns/n_state_model.py branches/bieri_gui/test_suite/relax_test_runner.py branches/bieri_gui/test_suite/unit_tests/_maths_fns/test_rotation_matrix.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/bieri_gui/maths_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/maths_fns/frame_order.py?rev=10239&r1=10238&r2=10239&view=diff Modified: branches/bieri_gui/maths_fns/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/maths_fns/n_state_model.py?rev=10239&r1=10238&r2=10239&view=diff Modified: branches/bieri_gui/maths_fns/rotation_matrix.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/maths_fns/rotation_matrix.py?rev=10239&r1=10238&r2=10239&view=diff Modified: branches/bieri_gui/specific_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/frame_order.py?rev=10239&r1=10238&r2=10239&view=diff Modified: branches/bieri_gui/specific_fns/model_free/mf_minimise.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/model_free/mf_minimise.py?rev=10239&r1=10238&r2=10239&view=diff Modified: branches/bieri_gui/specific_fns/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/n_state_model.py?rev=10239&r1=10238&r2=10239&view=diff Modified: branches/bieri_gui/test_suite/relax_test_runner.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/test_suite/relax_test_runner.py?rev=10239&r1=10238&r2=10239&view=diff Modified: branches/bieri_gui/test_suite/unit_tests/_maths_fns/test_rotation_matrix.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/test_suite/unit_tests/_maths_fns/test_rotation_matrix.py?rev=10239&r1=10238&r2=10239&view=diff