Author: bugman Date: Thu May 23 19:15:10 2013 New Revision: 19710 URL: http://svn.gna.org/viewcvs/relax?rev=19710&view=rev Log: Speedup for the relaxation dispersion system tests which use Flemming Hansen's CPMG data. The system test script now reads the truncated data files (of only residues 70 and 71) to minimise the time required to read the data and store it in the relax data store. Modified: branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_data.py Modified: branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_data.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_data.py?rev=19710&r1=19709&r2=19710&view=diff ============================================================================== --- branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_data.py (original) +++ branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_data.py Thu May 23 19:15:10 2013 @@ -41,7 +41,7 @@ data_path = status.install_path + sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'Hansen' # Load the sequence. -sequence.read('fake_sequence.in', dir=status.install_path + sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'Hansen', res_num_col=1, res_name_col=2) +sequence.read('fake_sequence.in_trunc', dir=status.install_path + sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'Hansen', res_num_col=1, res_name_col=2) # Name the spins so they can be matched to the assignments. spin.name(name='N') @@ -51,44 +51,44 @@ # The spectral data - spectrum ID, peak list file name, CPMG frequency (Hz), spectrometer frequency in Hertz. data = [ - ['500_reference.in', '500_MHz'+sep+'reference.in_sparky', None, 500e6], - ['500_66.667.in', '500_MHz'+sep+'66.667.in_sparky', 66.6666, 500e6], - ['500_133.33.in', '500_MHz'+sep+'133.33.in_sparky', 133.3333, 500e6], - ['500_133.33.in.bis', '500_MHz'+sep+'133.33.in.bis_sparky', 133.3333, 500e6], - ['500_200.in', '500_MHz'+sep+'200.in_sparky', 200.0000, 500e6], - ['500_266.67.in', '500_MHz'+sep+'266.67.in_sparky', 266.6666, 500e6], - ['500_333.33.in', '500_MHz'+sep+'333.33.in_sparky', 333.3333, 500e6], - ['500_400.in', '500_MHz'+sep+'400.in_sparky', 400.0000, 500e6], - ['500_466.67.in', '500_MHz'+sep+'466.67.in_sparky', 466.6666, 500e6], - ['500_533.33.in', '500_MHz'+sep+'533.33.in_sparky', 533.3333, 500e6], - ['500_533.33.in.bis', '500_MHz'+sep+'533.33.in.bis_sparky', 533.3333, 500e6], - ['500_600.in', '500_MHz'+sep+'600.in_sparky', 600.0000, 500e6], - ['500_666.67.in', '500_MHz'+sep+'666.67.in_sparky', 666.6666, 500e6], - ['500_733.33.in', '500_MHz'+sep+'733.33.in_sparky', 733.3333, 500e6], - ['500_800.in', '500_MHz'+sep+'800.in_sparky', 800.0000, 500e6], - ['500_866.67.in', '500_MHz'+sep+'866.67.in_sparky', 866.6666, 500e6], - ['500_933.33.in', '500_MHz'+sep+'933.33.in_sparky', 933.3333, 500e6], - ['500_933.33.in.bis', '500_MHz'+sep+'933.33.in.bis_sparky', 933.3333, 500e6], - ['500_1000.in', '500_MHz'+sep+'1000.in_sparky', 1000.0000, 500e6], - ['800_reference.in', '800_MHz'+sep+'reference.in_sparky', None, 800e6], - ['800_66.667.in', '800_MHz'+sep+'66.667.in_sparky', 66.6666, 800e6], - ['800_133.33.in', '800_MHz'+sep+'133.33.in_sparky', 133.3333, 800e6], - ['800_133.33.in.bis', '800_MHz'+sep+'133.33.in.bis_sparky', 133.3333, 800e6], - ['800_200.in', '800_MHz'+sep+'200.in_sparky', 200.0000, 800e6], - ['800_266.67.in', '800_MHz'+sep+'266.67.in_sparky', 266.6666, 800e6], - ['800_333.33.in', '800_MHz'+sep+'333.33.in_sparky', 333.3333, 800e6], - ['800_400.in', '800_MHz'+sep+'400.in_sparky', 400.0000, 800e6], - ['800_466.67.in', '800_MHz'+sep+'466.67.in_sparky', 466.6666, 800e6], - ['800_533.33.in', '800_MHz'+sep+'533.33.in_sparky', 533.3333, 800e6], - ['800_533.33.in.bis', '800_MHz'+sep+'533.33.in.bis_sparky', 533.3333, 800e6], - ['800_600.in', '800_MHz'+sep+'600.in_sparky', 600.0000, 800e6], - ['800_666.67.in', '800_MHz'+sep+'666.67.in_sparky', 666.6666, 800e6], - ['800_733.33.in', '800_MHz'+sep+'733.33.in_sparky', 733.3333, 800e6], - ['800_800.in', '800_MHz'+sep+'800.in_sparky', 800.0000, 800e6], - ['800_866.67.in', '800_MHz'+sep+'866.67.in_sparky', 866.6666, 800e6], - ['800_933.33.in', '800_MHz'+sep+'933.33.in_sparky', 933.3333, 800e6], - ['800_933.33.in.bis', '800_MHz'+sep+'933.33.in.bis_sparky', 933.3333, 800e6], - ['800_1000.in', '800_MHz'+sep+'1000.in_sparky', 1000.0000, 800e6] + ['500_reference.in', '500_MHz'+sep+'reference.in_trunc', None, 500e6], + ['500_66.667.in', '500_MHz'+sep+'66.667.in_trunc', 66.6666, 500e6], + ['500_133.33.in', '500_MHz'+sep+'133.33.in_trunc', 133.3333, 500e6], + ['500_133.33.in.bis', '500_MHz'+sep+'133.33.in.bis_trunc', 133.3333, 500e6], + ['500_200.in', '500_MHz'+sep+'200.in_trunc', 200.0000, 500e6], + ['500_266.67.in', '500_MHz'+sep+'266.67.in_trunc', 266.6666, 500e6], + ['500_333.33.in', '500_MHz'+sep+'333.33.in_trunc', 333.3333, 500e6], + ['500_400.in', '500_MHz'+sep+'400.in_trunc', 400.0000, 500e6], + ['500_466.67.in', '500_MHz'+sep+'466.67.in_trunc', 466.6666, 500e6], + ['500_533.33.in', '500_MHz'+sep+'533.33.in_trunc', 533.3333, 500e6], + ['500_533.33.in.bis', '500_MHz'+sep+'533.33.in.bis_trunc', 533.3333, 500e6], + ['500_600.in', '500_MHz'+sep+'600.in_trunc', 600.0000, 500e6], + ['500_666.67.in', '500_MHz'+sep+'666.67.in_trunc', 666.6666, 500e6], + ['500_733.33.in', '500_MHz'+sep+'733.33.in_trunc', 733.3333, 500e6], + ['500_800.in', '500_MHz'+sep+'800.in_trunc', 800.0000, 500e6], + ['500_866.67.in', '500_MHz'+sep+'866.67.in_trunc', 866.6666, 500e6], + ['500_933.33.in', '500_MHz'+sep+'933.33.in_trunc', 933.3333, 500e6], + ['500_933.33.in.bis', '500_MHz'+sep+'933.33.in.bis_trunc', 933.3333, 500e6], + ['500_1000.in', '500_MHz'+sep+'1000.in_trunc', 1000.0000, 500e6], + ['800_reference.in', '800_MHz'+sep+'reference.in_trunc', None, 800e6], + ['800_66.667.in', '800_MHz'+sep+'66.667.in_trunc', 66.6666, 800e6], + ['800_133.33.in', '800_MHz'+sep+'133.33.in_trunc', 133.3333, 800e6], + ['800_133.33.in.bis', '800_MHz'+sep+'133.33.in.bis_trunc', 133.3333, 800e6], + ['800_200.in', '800_MHz'+sep+'200.in_trunc', 200.0000, 800e6], + ['800_266.67.in', '800_MHz'+sep+'266.67.in_trunc', 266.6666, 800e6], + ['800_333.33.in', '800_MHz'+sep+'333.33.in_trunc', 333.3333, 800e6], + ['800_400.in', '800_MHz'+sep+'400.in_trunc', 400.0000, 800e6], + ['800_466.67.in', '800_MHz'+sep+'466.67.in_trunc', 466.6666, 800e6], + ['800_533.33.in', '800_MHz'+sep+'533.33.in_trunc', 533.3333, 800e6], + ['800_533.33.in.bis', '800_MHz'+sep+'533.33.in.bis_trunc', 533.3333, 800e6], + ['800_600.in', '800_MHz'+sep+'600.in_trunc', 600.0000, 800e6], + ['800_666.67.in', '800_MHz'+sep+'666.67.in_trunc', 666.6666, 800e6], + ['800_733.33.in', '800_MHz'+sep+'733.33.in_trunc', 733.3333, 800e6], + ['800_800.in', '800_MHz'+sep+'800.in_trunc', 800.0000, 800e6], + ['800_866.67.in', '800_MHz'+sep+'866.67.in_trunc', 866.6666, 800e6], + ['800_933.33.in', '800_MHz'+sep+'933.33.in_trunc', 933.3333, 800e6], + ['800_933.33.in.bis', '800_MHz'+sep+'933.33.in.bis_trunc', 933.3333, 800e6], + ['800_1000.in', '800_MHz'+sep+'1000.in_trunc', 1000.0000, 800e6] ] # Loop over the spectra.