Author: bugman
Date: Mon Feb 24 12:28:21 2014
New Revision: 22278
URL: http://svn.gna.org/viewcvs/relax?rev=22278&view=rev
Log:
Merged revisions 22273-22276 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22273 | bugman | 2014-02-24 12:15:03 +0100 (Mon, 24 Feb 2014) | 6 lines
Reverted commit r22272 as too much was committed.
The command used was:
svn merge -r22272:22271 .
........
r22274 | bugman | 2014-02-24 12:15:47 +0100 (Mon, 24 Feb 2014) | 3 lines
Removed a debugging statement (should have happened at r22272).
........
r22275 | bugman | 2014-02-24 12:17:22 +0100 (Mon, 24 Feb 2014) | 6 lines
Fixes for all of the Relax_disp system tests for the changes to the
dispersion auto-analysis.
The automatically created pipe names now include the pipe bundle name to
make them unique, so the
system tests have been updated to match this behaviour.
........
r22276 | bugman | 2014-02-24 12:27:27 +0100 (Mon, 24 Feb 2014) | 7 lines
Increased the grid search size in the r1rho_on_res_m61.py dispersion system
test script.
This is to allow the Relax_disp.test_m61_exp_data_to_m61 system test to
pass more often. The
increase does not cause a large increase in computation time as less time
is spent in the
optimisation and Monte Carlo simulation steps.
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/test_suite/system_tests/scripts/relax_disp/r1rho_on_res_m61.py
Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 24 12:28:21 2014
@@ -1,1 +1,1 @@
-/trunk:1-22272
+/trunk:1-22277
Modified:
branches/double_rotor/test_suite/system_tests/scripts/relax_disp/r1rho_on_res_m61.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/scripts/relax_disp/r1rho_on_res_m61.py?rev=22278&r1=22277&r2=22278&view=diff
==============================================================================
---
branches/double_rotor/test_suite/system_tests/scripts/relax_disp/r1rho_on_res_m61.py
(original)
+++
branches/double_rotor/test_suite/system_tests/scripts/relax_disp/r1rho_on_res_m61.py
Mon Feb 24 12:28:21 2014
@@ -17,7 +17,7 @@
MODELS = ['R2eff', 'No Rex', 'M61']
# The grid search size (the number of increments per dimension).
-GRID_INC = 5
+GRID_INC = 8
# The number of Monte Carlo simulations to be used for error analysis at the
end of the analysis.
MC_NUM = 3
r22278 - in /branches/double_rotor: ./ test_suite/system_tests/scripts/relax_disp/r1rho_on_res_m61.py