r19729 - in /trunk: data_store/ gui/components/ lib/ pipe_control/ specific_analyses/model_free/ test_suite/shared_data/mode...r19729 - in /trunk: data_store/ gui/components/ lib/ pipe_control/ specific_analyses/model_free/ test_suite/shared_data/mode...Author: bugman Date: Fri May 24 12:10:02 2013 New Revision: 19729 URL: http://svn.gna.org/viewcvs/relax?rev=19729&view=rev Log: Shifted all frequency data handling associated with relaxation data to pipe_control.spectrometer. This includes the deletion of the relax_data.frq user function as this replicates the behaviour of spectrometer.frequency. A number of functions from the pipe_control.relax_data module have changed: - frq() has been deleted as it is replaced by pipe_control.spectrometer.set_frequencies(), - frq_checks() has been shifted to pipe_control.spectrometer.frequency_checks(), - frq_loop() has been shifted to pipe_control.spectrometer.loop_frequencies(), - num_frq() has been deleted as the new variable cdp.spectrometer_frq_count contains this info. Two new functions in the pipe_control.spectrometer module have been added to remove the functionality from pipe_control.relax_data. These are copy_frequencies() and delete_frequencies(). Added: trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0.bz2 (with props) trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0_oldxml.bz2 (with props) Modified: trunk/data_store/pipe_container.py trunk/gui/components/relax_data.py trunk/lib/errors.py trunk/pipe_control/dasha.py trunk/pipe_control/relax_data.py trunk/pipe_control/spectrometer.py trunk/specific_analyses/model_free/results.py trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_pre_py2.7.3_v2.bz2 trunk/test_suite/system_tests/model_free.py trunk/test_suite/system_tests/scripts/relax_data_reset.py trunk/user_functions/relax_data.py trunk/user_functions/spectrometer.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/data_store/pipe_container.py URL: http://svn.gna.org/viewcvs/relax/trunk/data_store/pipe_container.py?rev=19729&r1=19728&r2=19729&view=diff Modified: trunk/gui/components/relax_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/components/relax_data.py?rev=19729&r1=19728&r2=19729&view=diff Modified: trunk/lib/errors.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/errors.py?rev=19729&r1=19728&r2=19729&view=diff Modified: trunk/pipe_control/dasha.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/dasha.py?rev=19729&r1=19728&r2=19729&view=diff Modified: trunk/pipe_control/relax_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/relax_data.py?rev=19729&r1=19728&r2=19729&view=diff Modified: trunk/pipe_control/spectrometer.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/spectrometer.py?rev=19729&r1=19728&r2=19729&view=diff Modified: trunk/specific_analyses/model_free/results.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/results.py?rev=19729&r1=19728&r2=19729&view=diff Modified: trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_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_trunc_1.3_pre_py2.7.3_v2.bz2?rev=19729&r1=19728&r2=19729&view=diff Added: trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0.bz2 URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0.bz2?rev=19729&view=auto Added: trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0_oldxml.bz2 URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0_oldxml.bz2?rev=19729&view=auto Modified: trunk/test_suite/system_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/model_free.py?rev=19729&r1=19728&r2=19729&view=diff Modified: trunk/test_suite/system_tests/scripts/relax_data_reset.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_data_reset.py?rev=19729&r1=19728&r2=19729&view=diff Modified: trunk/user_functions/relax_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/user_functions/relax_data.py?rev=19729&r1=19728&r2=19729&view=diff Modified: trunk/user_functions/spectrometer.py URL: http://svn.gna.org/viewcvs/relax/trunk/user_functions/spectrometer.py?rev=19729&r1=19728&r2=19729&view=diff