Author: bugman Date: Fri Nov 29 11:11:40 2013 New Revision: 21708 URL: http://svn.gna.org/viewcvs/relax?rev=21708&view=rev Log: All of the relaxation dispersion auto-analysis options are now exposed by the sample scripts. This included the pre_run_dir argument for specifying a directory of results from a non-clustered analysis and the flag for running MC simulations for all models. Modified: trunk/sample_scripts/relax_disp/R1rho_analysis.py trunk/sample_scripts/relax_disp/cpmg_analysis.py Modified: trunk/sample_scripts/relax_disp/R1rho_analysis.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/relax_disp/R1rho_analysis.py?rev=21708&r1=21707&r2=21708&view=diff ============================================================================== --- trunk/sample_scripts/relax_disp/R1rho_analysis.py (original) +++ trunk/sample_scripts/relax_disp/R1rho_analysis.py Fri Nov 29 11:11:40 2013 @@ -41,8 +41,14 @@ # The number of Monte Carlo simulations to be used for error analysis at the end of the analysis. MC_NUM = 500 +# A flag which if True will activate Monte Carlo simulations for all models. Note this will hugely increase the computation time. +MC_SIM_ALL_MODELS = False + # The results directory. RESULTS_DIR = '.' + +# The directory of results of an earlier analysis without clustering. +PRE_RUN_DIR = None # The model selection technique to use. MODSEL = 'AIC' @@ -143,4 +149,4 @@ ########################## # Do not change! -Relax_disp(pipe_name=pipe_name, pipe_bundle=pipe_bundle, results_dir=RESULTS_DIR, models=MODELS, grid_inc=GRID_INC, mc_sim_num=MC_NUM, modsel=MODSEL, insignificance=INSIGNIFICANCE, numeric_only=NUMERIC_ONLY) +Relax_disp(pipe_name=pipe_name, pipe_bundle=pipe_bundle, results_dir=RESULTS_DIR, models=MODELS, grid_inc=GRID_INC, mc_sim_num=MC_NUM, modsel=MODSEL, pre_run_dir=PRE_RUN_DIR, insignificance=INSIGNIFICANCE, numeric_only=NUMERIC_ONLY, mc_sim_all_models=MC_SIM_ALL_MODELS) 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=21708&r1=21707&r2=21708&view=diff ============================================================================== --- trunk/sample_scripts/relax_disp/cpmg_analysis.py (original) +++ trunk/sample_scripts/relax_disp/cpmg_analysis.py Fri Nov 29 11:11:40 2013 @@ -41,8 +41,14 @@ # The number of Monte Carlo simulations to be used for error analysis at the end of the analysis. MC_NUM = 500 +# A flag which if True will activate Monte Carlo simulations for all models. Note this will hugely increase the computation time. +MC_SIM_ALL_MODELS = False + # The results directory. RESULTS_DIR = '.' + +# The directory of results of an earlier analysis without clustering. +PRE_RUN_DIR = None # The model selection technique to use. MODSEL = 'AIC' @@ -151,4 +157,4 @@ ########################## # Do not change! -Relax_disp(pipe_name=pipe_name, pipe_bundle=pipe_bundle, results_dir=RESULTS_DIR, models=MODELS, grid_inc=GRID_INC, mc_sim_num=MC_NUM, modsel=MODSEL, insignificance=INSIGNIFICANCE, numeric_only=NUMERIC_ONLY) +Relax_disp(pipe_name=pipe_name, pipe_bundle=pipe_bundle, results_dir=RESULTS_DIR, models=MODELS, grid_inc=GRID_INC, mc_sim_num=MC_NUM, modsel=MODSEL, pre_run_dir=PRE_RUN_DIR, insignificance=INSIGNIFICANCE, numeric_only=NUMERIC_ONLY, mc_sim_all_models=MC_SIM_ALL_MODELS)