Author: bugman Date: Fri Dec 17 12:46:00 2010 New Revision: 11858 URL: http://svn.gna.org/viewcvs/relax?rev=11858&view=rev Log: Removed all execfile() calls by switching to the script() user function. This is for security and for handling the execution locking mechanism properly. Modified: 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor.py 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor_eigenframe.py 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py Modified: 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor.py Fri Dec 17 12:46:00 2010 @@ -15,7 +15,7 @@ r, theta, phi = cartesian_to_spherical(vect_z) # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'free_rotor_axis2_1_3_rot_tensors.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'free_rotor_axis2_1_3_rot_tensors.py') # Data init. cdp.ave_pos_beta = 0.5 Modified: 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor_eigenframe.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor_eigenframe.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor_eigenframe.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor_eigenframe.py Fri Dec 17 12:46:00 2010 @@ -9,7 +9,7 @@ # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'free_rotor_in_frame_rot_tensors.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'free_rotor_in_frame_rot_tensors.py') # Data init. cdp.ave_pos_beta = 0.5 Modified: 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py Fri Dec 17 12:46:00 2010 @@ -36,7 +36,7 @@ a, b, g = R_to_euler_zyz(EIG_FRAME) # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_out_of_frame_theta_z_tensors_beta78.75.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_out_of_frame_theta_z_tensors_beta78.75.py') # Data stores. ds.chi2 = [] Modified: 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py Fri Dec 17 12:46:00 2010 @@ -36,7 +36,7 @@ r, theta, phi = cartesian_to_spherical(vect_z) # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_free_rotor_axis2_1_3_tensors_beta78.75.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_free_rotor_axis2_1_3_tensors_beta78.75.py') # Data stores. ds.chi2 = [] Modified: 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py Fri Dec 17 12:46:00 2010 @@ -32,7 +32,7 @@ INC = 18 # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'isotropic_cone_free_rotor_in_frame_tensors_beta101.25.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'isotropic_cone_free_rotor_in_frame_tensors_beta101.25.py') # Data stores. ds.chi2 = [] Modified: 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py Fri Dec 17 12:46:00 2010 @@ -36,7 +36,7 @@ a, b, g = R_to_euler_zyz(EIG_FRAME) # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'pseudo_ellipse_out_of_frame_theta_x_tensors_beta112.5.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'pseudo_ellipse_out_of_frame_theta_x_tensors_beta112.5.py') # Data stores. ds.chi2 = [] Modified: 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py Fri Dec 17 12:46:00 2010 @@ -54,7 +54,7 @@ reset() # Load the tensors. - execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+files[round]) + script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+files[round]) # New set of chi2 values. chi2.append([]) Modified: 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py Fri Dec 17 12:46:00 2010 @@ -36,7 +36,7 @@ a, b, g = R_to_euler_zyz(EIG_FRAME) # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'pseudo_ellipse_torsionless_out_of_frame_theta_x_tensors_beta168.75.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'pseudo_ellipse_torsionless_out_of_frame_theta_x_tensors_beta168.75.py') # Data stores. ds.chi2 = [] Modified: 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py Fri Dec 17 12:46:00 2010 @@ -36,7 +36,7 @@ a, b, g = R_to_euler_zyz(EIG_FRAME) # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'rotor_out_of_frame_tensors_beta123.75.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'rotor_out_of_frame_tensors_beta123.75.py') # Data stores. ds.chi2 = [] Modified: 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py Fri Dec 17 12:46:00 2010 @@ -28,7 +28,7 @@ INC = 18 # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'rotor_in_frame_tensors_beta22.5.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'rotor_in_frame_tensors_beta22.5.py') # Data stores. ds.chi2 = [] Modified: 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/iso_cone_to_iso_cone_free_rotor.py Fri Dec 17 12:46:00 2010 @@ -48,7 +48,7 @@ a, b, g = R_to_euler_zyz(EIG_FRAME) # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_free_rotor_axis2_1_3_tensors_beta78.75.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_free_rotor_axis2_1_3_tensors_beta78.75.py') # Data stores. ds.chi2 = [] Modified: 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone.py Fri Dec 17 12:46:00 2010 @@ -37,7 +37,7 @@ a, b, g = R_to_euler_zyz(EIG_FRAME) # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_out_of_frame_theta_z_tensors_beta78.75.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_out_of_frame_theta_z_tensors_beta78.75.py') # Data stores. ds.chi2 = [] Modified: 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_free_rotor_to_iso_cone_free_rotor.py Fri Dec 17 12:46:00 2010 @@ -48,7 +48,7 @@ a, b, g = R_to_euler_zyz(EIG_FRAME) # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_free_rotor_axis2_1_3_tensors_beta78.75.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_free_rotor_axis2_1_3_tensors_beta78.75.py') # Data stores. ds.chi2 = [] Modified: 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone.py Fri Dec 17 12:46:00 2010 @@ -36,7 +36,7 @@ a, b, g = R_to_euler_zyz(EIG_FRAME) # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_out_of_frame_theta_z_tensors_beta78.75.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_out_of_frame_theta_z_tensors_beta78.75.py') # Data stores. ds.chi2 = [] Modified: 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py?rev=11858&r1=11857&r2=11858&view=diff ============================================================================== --- 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py (original) +++ 1.3/test_suite/system_tests/scripts/frame_order/parametric_restriction/pseudo_ellipse_to_iso_cone_free_rotor.py Fri Dec 17 12:46:00 2010 @@ -48,7 +48,7 @@ a, b, g = R_to_euler_zyz(EIG_FRAME) # Load the tensors. -execfile(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_free_rotor_axis2_1_3_tensors_beta78.75.py') +script(__main__.install_path + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'frame_order'+sep+'tensors'+sep+'iso_cone_free_rotor_axis2_1_3_tensors_beta78.75.py') # Data stores. ds.chi2 = []