Author: bugman Date: Tue Mar 6 11:51:37 2012 New Revision: 15438 URL: http://svn.gna.org/viewcvs/relax?rev=15438&view=rev Log: Increased the pseudo-ellipse frame order system test integration points from 50 to 1e3. This increases the system test time by 0.15 seconds on one test machine, while increasing the number of integrated points within the cone from 1 to 23. This will be more useful for debugging the multi-processor code. Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats branches/frame_order_testing/test_suite/system_tests/frame_order.py branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats?rev=15438&r1=15437&r2=15438&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats Tue Mar 6 11:51:37 2012 @@ -41,6 +41,26 @@ pseudo_ellipse_torsionless 4.0391147051941987 0.038420846934775092 4.0006938582594236 +Quasi-random integration (from relax, 1e3 Sobol' pts) +---------------------------------------------------- + +Data set RDC + PCS RDC PCS +rigid ? 0.081175629109096842 ? +rotor ? 0.080805860707837754 ? +rotor2 ? 0.080669539157379247 ? +rotor_2_state ? 0.98514936500256733 ? +free_rotor ? 0.49726258158951819 ? +free_rotor2 ? 0.15789122044584425 ? +iso_cone ? 0.047304044109578447 ? +iso_cone_free_rotor ? 0.1984082397486189 ? +iso_cone_free_rotor2 ? 0.034276292191227402 ? +iso_cone_torsionless ? 0.04891814690969206 ? +pseudo_ellipse 1.5736922773780864 0.095461523976414595 1.4782307534016719 +pseudo_ellipse2 ? 0.030991308327923742 ? +pseudo_ellipse_free_rotor ? 0.042919565975988075 ? +pseudo_ellipse_torsionless ? 0.038420846934775092 ? + + Quasi-random integration (from relax, 1e6 Sobol' pts) -------------------------------------------------------- Modified: branches/frame_order_testing/test_suite/system_tests/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/frame_order.py?rev=15438&r1=15437&r2=15438&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/system_tests/frame_order.py (original) +++ branches/frame_order_testing/test_suite/system_tests/frame_order.py Tue Mar 6 11:51:37 2012 @@ -372,7 +372,7 @@ # The flags, execute the script, and then check the chi2 value. self.flags() self.interpreter.run(script_file=self.cam_path+'pseudo_ellipse.py') - self.check_chi2(95.009525545019784+0.095461523976414595) + self.check_chi2(1.4782307534016719+0.095461523976414595) def test_cam_pseudo_ellipse_pcs(self): @@ -381,7 +381,7 @@ # The flags, execute the script, and then check the chi2 value. self.flags(rdc=False) self.interpreter.run(script_file=self.cam_path+'pseudo_ellipse.py') - self.check_chi2(95.009525545019784) + self.check_chi2(1.4782307534016719) def test_cam_pseudo_ellipse_rdc(self): Modified: branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py?rev=15438&r1=15437&r2=15438&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py (original) +++ branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py Tue Mar 6 11:51:37 2012 @@ -42,7 +42,7 @@ cone_theta_y = 50.0 * 2.0 * pi / 360.0 cone_sigma_max = 60.0 * 2.0 * pi / 360.0 cone = True - num_int_pts = 50 + num_int_pts = 1000 # Execute the analysis.