Author: bugman
Date: Fri May 24 16:38:08 2013
New Revision: 19734
URL: http://svn.gna.org/viewcvs/relax?rev=19734&view=rev
Log:
Merged revisions 19723-19733 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r19723 | bugman | 2013-05-24 09:25:27 +0200 (Fri, 24 May 2013) | 3 lines
The pipe_control.spectrometer.get_frequencies() function can now return MHz
or Tesla units.
........
r19724 | bugman | 2013-05-24 09:39:06 +0200 (Fri, 24 May 2013) | 5 lines
Renamed the functions of the pipe_control.spectrometer module.
The frequency() and temperature() functions are now called set_frequency()
and set_temperature().
........
r19725 | bugman | 2013-05-24 09:42:52 +0200 (Fri, 24 May 2013) | 5 lines
Added backwards compatibility support for the spectrometer frequency list
and count.
This is needed for old relax state files.
........
r19726 | bugman | 2013-05-24 11:18:23 +0200 (Fri, 24 May 2013) | 3 lines
A whitelist is now being used to limit the number of frame order GUI tests
to 1.
........
r19727 | bugman | 2013-05-24 11:50:00 +0200 (Fri, 24 May 2013) | 6 lines
Fix for the relax test suite on Python 3.1.
The TextTestRunner class in the unittest module is missing a few arguments
present in all other
Python versions.
........
r19728 | bugman | 2013-05-24 11:55:57 +0200 (Fri, 24 May 2013) | 3 lines
The fix of r19727 was extended to Python versions 2.6 and lower as well.
........
r19729 | bugman | 2013-05-24 12:10:02 +0200 (Fri, 24 May 2013) | 14 lines
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().
........
r19730 | bugman | 2013-05-24 15:52:17 +0200 (Fri, 24 May 2013) | 3 lines
The molmol.macro_run user function file argument now has a description.
........
r19731 | bugman | 2013-05-24 16:12:27 +0200 (Fri, 24 May 2013) | 6 lines
Huge speed up of the system tests for the loading and creation of
model-free saved states.
The OMP files used for the system test have been truncated from 134 to 7
spins, changing the timing
of 6 system tests from 11-13 seconds to less than 0.5 seconds each.
........
r19732 | bugman | 2013-05-24 16:17:27 +0200 (Fri, 24 May 2013) | 7 lines
All of the binary file arguments for the user functions now are file
selection GUI elements.
The GUI user function wizard pages now have file selection buttons for
selecting the executable to
run. These all have the preview button disabled. The results.read and
state.load GUI elements also
have the preview button disabled.
........
r19733 | bugman | 2013-05-24 16:35:06 +0200 (Fri, 24 May 2013) | 3 lines
The user function 'prompt' description elements as now displayed in the GUI
wizard page.
........
Added:
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.2.bz2
- copied unchanged from r19733,
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.2.bz2
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_1.3_pre_py2.7.3_v1.bz2
- copied unchanged from r19733,
trunk/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
- copied unchanged from r19733,
trunk/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
- copied unchanged from r19733,
trunk/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
- copied unchanged from r19733,
trunk/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
- copied unchanged from r19733,
trunk/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.bz2
- copied unchanged from r19733,
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0.bz2
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2
- copied unchanged from r19733,
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc2_3.0_oldxml.bz2
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0.bz2
- copied unchanged from r19733,
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0.bz2
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0_oldxml.bz2
- copied unchanged from r19733,
trunk/test_suite/shared_data/model_free/OMP/final_results_trunc_3.0_oldxml.bz2
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/data_store/__init__.py
branches/relax_disp/data_store/pipe_container.py
branches/relax_disp/gui/components/relax_data.py
branches/relax_disp/gui/uf_objects.py
branches/relax_disp/lib/errors.py
branches/relax_disp/pipe_control/dasha.py
branches/relax_disp/pipe_control/relax_data.py
branches/relax_disp/pipe_control/spectrometer.py
branches/relax_disp/specific_analyses/model_free/results.py
branches/relax_disp/test_suite/gui_tests/frame_order.py
branches/relax_disp/test_suite/relax_test_runner.py
branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_pre_py2.7.3_v2.bz2
branches/relax_disp/test_suite/system_tests/model_free.py
branches/relax_disp/test_suite/system_tests/scripts/relax_data_reset.py
branches/relax_disp/user_functions/dasha.py
branches/relax_disp/user_functions/dx.py
branches/relax_disp/user_functions/grace.py
branches/relax_disp/user_functions/molmol.py
branches/relax_disp/user_functions/palmer.py
branches/relax_disp/user_functions/relax_data.py
branches/relax_disp/user_functions/results.py
branches/relax_disp/user_functions/spectrometer.py
branches/relax_disp/user_functions/state.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/relax_disp/data_store/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/data_store/__init__.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/data_store/pipe_container.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/data_store/pipe_container.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/gui/components/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/components/relax_data.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/gui/uf_objects.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/uf_objects.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/lib/errors.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/errors.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/pipe_control/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/dasha.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/pipe_control/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/relax_data.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/pipe_control/spectrometer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/spectrometer.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/specific_analyses/model_free/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/model_free/results.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/test_suite/gui_tests/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/frame_order.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/test_suite/relax_test_runner.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/relax_test_runner.py?rev=19734&r1=19733&r2=19734&view=diff
Modified:
branches/relax_disp/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/branches/relax_disp/test_suite/shared_data/model_free/OMP/final_results_trunc_1.3_pre_py2.7.3_v2.bz2?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/test_suite/system_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/model_free.py?rev=19734&r1=19733&r2=19734&view=diff
Modified:
branches/relax_disp/test_suite/system_tests/scripts/relax_data_reset.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_data_reset.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/user_functions/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/dasha.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/user_functions/dx.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/dx.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/user_functions/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/grace.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/user_functions/molmol.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/molmol.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/user_functions/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/palmer.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/user_functions/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/relax_data.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/user_functions/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/results.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/user_functions/spectrometer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/spectrometer.py?rev=19734&r1=19733&r2=19734&view=diff
Modified: branches/relax_disp/user_functions/state.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/state.py?rev=19734&r1=19733&r2=19734&view=diff
r19734 - in /branches/relax_disp: ./ data_store/ gui/ gui/components/ lib/ pipe_control/ specific_analyses/model_free/ test_...