Author: tlinnet
Date: Mon May 26 12:18:59 2014
New Revision: 23412
URL: http://svn.gna.org/viewcvs/relax?rev=23412&view=rev
Log:
Merged revisions 23370,23373-23374,23379,23389,23392,23408 via svnmerge from
svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk
........
r23370 | bugman | 2014-05-23 10:18:37 +0200 (Fri, 23 May 2014) | 7 lines
Fix for the Relax_disp.test_cpmg_synthetic_dx_map_points system test.
This uses the default parameter values to start the optimisation, therefore
the recent change away
from edge case 'no Rex' values allows the parameter values stored in
ds.dx_clust_val to be correctly
optimised.
........
r23373 | bugman | 2014-05-23 11:25:34 +0200 (Fri, 23 May 2014) | 7 lines
Speed up for the version module when using a repository copy of the code.
The repository revision and URL and now stored as module variables, so that
the 'svn info' and
'git svn info' commands are only run twice, once for the revision()
function and once for the url()
function.
........
r23374 | bugman | 2014-05-23 12:11:36 +0200 (Fri, 23 May 2014) | 15 lines
Large speed up for the relax start up times for svn and git-svn copies of
the relax repository.
The 'svn info' and 'git svn info' commands are now only executed once when
the version module is
first imported. The revision() and url() functions have been merged into
the repo_info() function
and this is called when the module is imported. This repo_info() function
stores the repository
revision and URL as the version.repo_revision and version.repo_url module
variables. It also
catches if these variables are already set, so that multiple imports of the
module do not cause the
repository information to be looked up each time.
Previously the revision() and url() functions where called every time a
relax state or result file
was created, hence for repository copies the 'svn info' or 'git svn info'
commands were being called
each time. The functions were also called for each interpreter object
instantiated, and for each
import of the version module.
........
r23379 | bugman | 2014-05-23 14:45:43 +0200 (Fri, 23 May 2014) | 6 lines
Backported the relax 3.2.1 CHANGES file changes to trunk.
The command used was:
svn merge -r23376:23377 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/3.2.1 .
........
r23389 | bugman | 2014-05-23 19:39:53 +0200 (Fri, 23 May 2014) | 6 lines
Small speed up for all the isotropic cone and pseudo-elliptic cone frame
order models.
The vector length calculation for the numeric PCS integration has been
simplified and shifted
outside of a loop to take advantage of the speed of numpy.
........
r23392 | bugman | 2014-05-24 08:53:35 +0200 (Sat, 24 May 2014) | 3 lines
All three file arguments for the pymol.frame_order user function are now
optional.
........
r23408 | bugman | 2014-05-26 09:52:52 +0200 (Mon, 26 May 2014) | 6 lines
Updated all the API documentation links in the dispersion chapter of the
manual.
These were pointing to http://www.nmr-relax.com/api/3.1/ whereas they
should now be point to
http://www.nmr-relax.com/api/3.2/.
........
Modified:
branches/disp_speed/ (props changed)
branches/disp_speed/data_store/__init__.py
branches/disp_speed/docs/CHANGES
branches/disp_speed/docs/latex/dispersion.tex
branches/disp_speed/info.py
branches/disp_speed/lib/frame_order/matrix_ops.py
branches/disp_speed/pipe_control/pymol_control.py
branches/disp_speed/test_suite/system_tests/frame_order.py
branches/disp_speed/test_suite/system_tests/relax_disp.py
branches/disp_speed/user_functions/pymol_control.py
branches/disp_speed/version.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/disp_speed/data_store/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/data_store/__init__.py?rev=23412&r1=23411&r2=23412&view=diff
Modified: branches/disp_speed/docs/CHANGES
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/docs/CHANGES?rev=23412&r1=23411&r2=23412&view=diff
Modified: branches/disp_speed/docs/latex/dispersion.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/docs/latex/dispersion.tex?rev=23412&r1=23411&r2=23412&view=diff
Modified: branches/disp_speed/info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/info.py?rev=23412&r1=23411&r2=23412&view=diff
Modified: branches/disp_speed/lib/frame_order/matrix_ops.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/lib/frame_order/matrix_ops.py?rev=23412&r1=23411&r2=23412&view=diff
Modified: branches/disp_speed/pipe_control/pymol_control.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/pipe_control/pymol_control.py?rev=23412&r1=23411&r2=23412&view=diff
Modified: branches/disp_speed/test_suite/system_tests/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/system_tests/frame_order.py?rev=23412&r1=23411&r2=23412&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=23412&r1=23411&r2=23412&view=diff
Modified: branches/disp_speed/user_functions/pymol_control.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/user_functions/pymol_control.py?rev=23412&r1=23411&r2=23412&view=diff
Modified: branches/disp_speed/version.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/version.py?rev=23412&r1=23411&r2=23412&view=diff
r23412 - in /branches/disp_speed: ./ data_store/ docs/ docs/latex/ lib/frame_order/ pipe_control/ test_suite/system_tests/ u...