r19707 - in /trunk: auto_analyses/ data_store/ gui/components/ pipe_control/ sample_scripts/model_free/ sample_scripts/n_sta...r19707 - in /trunk: auto_analyses/ data_store/ gui/components/ pipe_control/ sample_scripts/model_free/ sample_scripts/n_sta...Author: bugman Date: Thu May 23 18:43:23 2013 New Revision: 19707 URL: http://svn.gna.org/viewcvs/relax?rev=19707&view=rev Log: 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. Added: trunk/pipe_control/spectrometer.py - copied, changed from r19694, trunk/pipe_control/frq.py trunk/user_functions/spectrometer.py - copied, changed from r19694, trunk/user_functions/frq.py Removed: trunk/pipe_control/frq.py trunk/pipe_control/temperature.py trunk/user_functions/frq.py trunk/user_functions/temperature.py Modified: trunk/auto_analyses/dauvergne_protocol.py trunk/data_store/__init__.py trunk/data_store/pipe_container.py trunk/gui/components/relax_data.py trunk/pipe_control/__init__.py trunk/pipe_control/align_tensor.py trunk/pipe_control/dasha.py trunk/pipe_control/palmer.py trunk/pipe_control/pcs.py trunk/pipe_control/relax_data.py trunk/sample_scripts/model_free/grace_ri_data_correlation.py trunk/sample_scripts/model_free/table_csv.py trunk/sample_scripts/model_free/table_latex.py trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py trunk/specific_analyses/consistency_tests/__init__.py trunk/specific_analyses/frame_order/__init__.py trunk/specific_analyses/jw_mapping/__init__.py trunk/specific_analyses/model_free/bmrb.py trunk/specific_analyses/model_free/macro_base.py trunk/specific_analyses/model_free/main.py trunk/specific_analyses/model_free/mf_minimise.py trunk/specific_analyses/model_free/results.py trunk/specific_analyses/n_state_model/__init__.py trunk/test_suite/gui_tests/bruker.py trunk/test_suite/gui_tests/state.py trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py trunk/test_suite/shared_data/frame_order/cam/full_analysis.py trunk/test_suite/shared_data/frame_order/cam/generate_base.py trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_back_calc.py trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py trunk/test_suite/shared_data/frame_order/displacements/generate_data.py trunk/test_suite/shared_data/frame_order/displacements/optimisation.py trunk/test_suite/shared_data/frame_order/displacements/rigid_test.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/bmrb.py trunk/test_suite/system_tests/bruker.py trunk/test_suite/system_tests/dasha.py trunk/test_suite/system_tests/model_free.py trunk/test_suite/system_tests/palmer.py trunk/test_suite/system_tests/relax_data.py trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py trunk/test_suite/system_tests/scripts/model_free/latex_mf_table.py trunk/test_suite/system_tests/scripts/model_free/opt_tm_fns.py trunk/test_suite/system_tests/scripts/n_state_model/A_to_chi.py trunk/test_suite/system_tests/scripts/n_state_model/align_fit.py trunk/test_suite/system_tests/scripts/n_state_model/data_copying.py trunk/test_suite/system_tests/scripts/n_state_model/dna_pcs_fit.py trunk/test_suite/system_tests/scripts/n_state_model/frame_order_align_fit.py trunk/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py trunk/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py trunk/test_suite/system_tests/scripts/n_state_model/missing_data_test.py trunk/test_suite/system_tests/scripts/n_state_model/monte_carlo_testing.py trunk/test_suite/system_tests/scripts/n_state_model/paramag_align_fit.py trunk/test_suite/system_tests/scripts/n_state_model/paramag_centre_fit.py trunk/test_suite/system_tests/scripts/n_state_model/pcs_back_calc.py trunk/test_suite/system_tests/scripts/n_state_model/pcs_to_rdc.py trunk/test_suite/system_tests/scripts/n_state_model/populations.py trunk/test_suite/unit_tests/relax_data_testing_base.py trunk/user_functions/__init__.py trunk/user_functions/consistency_tests.py trunk/user_functions/jw_mapping.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/auto_analyses/dauvergne_protocol.py URL: http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/dauvergne_protocol.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/data_store/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/data_store/__init__.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/data_store/pipe_container.py URL: http://svn.gna.org/viewcvs/relax/trunk/data_store/pipe_container.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/gui/components/relax_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/components/relax_data.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/pipe_control/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/__init__.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/pipe_control/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/align_tensor.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/pipe_control/dasha.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/dasha.py?rev=19707&r1=19706&r2=19707&view=diff Removed: trunk/pipe_control/frq.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/frq.py?rev=19706&view=auto Modified: trunk/pipe_control/palmer.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/palmer.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/pipe_control/pcs.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/pcs.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/pipe_control/relax_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/relax_data.py?rev=19707&r1=19706&r2=19707&view=diff Copied: trunk/pipe_control/spectrometer.py (from r19694, trunk/pipe_control/frq.py) URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/spectrometer.py?p2=trunk/pipe_control/spectrometer.py&p1=trunk/pipe_control/frq.py&r1=19694&r2=19707&rev=19707&view=diff Removed: trunk/pipe_control/temperature.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/temperature.py?rev=19706&view=auto Modified: trunk/sample_scripts/model_free/grace_ri_data_correlation.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/grace_ri_data_correlation.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/sample_scripts/model_free/table_csv.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/table_csv.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/sample_scripts/model_free/table_latex.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/table_latex.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/n_state_model/conformation_analysis_rdc%2Bpcs.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/specific_analyses/consistency_tests/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/consistency_tests/__init__.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/specific_analyses/frame_order/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/__init__.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/specific_analyses/jw_mapping/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/jw_mapping/__init__.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/specific_analyses/model_free/bmrb.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/bmrb.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/specific_analyses/model_free/macro_base.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/macro_base.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/specific_analyses/model_free/main.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/main.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/specific_analyses/model_free/mf_minimise.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/mf_minimise.py?rev=19707&r1=19706&r2=19707&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=19707&r1=19706&r2=19707&view=diff Modified: trunk/specific_analyses/n_state_model/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/n_state_model/__init__.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/gui_tests/bruker.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/bruker.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/gui_tests/state.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/state.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/full_analysis.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/full_analysis.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/generate_base.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/generate_base.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_back_calc.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_back_calc.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/displacements/generate_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/generate_data.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/displacements/optimisation.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/optimisation.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py?rev=19707&r1=19706&r2=19707&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=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/bmrb.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/bmrb.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/bruker.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/bruker.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/dasha.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/dasha.py?rev=19707&r1=19706&r2=19707&view=diff 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=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/palmer.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/palmer.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/relax_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_data.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/scripts/model_free/latex_mf_table.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/model_free/latex_mf_table.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/scripts/model_free/opt_tm_fns.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/model_free/opt_tm_fns.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/scripts/n_state_model/A_to_chi.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/A_to_chi.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/scripts/n_state_model/align_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/align_fit.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/scripts/n_state_model/data_copying.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/data_copying.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/scripts/n_state_model/dna_pcs_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/dna_pcs_fit.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/scripts/n_state_model/frame_order_align_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/frame_order_align_fit.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py?rev=19707&r1=19706&r2=19707&view=diff Modified: trunk/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py [... 44 lines stripped ...]