The command used was:
svn merge -r19754:r19752 .
Manual editing was required to fix a number of conflicts. The user function is not necessary as the
errors are now directly calculated rather than simulated using bootstrapping.
.....
r19754 | bugman | 2013-05-28 11:41:25 +0200 (Tue, 28 May 2013) | 6 lines
Changed paths:
M /branches/relax_disp/auto_analyses/relax_disp.py
The relaxation dispersion auto-analysis now handles the Bootstrapping simulations.
The bootstrap_sim_num argument can now be passed into the auto-analysis, and the run() method then
executes the relax_disp.r2eff_setup user function.
------------------------------------------------------------------------
r19753 | bugman | 2013-05-28 11:37:19 +0200 (Tue, 28 May 2013) | 6 lines
Changed paths:
M /branches/relax_disp/specific_analyses/relax_disp/__init__.py
M /branches/relax_disp/user_functions/relax_disp.py
Created the relax_disp.r2eff_setup user function.
This is required to set the number of Bootstrapping simulations to use in the calc user function.
It replaces the hardcoded variable.
.....
