Author: bugman
Date: Thu May 23 19:28:50 2013
New Revision: 19720
URL: http://svn.gna.org/viewcvs/relax?rev=19720&view=rev
Log:
Merged revisions 19701-19709 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r19701 | bugman | 2013-05-23 18:35:19 +0200 (Thu, 23 May 2013) | 7 lines
The peak intensity wizard can now function remotely when the spins are not
named.
This will be needed for the GUI tests to allow the Question() call to be
bypassed and still adding
the spin.name user function as the first page of the wizard. The key for
spin.name page has also
been fixed so that the page can be accessed.
........
r19702 | bugman | 2013-05-23 18:36:39 +0200 (Thu, 23 May 2013) | 3 lines
Fixes for the Jw.test_calc system test - the spectral density value
comparison is now significant.
........
r19703 | bugman | 2013-05-23 18:39:09 +0200 (Thu, 23 May 2013) | 8 lines
The timing of individual tests in the relax test suite can now be printed
out.
The new command line argument --time has been added which, when supplied
with one of the test suite
arguments, will cause the time required to complete each individual test to
be displayed. Instead
of just printing the characters '.', 'F', and 'E' for each test, now these
characters are postfixed
with the time in seconds, the name of the test and ending in a newline
character.
........
r19704 | bugman | 2013-05-23 18:40:12 +0200 (Thu, 23 May 2013) | 6 lines
Big speed up of the test suite by skipping a large number of redundant
Frame Order system tests.
These are tests of using only PCS or only RDC data. These tests are still
active for the
pseudo-ellipse just to make sure that a whole missing data type can be
handled.
........
r19705 | bugman | 2013-05-23 18:42:08 +0200 (Thu, 23 May 2013) | 3 lines
Suppressed the reporting of skipped tests in the test suite if the module
is set to None.
........
r19706 | bugman | 2013-05-23 18:42:41 +0200 (Thu, 23 May 2013) | 5 lines
The preview button in the file selection elements of the user function
windows can now be disabled.
This is via the new wiz_filesel_preview argument being set to False.
........
r19707 | bugman | 2013-05-23 18:43:23 +0200 (Thu, 23 May 2013) | 7 lines
Merged the frq.set and temperature user functions into the new spectrometer
user function class.
The frq.set user function is now called spectrometer.frequency and
temperature is now
spectrometer.temperature. To match these changes, the cdp.frq variable is
now called
cdp.spectrometer_frq.
........
r19708 | bugman | 2013-05-23 19:11:08 +0200 (Thu, 23 May 2013) | 7 lines
Modified the spectrometer.frequency user function so that a frequency list
and count is stored.
These are the new cdp.spectrometer_frq_list and cdp.spectrometer_frq_count
variables. This will
allow various parts of relax which assemble frequency information to be
simplified and made more
consistent.
........
r19709 | bugman | 2013-05-23 19:13:09 +0200 (Thu, 23 May 2013) | 6 lines
Created basic SVG and PNG graphics for the spectrometer user function class.
The spectrometer is black so as not to offend Bruker, Varian, or Jeol users
by avoiding a colour
from one of these companies.
........
Added:
branches/relax_disp/graphics/relax_icons/128x128/spectrometer.png
- copied unchanged from r19709,
trunk/graphics/relax_icons/128x128/spectrometer.png
branches/relax_disp/graphics/relax_icons/16x16/spectrometer.png
- copied unchanged from r19709,
trunk/graphics/relax_icons/16x16/spectrometer.png
branches/relax_disp/graphics/relax_icons/22x22/spectrometer.png
- copied unchanged from r19709,
trunk/graphics/relax_icons/22x22/spectrometer.png
branches/relax_disp/graphics/relax_icons/32x32/spectrometer.png
- copied unchanged from r19709,
trunk/graphics/relax_icons/32x32/spectrometer.png
branches/relax_disp/graphics/relax_icons/48x48/spectrometer.png
- copied unchanged from r19709,
trunk/graphics/relax_icons/48x48/spectrometer.png
branches/relax_disp/graphics/relax_icons/svg/spectrometer.svg
- copied unchanged from r19709,
trunk/graphics/relax_icons/svg/spectrometer.svg
branches/relax_disp/graphics/relax_icons/svg/spectrometer.txt
- copied unchanged from r19709,
trunk/graphics/relax_icons/svg/spectrometer.txt
branches/relax_disp/graphics/wizards/spectrometer.png
- copied unchanged from r19709, trunk/graphics/wizards/spectrometer.png
branches/relax_disp/pipe_control/spectrometer.py
- copied unchanged from r19709, trunk/pipe_control/spectrometer.py
branches/relax_disp/user_functions/spectrometer.py
- copied unchanged from r19709, trunk/user_functions/spectrometer.py
Removed:
branches/relax_disp/pipe_control/frq.py
branches/relax_disp/pipe_control/temperature.py
branches/relax_disp/user_functions/frq.py
branches/relax_disp/user_functions/temperature.py
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/auto_analyses/dauvergne_protocol.py
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/gui/wizards/peak_intensity.py
branches/relax_disp/pipe_control/__init__.py
branches/relax_disp/pipe_control/align_tensor.py
branches/relax_disp/pipe_control/dasha.py
branches/relax_disp/pipe_control/palmer.py
branches/relax_disp/pipe_control/pcs.py
branches/relax_disp/pipe_control/relax_data.py
branches/relax_disp/relax.py
branches/relax_disp/sample_scripts/model_free/grace_ri_data_correlation.py
branches/relax_disp/sample_scripts/model_free/table_csv.py
branches/relax_disp/sample_scripts/model_free/table_latex.py
branches/relax_disp/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py
branches/relax_disp/specific_analyses/consistency_tests/__init__.py
branches/relax_disp/specific_analyses/frame_order/__init__.py
branches/relax_disp/specific_analyses/jw_mapping/__init__.py
branches/relax_disp/specific_analyses/model_free/bmrb.py
branches/relax_disp/specific_analyses/model_free/macro_base.py
branches/relax_disp/specific_analyses/model_free/main.py
branches/relax_disp/specific_analyses/model_free/mf_minimise.py
branches/relax_disp/specific_analyses/model_free/results.py
branches/relax_disp/specific_analyses/n_state_model/__init__.py
branches/relax_disp/test_suite/gui_tests/bruker.py
branches/relax_disp/test_suite/gui_tests/state.py
branches/relax_disp/test_suite/relax_test_runner.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/full_analysis.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/generate_base.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/rigid/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_back_calc.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py
branches/relax_disp/test_suite/shared_data/frame_order/displacements/generate_data.py
branches/relax_disp/test_suite/shared_data/frame_order/displacements/optimisation.py
branches/relax_disp/test_suite/shared_data/frame_order/displacements/rigid_test.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/bmrb.py
branches/relax_disp/test_suite/system_tests/bruker.py
branches/relax_disp/test_suite/system_tests/dasha.py
branches/relax_disp/test_suite/system_tests/frame_order.py
branches/relax_disp/test_suite/system_tests/jw_mapping.py
branches/relax_disp/test_suite/system_tests/model_free.py
branches/relax_disp/test_suite/system_tests/palmer.py
branches/relax_disp/test_suite/system_tests/relax_data.py
branches/relax_disp/test_suite/system_tests/scripts/frame_order/cam/base_script.py
branches/relax_disp/test_suite/system_tests/scripts/frame_order/rigid_test.py
branches/relax_disp/test_suite/system_tests/scripts/model_free/latex_mf_table.py
branches/relax_disp/test_suite/system_tests/scripts/model_free/opt_tm_fns.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/A_to_chi.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/align_fit.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/data_copying.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/dna_pcs_fit.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/frame_order_align_fit.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/missing_data_test.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/monte_carlo_testing.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/paramag_align_fit.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/paramag_centre_fit.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/pcs_back_calc.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/pcs_to_rdc.py
branches/relax_disp/test_suite/system_tests/scripts/n_state_model/populations.py
branches/relax_disp/test_suite/test_suite_runner.py
branches/relax_disp/test_suite/unit_tests/relax_data_testing_base.py
branches/relax_disp/user_functions/__init__.py
branches/relax_disp/user_functions/consistency_tests.py
branches/relax_disp/user_functions/jw_mapping.py
branches/relax_disp/user_functions/objects.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/relax_disp/auto_analyses/dauvergne_protocol.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/auto_analyses/dauvergne_protocol.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/data_store/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/data_store/__init__.py?rev=19720&r1=19719&r2=19720&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=19720&r1=19719&r2=19720&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=19720&r1=19719&r2=19720&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=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/gui/wizards/peak_intensity.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/wizards/peak_intensity.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/pipe_control/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/__init__.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/pipe_control/align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/align_tensor.py?rev=19720&r1=19719&r2=19720&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=19720&r1=19719&r2=19720&view=diff
Removed: branches/relax_disp/pipe_control/frq.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/frq.py?rev=19719&view=auto
Modified: branches/relax_disp/pipe_control/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/palmer.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/pipe_control/pcs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/pcs.py?rev=19720&r1=19719&r2=19720&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=19720&r1=19719&r2=19720&view=diff
Removed: branches/relax_disp/pipe_control/temperature.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/temperature.py?rev=19719&view=auto
Modified: branches/relax_disp/relax.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/relax.py?rev=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/sample_scripts/model_free/grace_ri_data_correlation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/sample_scripts/model_free/grace_ri_data_correlation.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/sample_scripts/model_free/table_csv.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/sample_scripts/model_free/table_csv.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/sample_scripts/model_free/table_latex.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/sample_scripts/model_free/table_latex.py?rev=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/sample_scripts/n_state_model/conformation_analysis_rdc%2Bpcs.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/specific_analyses/consistency_tests/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/consistency_tests/__init__.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/specific_analyses/frame_order/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/frame_order/__init__.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/specific_analyses/jw_mapping/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/jw_mapping/__init__.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/specific_analyses/model_free/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/model_free/bmrb.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/specific_analyses/model_free/macro_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/model_free/macro_base.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/specific_analyses/model_free/main.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/model_free/main.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/specific_analyses/model_free/mf_minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/model_free/mf_minimise.py?rev=19720&r1=19719&r2=19720&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=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/specific_analyses/n_state_model/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/n_state_model/__init__.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/test_suite/gui_tests/bruker.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/bruker.py?rev=19720&r1=19719&r2=19720&view=diff
Modified: branches/relax_disp/test_suite/gui_tests/state.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/state.py?rev=19720&r1=19719&r2=19720&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=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py?rev=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py?rev=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py?rev=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/test_suite/shared_data/frame_order/cam/full_analysis.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/frame_order/cam/full_analysis.py?rev=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/test_suite/shared_data/frame_order/cam/generate_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/frame_order/cam/generate_base.py?rev=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py?rev=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py?rev=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py?rev=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py?rev=19720&r1=19719&r2=19720&view=diff
Modified:
branches/relax_disp/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[... 149 lines stripped ...]
r19720 - in /branches/relax_disp: ./ auto_analyses/ data_store/ graphics/relax_icons/128x128/ graphics/relax_icons/16x16/ gr...