r27914 - in /trunk: ./ auto_analyses/ specific_analyses/frame_order/ test_suite/shared_data/frame_order/cam/ test_suite/shar...r27914 - in /trunk: ./ auto_analyses/ specific_analyses/frame_order/ test_suite/shared_data/frame_order/cam/ test_suite/shar...Author: bugman Date: Thu Oct 1 18:47:48 2015 New Revision: 27914 URL: http://svn.gna.org/viewcvs/relax?rev=27914&view=rev Log: Merged revisions 23197 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_cleanup ........ r23197 | bugman | 2014-05-16 10:45:40 +0200 (Fri, 16 May 2014) | 19 lines Deletion of the frame_order.average_position user function and all of the associated backend code. This user function allowed the user to specify five different types of displacement to the average moving domain position: - A pure rotation, with no translation, about the pivot of the motion in the system. - A rotation about the pivot of the motion of the system together with a translation. - A pure translation with no rotation. - A rotation about the centre of mass of the moving domain with no translation. - A rotation about the centre of mass of the moving domain together with a translation. Now the last option will be the default and only option. This option is equivalent to the standard superimposition algorithm (the Kabsch algorithm) to a hypothetical structure at the real average position. The other four are due to the history of the development of the theory. These limit the usefulness of the theory and will only cause confusion. ........ Modified: trunk/ (props changed) trunk/auto_analyses/frame_order.py trunk/specific_analyses/frame_order/checks.py trunk/specific_analyses/frame_order/data.py trunk/specific_analyses/frame_order/optimisation.py trunk/specific_analyses/frame_order/parameters.py trunk/specific_analyses/frame_order/uf.py trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py trunk/test_suite/shared_data/frame_order/cam/full_analysis.py trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py trunk/test_suite/shared_data/frame_order/displacements/optimisation.py trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py trunk/user_functions/frame_order.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/auto_analyses/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/specific_analyses/frame_order/checks.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/checks.py?rev=27914&r1=27913&r2=27914&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=27914&r1=27913&r2=27914&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=27914&r1=27913&r2=27914&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=27914&r1=27913&r2=27914&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=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/full_analysis.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/full_analysis.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/displacements/optimisation.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/optimisation.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py?rev=27914&r1=27913&r2=27914&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=27914&r1=27913&r2=27914&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py?rev=27914&r1=27913&r2=27914&view=diff Modified: trunk/user_functions/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/user_functions/frame_order.py?rev=27914&r1=27913&r2=27914&view=diff