Author: tlinnet
Date: Fri May 23 10:30:49 2014
New Revision: 23372
URL: http://svn.gna.org/viewcvs/relax?rev=23372&view=rev
Log:
Merged revisions 23365-23366,23368-23369 via svnmerge from
svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk
........
r23365 | bugman | 2014-05-23 09:03:27 +0200 (Fri, 23 May 2014) | 7 lines
Attempt at fixing bug #22071, the relax unit test and system test not
functioning.
This is reported at https://gna.org/bugs/?22071.
The fix here is that the git commands to show the current subversion
revision number only works when
run from the relax base directory, or one of the subdirectories. This
should now be fixed, as the
pipe running the command will first 'cd' to the relax base directory.
........
r23366 | bugman | 2014-05-23 09:18:34 +0200 (Fri, 23 May 2014) | 6 lines
Another attempt at fixing bug #22071, the relax unit test and system test
not functioning.
This is reported at https://gna.org/bugs/?22071.
This time the complicated shell command "cd %s; git svn find-rev $(git
rev-parse HEAD)" has been
replaced with "cd %s; git svn info".
........
r23368 | bugman | 2014-05-23 10:06:32 +0200 (Fri, 23 May 2014) | 11 lines
Changed most default dispersion parameter values to avoid edge cases where
there is no exchange.
The dw parameters were all 0.0 and kex 1e5, both of which result in no
exchange. If this is ever
used for an optimisation starting point - which it never should, apart from
development, test suite,
and debugging purposes - then the optimisation algorithm will have a very
hard time recovering. The
pA parameter has been changed to 0.90 to set it to a reasonable value while
still staying far away
from the no exchange condition of pA = 1.0.
This follows from
http://article.gmane.org/gmane.science.nmr.relax.devel/5917.
........
r23369 | bugman | 2014-05-23 10:10:46 +0200 (Fri, 23 May 2014) | 10 lines
Fixes for 3 dispersion system tests for the change in default parameter
values.
The default values are used in the auto-analysis in the test suite to avoid
the grid search. The
changed values affected the optimisation of two spins from Flemming
Hansen's data located at
test_suite/shared_data/dispersion/Hansen/, residue 4 used as an example of
no exchange and residue
70 used as an example where data is only available at one field. The
system test
Relax_disp.test_set_grid_r20_from_min_r2eff_cpmg was also modified as it
was directly checking these
default values.
........
Modified:
branches/disp_speed/ (props changed)
branches/disp_speed/specific_analyses/relax_disp/parameter_object.py
branches/disp_speed/test_suite/system_tests/relax_disp.py
branches/disp_speed/version.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/disp_speed/specific_analyses/relax_disp/parameter_object.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/specific_analyses/relax_disp/parameter_object.py?rev=23372&r1=23371&r2=23372&view=diff
Modified: branches/disp_speed/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/system_tests/relax_disp.py?rev=23372&r1=23371&r2=23372&view=diff
Modified: branches/disp_speed/version.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/version.py?rev=23372&r1=23371&r2=23372&view=diff
r23372 - in /branches/disp_speed: ./ specific_analyses/relax_disp/ test_suite/system_tests/