r18970 - in /trunk: maths_fns/ test_suite/shared_data/frame_order/cam/ test_suite/shared_data/frame_order/cam/iso_cone_torsi...r18970 - in /trunk: maths_fns/ test_suite/shared_data/frame_order/cam/ test_suite/shared_data/frame_order/cam/iso_cone_torsi...Author: bugman Date: Fri Mar 22 16:21:05 2013 New Revision: 18970 URL: http://svn.gna.org/viewcvs/relax?rev=18970&view=rev Log: Next block of the manual merger of the frame_order_testing branch. The commands used were: svn merge -r15381:15382 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15383:15384 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15386:15387 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15428:15429 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15429:15430 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15433:15434 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15436:15437 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15437:15438 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15438:15439 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . The console messages were: [edau@localhost relax-trunk]$ svn merge -r15381:15382 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15382 into '.': U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py [edau@localhost relax-trunk]$ svn merge -r15383:15384 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15384 into '.': U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.log.bz2 A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/axis_system A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt [edau@localhost relax-trunk]$ svn merge -r15386:15387 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15387 into '.': U test_suite/shared_data/frame_order/cam/opt_stats U test_suite/system_tests/frame_order.py [edau@localhost relax-trunk]$ svn merge -r15428:15429 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15429 into '.': U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py [edau@localhost relax-trunk]$ svn merge -r15429:15430 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15430 into '.': U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.log.bz2 U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py [edau@localhost relax-trunk]$ svn merge -r15433:15434 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15434 into '.': U maths_fns/frame_order_matrix_ops.py [edau@localhost relax-trunk]$ svn merge -r15436:15437 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15437 into '.': G maths_fns/frame_order_matrix_ops.py [edau@localhost relax-trunk]$ svn merge -r15437:15438 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15438 into '.': G test_suite/shared_data/frame_order/cam/opt_stats U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py G test_suite/system_tests/frame_order.py [edau@localhost relax-trunk]$ svn merge -r15438:15439 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15439 into '.': G maths_fns/frame_order_matrix_ops.py [edau@localhost relax-trunk]$ Added: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/axis_system - copied unchanged from r15384, branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/axis_system trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix - copied unchanged from r15384, branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix Modified: trunk/maths_fns/frame_order_matrix_ops.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.log.bz2 trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/opt_stats trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.log.bz2 trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py trunk/test_suite/system_tests/frame_order.py trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/maths_fns/frame_order_matrix_ops.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order_matrix_ops.py?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.log.bz2 URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.log.bz2?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy.txt?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er.txt?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb.txt?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm.txt?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_dy.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_dy.txt?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tb.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tb.txt?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tm.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tm.txt?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/opt_stats URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/opt_stats?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.log.bz2 URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.log.bz2?rev=18970&r1=18969&r2=18970&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=18970&r1=18969&r2=18970&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=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py?rev=18970&r1=18969&r2=18970&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py?rev=18970&r1=18969&r2=18970&view=diff