Author: bugman Date: Mon Nov 18 20:55:48 2013 New Revision: 21505 URL: http://svn.gna.org/viewcvs/relax?rev=21505&view=rev Log: Change of the base relaxation dispersion experiment types. The base CPMG-type experiment has been changed from "CPMG" to "SQ CPMG". This is for better combined proton-heteronuclear SQ, ZQ, DQ, and MQ (MMQ) data support. The relax_disp.exp_type user function now also as the proton SQ and MQ CPMG-types available to select from rather than the previous behaviour of relax automatically determining the type from the spin type. All of the CPMG experiment type variables in specific_analyses.relax_disp.variables have been renamed for better ordering. Many changes were therefore required. Modified: branches/relax_disp/docs/latex/dispersion.tex branches/relax_disp/sample_scripts/relax_disp/cpmg_analysis.py branches/relax_disp/specific_analyses/relax_disp/api.py branches/relax_disp/specific_analyses/relax_disp/catia.py branches/relax_disp/specific_analyses/relax_disp/disp_data.py branches/relax_disp/specific_analyses/relax_disp/variables.py branches/relax_disp/target_functions/relax_disp.py branches/relax_disp/test_suite/gui_tests/relax_disp.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/base_pipe.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/generate_r2eff_files.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/multi_processor/cluster_analysis.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/multi_processor/precluster.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_calc.log branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_calc.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_pipe.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_values.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_disp.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_disp_trunc.py branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/ini_setup_trunc.bz2 branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_pipe_trunc.bz2 branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/relax_3_spectra_settings.py branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/ini_setup_trunc.bz2 branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_pipe_trunc.bz2 branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/relax_3_spectra_settings.py branches/relax_disp/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/optimise_sq.py branches/relax_disp/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/relax_state_sq.py branches/relax_disp/test_suite/shared_data/dispersion/lm63_3site/r2eff_calc.py branches/relax_disp/test_suite/shared_data/dispersion/lm63_3site/relax_results/relax_disp.py branches/relax_disp/test_suite/system_tests/relax_disp.py branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_r2eff_data.py branches/relax_disp/test_suite/system_tests/scripts/relax_disp/r2eff_calc.py branches/relax_disp/user_functions/relax_disp.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/relax_disp/docs/latex/dispersion.tex URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/dispersion.tex?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/sample_scripts/relax_disp/cpmg_analysis.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/sample_scripts/relax_disp/cpmg_analysis.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/specific_analyses/relax_disp/api.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/api.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/specific_analyses/relax_disp/catia.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/catia.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/specific_analyses/relax_disp/variables.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/variables.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/target_functions/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/target_functions/relax_disp.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/gui_tests/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/relax_disp.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/base_pipe.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Hansen/base_pipe.bz2?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/generate_r2eff_files.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Hansen/generate_r2eff_files.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/multi_processor/cluster_analysis.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Hansen/multi_processor/cluster_analysis.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/multi_processor/precluster.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Hansen/multi_processor/precluster.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_calc.log URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_calc.log?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_calc.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_calc.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_pipe.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_pipe.bz2?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_values.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_values.bz2?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_disp.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_disp_trunc.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_disp_trunc.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/ini_setup_trunc.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/ini_setup_trunc.bz2?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_pipe_trunc.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/r2eff_pipe_trunc.bz2?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/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/branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_048MGuHCl_40C_041223/relax_3_spectra_settings.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/ini_setup_trunc.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/ini_setup_trunc.bz2?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_pipe_trunc.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_pipe_trunc.bz2?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/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/branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/relax_3_spectra_settings.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/optimise_sq.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/optimise_sq.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/relax_state_sq.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/relax_state_sq.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/lm63_3site/r2eff_calc.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/lm63_3site/r2eff_calc.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/shared_data/dispersion/lm63_3site/relax_results/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/lm63_3site/relax_results/relax_disp.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/system_tests/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/relax_disp.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_r2eff_data.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_r2eff_data.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/test_suite/system_tests/scripts/relax_disp/r2eff_calc.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_disp/r2eff_calc.py?rev=21505&r1=21504&r2=21505&view=diff Modified: branches/relax_disp/user_functions/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/relax_disp.py?rev=21505&r1=21504&r2=21505&view=diff