r25462 - /trunk/test_suite/system_tests/relax_disp.py -- August 29, 2014 - 23:12

Author: tlinnet
Date: Fri Aug 29 23:12:16 2014
New Revision: 25462

URL: http://svn.gna.org/viewcvs/relax?rev=25462&view=rev
Log:
Fix for systemtest test_estimate_r2eff_err and 
test_r1rho_kjaergaard_missing_r1, where r1_fit=True, needed to be send to 
Auto_analyses.

bug #22541(https://gna.org/bugs/?22541): The R1 fit flag does not work in the 
GUI.

Modified:
    trunk/test_suite/system_tests/relax_disp.py

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=25462&r1=25461&r2=25462&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Fri Aug 29 23:12:16 2014
@@ -2980,8 +2980,10 @@
         # Estimate R2eff errors.
         self.interpreter.relax_disp.r2eff_err_estimate(chi2_jacobian=True)
 
+        r1_fit = True
+
         # Run the analysis.
-        relax_disp.Relax_disp(pipe_name=ds.pipe_name, 
pipe_bundle=ds.pipe_bundle, results_dir=result_dir_name, models=MODELS, 
grid_inc=GRID_INC, mc_sim_num=MC_NUM, modsel=MODSEL)
+        relax_disp.Relax_disp(pipe_name=ds.pipe_name, 
pipe_bundle=ds.pipe_bundle, results_dir=result_dir_name, models=MODELS, 
grid_inc=GRID_INC, mc_sim_num=MC_NUM, modsel=MODSEL, r1_fit=r1_fit)
 
         # Verify the data.
         self.verify_r1rho_kjaergaard_missing_r1(models=MODELS, 
result_dir_name=result_dir_name, r2eff_estimate='chi2_pyt')
@@ -3077,7 +3079,7 @@
             print(spin_id)
 
         result_dir_name = self.tmpdir
-        r1_fit = False
+        r1_fit = True
 
         # Run the analysis.
         relax_disp.Relax_disp(pipe_name=pipe_name, pipe_bundle=pipe_bundle, 
results_dir=result_dir_name, models=MODELS, grid_inc=GRID_INC, 
mc_sim_num=MC_NUM, exp_mc_sim_num=EXP_MC_NUM, modsel=MODSEL, r1_fit=r1_fit)
@@ -6144,8 +6146,10 @@
         # Point to directory with R2eff values, with 2000 MC simulations.
         prev_data_path = status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'Kjaergaard_et_al_2013'
 +sep+ "check_graphs" +sep+ "mc_2000"
 
+        r1_fit = True
+
         # Run the analysis.
-        relax_disp.Relax_disp(pipe_name=ds.pipe_name, 
pipe_bundle=ds.pipe_bundle, results_dir=result_dir_name, models=MODELS, 
grid_inc=GRID_INC, mc_sim_num=MC_NUM, modsel=MODSEL, 
pre_run_dir=prev_data_path)
+        relax_disp.Relax_disp(pipe_name=ds.pipe_name, 
pipe_bundle=ds.pipe_bundle, results_dir=result_dir_name, models=MODELS, 
grid_inc=GRID_INC, mc_sim_num=MC_NUM, modsel=MODSEL, 
pre_run_dir=prev_data_path, r1_fit=r1_fit)
 
         # Verify the data.
         self.verify_r1rho_kjaergaard_missing_r1(models=MODELS, 
result_dir_name=result_dir_name, r2eff_estimate='MC2000')