Author: bugman Date: Fri Mar 22 12:44:20 2013 New Revision: 18956 URL: http://svn.gna.org/viewcvs/relax?rev=18956&view=rev Log: Next block of the manual merger of the frame_order_testing branch. The commands used were: svn merge -r15160:15161 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15161:15162 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15162:15163 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15163:15164 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15208:15209 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15209:15210 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15215:15216 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15216:15217 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15217:15218 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15218:15219 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . The console messages were: [edau@localhost relax-trunk]$ svn merge -r15160:15161 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15161 into '.': U test_suite/shared_data/frame_order/iso_cone_free_rotor/generate_distribution.py [edau@localhost relax-trunk]$ svn merge -r15161:15162 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15162 into '.': U test_suite/shared_data/frame_order/iso_cone_free_rotor/animate.py [edau@localhost relax-trunk]$ svn merge -r15162:15163 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15163 into '.': U test_suite/shared_data/frame_order/iso_cone_torsionless/generate_distribution.py U test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.bz2 U test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_dy.txt U test_suite/shared_data/frame_order/iso_cone_torsionless/tensors.py U test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_tm.txt U test_suite/shared_data/frame_order/iso_cone_torsionless/tensor_fit.log.bz2 U test_suite/shared_data/frame_order/iso_cone_torsionless/cone.pdb U test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_tb.txt U test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_er.txt U test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_dy.txt U test_suite/shared_data/frame_order/iso_cone_torsionless/ave_pos.pdb U test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.log.bz2 U test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_tm.txt U test_suite/shared_data/frame_order/iso_cone_torsionless/generate_distribution.log.bz2 U test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_tb.txt U test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.py U test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_er.txt [edau@localhost relax-trunk]$ svn merge -r15163:15164 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15164 into '.': U test_suite/shared_data/frame_order/iso_cone/generate_distribution.py U test_suite/shared_data/frame_order/iso_cone/frame_order.bz2 U test_suite/shared_data/frame_order/iso_cone/rdc_dy.txt U test_suite/shared_data/frame_order/iso_cone/tensors.py U test_suite/shared_data/frame_order/iso_cone/rdc_tm.txt U test_suite/shared_data/frame_order/iso_cone/tensor_fit.log.bz2 U test_suite/shared_data/frame_order/iso_cone/cone.pdb U test_suite/shared_data/frame_order/iso_cone/pcs_tb.txt U test_suite/shared_data/frame_order/iso_cone/pcs_er.txt U test_suite/shared_data/frame_order/iso_cone/pcs_dy.txt U test_suite/shared_data/frame_order/iso_cone/ave_pos.pdb U test_suite/shared_data/frame_order/iso_cone/frame_order.log.bz2 U test_suite/shared_data/frame_order/iso_cone/pcs_tm.txt U test_suite/shared_data/frame_order/iso_cone/generate_distribution.log.bz2 U test_suite/shared_data/frame_order/iso_cone/rdc_tb.txt U test_suite/shared_data/frame_order/iso_cone/rdc_er.txt [edau@localhost relax-trunk]$ svn merge -r15208:15209 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15209 into '.': U maths_fns/frame_order_matrix_ops.py U maths_fns/frame_order.py [edau@localhost relax-trunk]$ svn merge -r15209:15210 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15210 into '.': U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py [edau@localhost relax-trunk]$ svn merge -r15215:15216 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15216 into '.': A test_suite/shared_data/frame_order/cam [edau@localhost relax-trunk]$ svn merge -r15216:15217 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15217 into '.': A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.bz2 A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_dy.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensors.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tm.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.log.bz2 A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/cone.pdb A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/README A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/ave_pos.pdb A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.log.bz2 A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.log.bz2 A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/animate.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/axis.pdb A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tb.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_er.txt A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.bz2 A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_dy.txt A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensors.py A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tm.txt A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.log.bz2 A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/cone.pdb A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb.txt A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/README A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/ave_pos.pdb A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.log.bz2 A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm.txt A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.log.bz2 A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/animate.py A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/axis.pdb A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/back_calc.py A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tb.txt A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_er.txt A test_suite/shared_data/frame_order/cam/1J7P_1st_NH_rot.pdb A test_suite/shared_data/frame_order/cam/rotor_2_state A test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.py A test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.bz2 A test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_dy.txt A test_suite/shared_data/frame_order/cam/rotor_2_state/tensors.py A test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tm.txt A test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.log.bz2 A test_suite/shared_data/frame_order/cam/rotor_2_state/cone.pdb A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tb.txt A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_er.txt A test_suite/shared_data/frame_order/cam/rotor_2_state/README A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_dy.txt A test_suite/shared_data/frame_order/cam/rotor_2_state/ave_pos.pdb A test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.log.bz2 A test_suite/shared_data/frame_order/cam/rotor_2_state/distribution.pdb.gz A test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tm.txt A test_suite/shared_data/frame_order/cam/rotor_2_state/animate.py A test_suite/shared_data/frame_order/cam/rotor_2_state/axis.pdb A test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.log A test_suite/shared_data/frame_order/cam/rotor_2_state/back_calc.py A test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tb.txt A test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py A test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_er.txt A test_suite/shared_data/frame_order/cam/rotor_2_state/back_calc.bz2 A test_suite/shared_data/frame_order/cam/system.pdb A test_suite/shared_data/frame_order/cam/free_rotor2 A test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py A test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.bz2 A test_suite/shared_data/frame_order/cam/free_rotor2/rdc_dy.txt A test_suite/shared_data/frame_order/cam/free_rotor2/tensors.py A test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tm.txt A test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.log.bz2 A test_suite/shared_data/frame_order/cam/free_rotor2/cone.pdb A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb.txt A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er.txt A test_suite/shared_data/frame_order/cam/free_rotor2/README A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy.txt A test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos.pdb A test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.log.bz2 A test_suite/shared_data/frame_order/cam/free_rotor2/distribution.pdb.gz A test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm.txt A test_suite/shared_data/frame_order/cam/free_rotor2/animate.py A test_suite/shared_data/frame_order/cam/free_rotor2/axis.pdb A test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.log A test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.py A test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tb.txt A test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py A test_suite/shared_data/frame_order/cam/free_rotor2/rdc_er.txt A test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.bz2 A test_suite/shared_data/frame_order/cam/iso_cone A test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.py A test_suite/shared_data/frame_order/cam/iso_cone/frame_order.bz2 A test_suite/shared_data/frame_order/cam/iso_cone/rdc_dy.txt A test_suite/shared_data/frame_order/cam/iso_cone/tensors.py A test_suite/shared_data/frame_order/cam/iso_cone/rdc_tm.txt A test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.log.bz2 A test_suite/shared_data/frame_order/cam/iso_cone/cone.pdb A test_suite/shared_data/frame_order/cam/iso_cone/pcs_tb.txt A test_suite/shared_data/frame_order/cam/iso_cone/pcs_er.txt A test_suite/shared_data/frame_order/cam/iso_cone/README A test_suite/shared_data/frame_order/cam/iso_cone/pcs_dy.txt A test_suite/shared_data/frame_order/cam/iso_cone/ave_pos.pdb A test_suite/shared_data/frame_order/cam/iso_cone/frame_order.log.bz2 A test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py A test_suite/shared_data/frame_order/cam/iso_cone/pcs_tm.txt A test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.log.bz2 A test_suite/shared_data/frame_order/cam/iso_cone/animate.py A test_suite/shared_data/frame_order/cam/iso_cone/axis.pdb A test_suite/shared_data/frame_order/cam/iso_cone/back_calc.py A test_suite/shared_data/frame_order/cam/iso_cone/rdc_tb.txt A test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py A test_suite/shared_data/frame_order/cam/iso_cone/rdc_er.txt A test_suite/shared_data/frame_order/cam/rigid A test_suite/shared_data/frame_order/cam/rigid/frame_order.bz2 A test_suite/shared_data/frame_order/cam/rigid/rdc_dy.txt A test_suite/shared_data/frame_order/cam/rigid/tensors.py A test_suite/shared_data/frame_order/cam/rigid/rdc_tm.txt A test_suite/shared_data/frame_order/cam/rigid/pcs_tb.txt A test_suite/shared_data/frame_order/cam/rigid/tensor_fit.log.bz2 A test_suite/shared_data/frame_order/cam/rigid/pcs_er.txt A test_suite/shared_data/frame_order/cam/rigid/pcs_dy.txt A test_suite/shared_data/frame_order/cam/rigid/ave_pos.pdb A test_suite/shared_data/frame_order/cam/rigid/frame_order.log.bz2 A test_suite/shared_data/frame_order/cam/rigid/pcs_tm.txt A test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py A test_suite/shared_data/frame_order/cam/rigid/back_calc.py A test_suite/shared_data/frame_order/cam/rigid/rdc_tb.txt A test_suite/shared_data/frame_order/cam/rigid/frame_order.py A test_suite/shared_data/frame_order/cam/rigid/rdc_er.txt A test_suite/shared_data/frame_order/cam/rigid/back_calc.bz2 A test_suite/shared_data/frame_order/cam/1J7O_1st_NH.pdb A test_suite/shared_data/frame_order/cam/1J7P_1st_NH.pdb A test_suite/shared_data/frame_order/cam/iso_cone_torsionless A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.bz2 A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_dy.txt A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensors.py A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tm.txt A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.log.bz2 A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/cone.pdb A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb.txt A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er.txt A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/README A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy.txt A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/ave_pos.pdb A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.log.bz2 A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm.txt A 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/animate.py A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/axis.pdb A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.py A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tb.txt A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.bz2 A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_dy.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensors.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/cone_pseudo_ellipse.pdb A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tm.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.log.bz2 A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tb.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/cone.pdb A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_er.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_matrix.log A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/ave_pos_pseudo_ellipse.pdb A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/README A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.log.bz2 A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_dy.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_matrix.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/ave_pos.pdb A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.log.bz2 A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tm.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/animate.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.log.bz2 A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/axis.pdb A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/back_calc.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tb.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_er.txt A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.bz2 A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rotation_matrices.py A test_suite/shared_data/frame_order/cam/CoM.py A test_suite/shared_data/frame_order/cam/rotor A test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py A test_suite/shared_data/frame_order/cam/rotor/frame_order.bz2 A test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt A test_suite/shared_data/frame_order/cam/rotor/tensors.py [... 305 lines stripped ...]