r21363 - in /trunk: pipe_control/ test_suite/shared_data/model_free/OMP/ -- October 31, 2013 - 15:30

Author: bugman
Date: Thu Oct 31 15:30:11 2013
New Revision: 21363

URL: http://svn.gna.org/viewcvs/relax?rev=21363&view=rev
Log:
Reverted r21350, r21359, and r21360 as these were causing the GUI spectra 
lists to fail.

svn merge -r21350:r21349 .
svn merge -r21360:r21358 .


Modified:
    trunk/pipe_control/spectrometer.py
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2
    
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2

Modified: trunk/pipe_control/spectrometer.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/spectrometer.py?rev=21363&r1=21362&r2=21363&view=diff
==============================================================================
--- trunk/pipe_control/spectrometer.py (original)
+++ trunk/pipe_control/spectrometer.py Thu Oct 31 15:30:11 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: 
trunk/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/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2?rev=21363&r1=21362&r2=21363&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/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/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v2.bz2?rev=21363&r1=21362&r2=21363&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v1.bz2?rev=21363&r1=21362&r2=21363&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2.bz2?rev=21363&r1=21362&r2=21363&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_v2_broken.bz2?rev=21363&r1=21362&r2=21363&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2?rev=21363&r1=21362&r2=21363&view=diff
==============================================================================
Binary files - no diff available.