r22943 - in /trunk: docs/latex/ gui/components/ gui/wizards/ sample_scripts/relax_disp/ specific_analyses/relax_disp/ test_s...r22943 - in /trunk: docs/latex/ gui/components/ gui/wizards/ sample_scripts/relax_disp/ specific_analyses/relax_disp/ test_s...Author: bugman Date: Sun May 4 13:39:40 2014 New Revision: 22943 URL: http://svn.gna.org/viewcvs/relax?rev=22943&view=rev Log: Renamed the relax_disp.cpmg_frq user function to relax_disp.cpmg_setup and added some new options. This follows from the thread http://thread.gmane.org/gmane.science.nmr.relax.devel/5511/focus=5520. The ncyc_even option has been added so the user can specify if the pulse sequence requires an even number of CPMG blocks. This is for use in the interpolated dispersion curves, but could have other uses in the future. Modified: trunk/docs/latex/dispersion.tex trunk/gui/components/spectrum.py trunk/gui/wizards/peak_intensity.py trunk/sample_scripts/relax_disp/cpmg_analysis.py trunk/specific_analyses/relax_disp/data.py trunk/test_suite/gui_tests/relax_disp.py trunk/test_suite/shared_data/dispersion/Hansen/generate_r2eff_files.py trunk/test_suite/shared_data/dispersion/Hansen/multi_processor/cluster_analysis.py trunk/test_suite/shared_data/dispersion/Hansen/multi_processor/precluster.py trunk/test_suite/shared_data/dispersion/Hansen/nessy_results/nessy_save_file.py trunk/test_suite/shared_data/dispersion/Hansen/r2eff_calc.py trunk/test_suite/shared_data/dispersion/Hansen/relax_disp.py trunk/test_suite/shared_data/dispersion/Hansen/relax_disp_trunc.py trunk/test_suite/shared_data/dispersion/Hansen/relax_results/analysis_mmq_cr72.py trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/relax_3_spectra_settings.py trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/relax_3_spectra_settings.py trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/15N_SQ_CPMG/optimise.py trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/1H_SQ_CPMG/optimise.py trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/DQ_CPMG/optimise.py trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/ZQ_CPMG/optimise.py trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution.py trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution_cr72.py trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/optimise_sq.py trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis.py trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis_clustered.py trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis_mmq_cr72.py trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis_mmq_cr72_clustered.py trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/r2eff_calc.py trunk/test_suite/shared_data/dispersion/lm63_3site/r2eff_calc.py trunk/test_suite/shared_data/dispersion/lm63_3site/relax_results/relax_disp.py trunk/test_suite/shared_data/dispersion/ns_mmq_3site/relax_results/solution.py trunk/test_suite/shared_data/dispersion/ns_mmq_3site_linear/relax_results/solution.py trunk/test_suite/system_tests/relax_disp.py trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py trunk/test_suite/system_tests/scripts/relax_disp/ns_mmq_3site.py trunk/test_suite/system_tests/scripts/relax_disp/ns_mmq_3site_linear.py trunk/test_suite/system_tests/scripts/relax_disp/r2eff_calc.py trunk/test_suite/system_tests/scripts/relax_disp/sprangers_data.py trunk/test_suite/unit_tests/_prompt/test_relax_disp.py trunk/user_functions/relax_disp.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/docs/latex/dispersion.tex URL: http://svn.gna.org/viewcvs/relax/trunk/docs/latex/dispersion.tex?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/gui/components/spectrum.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/components/spectrum.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/gui/wizards/peak_intensity.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/wizards/peak_intensity.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/sample_scripts/relax_disp/cpmg_analysis.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/relax_disp/cpmg_analysis.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/specific_analyses/relax_disp/data.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/data.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/gui_tests/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/relax_disp.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Hansen/generate_r2eff_files.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Hansen/generate_r2eff_files.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Hansen/multi_processor/cluster_analysis.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Hansen/multi_processor/cluster_analysis.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Hansen/multi_processor/precluster.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Hansen/multi_processor/precluster.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Hansen/nessy_results/nessy_save_file.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Hansen/nessy_results/nessy_save_file.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Hansen/r2eff_calc.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Hansen/r2eff_calc.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Hansen/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Hansen/relax_disp.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Hansen/relax_disp_trunc.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Hansen/relax_disp_trunc.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Hansen/relax_results/analysis_mmq_cr72.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Hansen/relax_results/analysis_mmq_cr72.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/relax_3_spectra_settings.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/relax_3_spectra_settings.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/relax_3_spectra_settings.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/relax_3_spectra_settings.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/15N_SQ_CPMG/optimise.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/15N_SQ_CPMG/optimise.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/1H_SQ_CPMG/optimise.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/1H_SQ_CPMG/optimise.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/DQ_CPMG/optimise.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/DQ_CPMG/optimise.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/ZQ_CPMG/optimise.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/ZQ_CPMG/optimise.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution_cr72.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution_cr72.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/optimise_sq.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/optimise_sq.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis_clustered.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis_clustered.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis_mmq_cr72.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis_mmq_cr72.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis_mmq_cr72_clustered.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/analysis_mmq_cr72_clustered.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/r2eff_calc.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Sprangers_ClpP/r2eff_calc.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/lm63_3site/r2eff_calc.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/lm63_3site/r2eff_calc.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/lm63_3site/relax_results/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/lm63_3site/relax_results/relax_disp.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/ns_mmq_3site/relax_results/solution.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/ns_mmq_3site/relax_results/solution.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/shared_data/dispersion/ns_mmq_3site_linear/relax_results/solution.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/ns_mmq_3site_linear/relax_results/solution.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/system_tests/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/system_tests/scripts/relax_disp/ns_mmq_3site.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_disp/ns_mmq_3site.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/system_tests/scripts/relax_disp/ns_mmq_3site_linear.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_disp/ns_mmq_3site_linear.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/system_tests/scripts/relax_disp/r2eff_calc.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_disp/r2eff_calc.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/system_tests/scripts/relax_disp/sprangers_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_disp/sprangers_data.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/test_suite/unit_tests/_prompt/test_relax_disp.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_prompt/test_relax_disp.py?rev=22943&r1=22942&r2=22943&view=diff Modified: trunk/user_functions/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/trunk/user_functions/relax_disp.py?rev=22943&r1=22942&r2=22943&view=diff