Author: bugman Date: Fri Oct 2 15:05:16 2015 New Revision: 27958 URL: http://svn.gna.org/viewcvs/relax?rev=27958&view=rev Log: Merged revisions 26896-26900,26908-26911 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_cleanup ........ r26896 | bugman | 2014-12-02 16:02:05 +0100 (Tue, 02 Dec 2014) | 6 lines Created the Frame_order.test_simulate_iso_cone_xz_plane_tilt system test. This is to check the frame_order.simulate user function for the torsionless isotropic cone model with a xz-plane tilt. ........ r26897 | bugman | 2014-12-02 16:12:07 +0100 (Tue, 02 Dec 2014) | 6 lines Created the Frame_order.test_simulate_pseudo_ellipse_free_rotor_z_axis system test. This is to check the frame_order.simulate user function for the free rotor pseudo-ellipse model along the z-axis. ........ r26898 | bugman | 2014-12-02 16:16:33 +0100 (Tue, 02 Dec 2014) | 6 lines Created the Frame_order.test_simulate_pseudo_ellipse_xy_plane_tilt system test. This is to check the frame_order.simulate user function for the pseudo-ellipse model with a xz-plane tilt. ........ r26899 | bugman | 2014-12-02 16:29:04 +0100 (Tue, 02 Dec 2014) | 6 lines Created the Frame_order.test_simulate_pseudo_ellipse_torsionless_z_axis system test. This is to check the frame_order.simulate user function for the torsionless pseudo-ellipse model along the z-axis. ........ r26900 | bugman | 2014-12-02 16:29:57 +0100 (Tue, 02 Dec 2014) | 5 lines Fix for the Frame_order.test_simulate_pseudo_ellipse_xz_plane_tilt system test name. This was mislabelled as Frame_order.test_simulate_pseudo_ellipse_xy_plane_tilt. ........ r26908 | bugman | 2014-12-03 09:34:46 +0100 (Wed, 03 Dec 2014) | 8 lines Redesign of the pymol.frame_order user function. This user function was still fitting to the old design in the relax trunk. It has been updated for the frame_order_cleanup branch whereby the frame_order.pdb_model user function has been split up and the positional distribution has been replaced by the Brownian simulation user function frame_order.simulate. ........ r26909 | bugman | 2014-12-03 10:03:50 +0100 (Wed, 03 Dec 2014) | 6 lines Better checking for the non-moving domain setup. The frame_order.pdb_model user function will now raise a RelaxError if the frame_order.ref_domain user function has not been called to set up the non-moving domain. ........ r26910 | bugman | 2014-12-03 10:13:17 +0100 (Wed, 03 Dec 2014) | 6 lines Updated the frame_order.ref_domain user function for the current branch design. This user function was quite out of date. The alignment tensor checks have been removed, to allow this to be used in the absence of base data. And the user function description has been updated. ........ r26911 | bugman | 2014-12-03 10:25:58 +0100 (Wed, 03 Dec 2014) | 3 lines Updated all frame order system tests for the frame_order.ref_domain user function requirement. ........ Modified: trunk/ (props changed) trunk/pipe_control/pymol_control.py trunk/specific_analyses/frame_order/data.py trunk/specific_analyses/frame_order/optimisation.py trunk/specific_analyses/frame_order/uf.py trunk/test_suite/system_tests/frame_order.py trunk/user_functions/frame_order.py trunk/user_functions/pymol_control.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/pipe_control/pymol_control.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/pymol_control.py?rev=27958&r1=27957&r2=27958&view=diff Modified: trunk/specific_analyses/frame_order/data.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/data.py?rev=27958&r1=27957&r2=27958&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=27958&r1=27957&r2=27958&view=diff Modified: trunk/specific_analyses/frame_order/uf.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/uf.py?rev=27958&r1=27957&r2=27958&view=diff 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=27958&r1=27957&r2=27958&view=diff Modified: trunk/user_functions/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/user_functions/frame_order.py?rev=27958&r1=27957&r2=27958&view=diff Modified: trunk/user_functions/pymol_control.py URL: http://svn.gna.org/viewcvs/relax/trunk/user_functions/pymol_control.py?rev=27958&r1=27957&r2=27958&view=diff