Author: bugman Date: Thu Oct 31 15:30:49 2013 New Revision: 21364 URL: http://svn.gna.org/viewcvs/relax?rev=21364&view=rev Log: Merged revisions 21363 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r21363 | bugman | 2013-10-31 15:30:11 +0100 (Thu, 31 Oct 2013) | 6 lines Reverted r21350, r21359, and r21360 as these were causing the GUI spectra lists to fail. svn merge -r21350:r21349 . svn merge -r21360:r21358 . ........ Modified: branches/relax_disp/ (props changed) branches/relax_disp/pipe_control/spectrometer.py branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2 branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2 branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2 branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2 branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2 branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2 Propchange: branches/relax_disp/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Oct 31 15:30:49 2013 @@ -1,1 +1,1 @@ -/trunk:1-21360 +/trunk:1-21363 Modified: branches/relax_disp/pipe_control/spectrometer.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/spectrometer.py?rev=21364&r1=21363&r2=21364&view=diff ============================================================================== --- branches/relax_disp/pipe_control/spectrometer.py (original) +++ branches/relax_disp/pipe_control/spectrometer.py Thu Oct 31 15:30:49 2013 @@ -31,7 +31,6 @@ from lib.physical_constants import g1H from lib.warnings import RelaxWarning from pipe_control import pipes -from pipe_control.spectrum import add_spectrum_id def check_frequency(id=None): @@ -229,9 +228,6 @@ # Test if the current data pipe exists. pipes.test() - - # Add the spectrum ID to the data store if needed. - add_spectrum_id(id) # Set up the data structures if missing. if not hasattr(cdp, 'spectrometer_frq'): Modified: branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2?rev=21364&r1=21363&r2=21364&view=diff ============================================================================== Binary files - no diff available. Modified: branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2?rev=21364&r1=21363&r2=21364&view=diff ============================================================================== Binary files - no diff available. Modified: branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2?rev=21364&r1=21363&r2=21364&view=diff ============================================================================== Binary files - no diff available. Modified: branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2?rev=21364&r1=21363&r2=21364&view=diff ============================================================================== Binary files - no diff available. Modified: branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2?rev=21364&r1=21363&r2=21364&view=diff ============================================================================== Binary files - no diff available. Modified: branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2?rev=21364&r1=21363&r2=21364&view=diff ============================================================================== Binary files - no diff available.