Author: bugman Date: Fri Sep 6 10:26:40 2013 New Revision: 20876 URL: http://svn.gna.org/viewcvs/relax?rev=20876&view=rev Log: Moved the experiment type setting into per spectra settings. Progress sr #3071: https://gna.org/support/index.php?3071 - Implementation of Tollinger/Kay dispersion model (2001) Following the guide at: http://wiki.nmr-relax.com/Tutorial_for_adding_relaxation_dispersion_models_to_relax Troels E. Linnet provided this patch. Commit by: tlinnet _aaattt_ gmail_dot_com Signed-off-by: Edward d'Auvergne <edward@xxxxxxxxxxxxx> Modified: branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_1_ini.py branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_1_ini_trunc.py branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_3_spectra_settings.py Modified: branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_1_ini.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_1_ini.py?rev=20876&r1=20875&r2=20876&view=diff ============================================================================== --- branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_1_ini.py (original) +++ branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_1_ini.py Fri Sep 6 10:26:40 2013 @@ -3,9 +3,6 @@ pipe_name = 'base pipe' pipe_bundle = 'relax_disp' pipe.create(pipe_name=pipe_name, bundle=pipe_bundle, pipe_type='relax_disp') - -# Set the relaxation dispersion experiment type. -relax_disp.exp_type('cpmg fixed') # Create the spins script(file='relax_2_spins.py', dir=None) Modified: branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_1_ini_trunc.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_1_ini_trunc.py?rev=20876&r1=20875&r2=20876&view=diff ============================================================================== --- branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_1_ini_trunc.py (original) +++ branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_1_ini_trunc.py Fri Sep 6 10:26:40 2013 @@ -3,9 +3,6 @@ pipe_name = 'base pipe' pipe_bundle = 'relax_disp' pipe.create(pipe_name=pipe_name, bundle=pipe_bundle, pipe_type='relax_disp') - -# Set the relaxation dispersion experiment type. -relax_disp.exp_type('cpmg fixed') # Create the spins script(file='relax_2_spins.py', dir=None) Modified: branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_3_spectra_settings.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_3_spectra_settings.py?rev=20876&r1=20875&r2=20876&view=diff ============================================================================== --- branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_3_spectra_settings.py (original) +++ branches/relax_disp/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/relax_3_spectra_settings.py Fri Sep 6 10:26:40 2013 @@ -24,6 +24,9 @@ # Set the current spectrum id current_id = "Z_A%s"%(i) + # Set the current experiment type. + relax_disp.exp_type(spectrum_id=current_id, exp_type='cpmg fixed') + # Set the peak intensity errors, as defined as the baseplane RMSD. spectrum.baseplane_rmsd(error=rmsd_err, spectrum_id=current_id)