Author: bugman Date: Fri Oct 2 16:25:54 2015 New Revision: 27965 URL: http://svn.gna.org/viewcvs/relax?rev=27965&view=rev Log: Fix for the merger of the frame_order_cleanup branch. The base CaM frame system test script, as well as th CaM frame order test data optimisation scripts scripts, had reverted to using the old forms of the minimise.grid_search and minimise.execute user functions. Modified: trunk/test_suite/shared_data/frame_order/cam/double_rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/double_rotor_large_angle/frame_order.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/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/rotor_2_state/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor_small_angle/frame_order.py trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/test_suite/shared_data/frame_order/cam/double_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/double_rotor/frame_order.py?rev=27965&r1=27964&r2=27965&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/double_rotor_large_angle/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/double_rotor_large_angle/frame_order.py?rev=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor_small_angle/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor_small_angle/frame_order.py?rev=27965&r1=27964&r2=27965&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=27965&r1=27964&r2=27965&view=diff