Author: bugman Date: Thu Oct 17 13:41:22 2013 New Revision: 21158 URL: http://svn.gna.org/viewcvs/relax?rev=21158&view=rev Log: A large number of fixes for the relaxation dispersion system tested needed for the fix of r21156. The fix of r21156 changed the format of the keys by which the R2eff/R1rho data is accessed, so many changes were required. Additionally, due to slightly better error estimates, all of the tests using Flemming Hansen's CPMG data needed to be slightly modified. Added: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/k_AB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/k_AB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/k_AB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/k_AB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/k_AB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/k_AB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/kB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/kB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/kC.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/kC.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/phi_ex_B.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/phi_ex_B.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/phi_ex_C.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/phi_ex_C.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/k_AB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/k_AB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/ - copied from r21157, branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS 2-site 3D/ branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/k_AB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/k_AB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/ - copied from r21156, branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS 2-site expanded/ branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/k_AB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/k_AB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/ - copied from r21156, branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS 2-site star/ branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/k_AB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/k_AB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/dwH.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/dwH.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/k_AB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/k_AB.out branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/r2eff_calc_trunc.log branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/relax_1_ini_trunc.log Removed: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS 2-site 3D/ branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS 2-site expanded/ branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS 2-site star/ Modified: branches/relax_disp/test_suite/shared_data/dispersion/Hansen/base_pipe.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/cr72/spin_70_N.in branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/cr72/spin_70_N.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/cr72/spin_71_N.in branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/cr72/spin_71_N.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/it99/spin_70_N.in branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/it99/spin_70_N.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/it99/spin_71_N.in branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/it99/spin_71_N.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/lm63/spin_70_N.in branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/lm63/spin_70_N.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/lm63/spin_71_N.in branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/lm63/spin_71_N.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/lm63_3-site/spin_70_N.in branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/lm63_3-site/spin_70_N.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/lm63_3-site/spin_71_N.in branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/lm63_3-site/spin_71_N.out 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_results/CR72 full/chi2.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/disp_70_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/disp_71_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/dw.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/dw.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/grace2images.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/kex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/kex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/pA.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/pA.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/pB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/pB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/results.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/tex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72 full/tex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/chi2.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/disp_70_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/disp_71_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/dw.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/dw.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/grace2images.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/kex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/kex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/pA.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/pA.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/pB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/pB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/results.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/tex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/CR72/tex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/chi2.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/disp_70_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/disp_71_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/grace2images.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/kex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/kex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/padw2.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/padw2.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/phi_ex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/phi_ex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/results.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/tex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/IT99/tex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/chi2.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/disp_70_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/disp_71_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/grace2images.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63 3-site/results.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/chi2.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/disp_70_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/disp_71_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/grace2images.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/kex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/kex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/phi_ex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/phi_ex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/results.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/tex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/LM63/tex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/chi2.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/disp_70_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/disp_71_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/dw.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/dw.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/grace2images.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/kex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/kex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/pA.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/pA.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/pB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/pB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/results.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/tex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site 3D/tex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/chi2.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/disp_70_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/disp_71_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/dw.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/dw.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/grace2images.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/kex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/kex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/pA.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/pA.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/pB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/pB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/results.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/tex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site expanded/tex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/chi2.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/disp_70_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/disp_71_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/dw.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/dw.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/grace2images.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/kex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/kex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/pA.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/pA.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/pB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/pB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/results.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/tex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/NS CPMG 2-site star/tex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/No Rex/chi2.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/No Rex/disp_70_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/No Rex/disp_71_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/No Rex/grace2images.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/No Rex/results.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/chi2.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/disp_70_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/disp_71_N.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/dw.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/dw.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/grace2images.py branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/kex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/kex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/pA.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/pA.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/pB.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/pB.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/phi_ex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/phi_ex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/results.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/tex.agr branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final/tex.out branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/final_state.bz2 branches/relax_disp/test_suite/shared_data/dispersion/Hansen/relax_results/relax_disp.log 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_calc_trunc.log 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_1_ini_trunc.log branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/acbp_cpmg_disp_101MGuHCl_40C_041223/ini_setup_trunc.bz2 [... 597 lines stripped ...]