Author: bugman
Date: Tue Oct 16 22:22:00 2012
New Revision: 17873
URL: http://svn.gna.org/viewcvs/relax?rev=17873&view=rev
Log:
Merged revisions 17856,17858,17861-17866,17869-17871 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r17856 | bugman | 2012-10-16 13:57:37 +0200 (Tue, 16 Oct 2012) | 3 lines
PDB format fix for the atom numbers of zero - the atom number should be
consecutive and unique.
........
r17858 | bugman | 2012-10-16 14:14:20 +0200 (Tue, 16 Oct 2012) | 5 lines
Python 3 fix for the generic_fns.structure.geometric.angles_regular()
function.
Integer divisions no longer produce integers.
........
r17861 | bugman | 2012-10-16 14:55:24 +0200 (Tue, 16 Oct 2012) | 3 lines
The python print statements in the user manual are now function calls to be
Python 3 compatible.
........
r17862 | bugman | 2012-10-16 14:56:56 +0200 (Tue, 16 Oct 2012) | 3 lines
Another print statement to function Python 3 fix for the user manual.
........
r17863 | bugman | 2012-10-16 14:58:50 +0200 (Tue, 16 Oct 2012) | 6 lines
Python 3 fixes for the script for generating plots of magnetic field lines.
The command used was:
2to3 -w graphics/wizards/dipole_pair/VectorFieldPlot.py
........
r17864 | bugman | 2012-10-16 15:01:03 +0200 (Tue, 16 Oct 2012) | 3 lines
Python 3 fixes for non-used Python code - converted print statements to
function calls.
........
r17865 | bugman | 2012-10-16 15:02:16 +0200 (Tue, 16 Oct 2012) | 3 lines
Python 3 fixes for one of the test data scripts - print statement with
function call replacements.
........
r17866 | bugman | 2012-10-16 15:07:07 +0200 (Tue, 16 Oct 2012) | 3 lines
Removed a debugging printout.
........
r17869 | bugman | 2012-10-16 18:07:12 +0200 (Tue, 16 Oct 2012) | 3 lines
Fixes for weird print statements with double brackets generated by the 2to3
Python conversion script.
........
r17870 | bugman | 2012-10-16 18:09:35 +0200 (Tue, 16 Oct 2012) | 6 lines
Added the public domain LaTeX nth.sty style file for the user manual.
Some LaTeX distributions do not have this style file and, as it is public
domain, it can be
legally distributed with relax allowing the PDF manual to compile on more
systems.
........
r17871 | bugman | 2012-10-16 18:12:04 +0200 (Tue, 16 Oct 2012) | 5 lines
Added a file with the relax user functions used for the prompt screenshots.
This is for the manual and the website.
........
Added:
branches/inversion-recovery/docs/latex/nth.sty
- copied unchanged from r17871, trunk/docs/latex/nth.sty
branches/inversion-recovery/docs/prompt_screenshot.txt
- copied unchanged from r17871, trunk/docs/prompt_screenshot.txt
Modified:
branches/inversion-recovery/ (props changed)
branches/inversion-recovery/devel_scripts/test_python_versions.py
branches/inversion-recovery/docs/latex/intro.tex
branches/inversion-recovery/docs/latex/model-free.tex
branches/inversion-recovery/extern/scientific_python/IO/FortranFormat.py
branches/inversion-recovery/extern/scientific_python/IO/PDB.py
branches/inversion-recovery/generic_fns/align_tensor.py
branches/inversion-recovery/generic_fns/diffusion_tensor.py
branches/inversion-recovery/generic_fns/minimise.py
branches/inversion-recovery/generic_fns/model_selection.py
branches/inversion-recovery/generic_fns/mol_res_spin.py
branches/inversion-recovery/generic_fns/paramag.py
branches/inversion-recovery/generic_fns/pcs.py
branches/inversion-recovery/generic_fns/pipes.py
branches/inversion-recovery/generic_fns/spectrum.py
branches/inversion-recovery/generic_fns/structure/api_base.py
branches/inversion-recovery/generic_fns/structure/geometric.py
branches/inversion-recovery/generic_fns/structure/internal.py
branches/inversion-recovery/generic_fns/structure/main.py
branches/inversion-recovery/generic_fns/structure/mass.py
branches/inversion-recovery/generic_fns/structure/scientific.py
branches/inversion-recovery/generic_fns/structure/superimpose.py
branches/inversion-recovery/graphics/wizards/dipole_pair/VectorFieldPlot.py
branches/inversion-recovery/opendx/isosurface_3D.py
branches/inversion-recovery/prompt/help.py
branches/inversion-recovery/prompt/tab_completion.py
branches/inversion-recovery/relax.py
branches/inversion-recovery/relax_io.py
branches/inversion-recovery/sample_scripts/model_free/modsel.py
branches/inversion-recovery/sample_scripts/model_free/palmer.py
branches/inversion-recovery/scons/distrib.py
branches/inversion-recovery/scons/install.py
branches/inversion-recovery/scons/manuals.py
branches/inversion-recovery/specific_fns/frame_order.py
branches/inversion-recovery/specific_fns/model_free/main.py
branches/inversion-recovery/specific_fns/model_free/results.py
branches/inversion-recovery/specific_fns/n_state_model.py
branches/inversion-recovery/specific_fns/relax_fit.py
branches/inversion-recovery/status.py
branches/inversion-recovery/test_suite/shared_data/align_data/CaM/generate_data.py
branches/inversion-recovery/test_suite/shared_data/align_data/CaM/pre_bleach.py
branches/inversion-recovery/test_suite/shared_data/align_data/missing_data/generate_missing.py
branches/inversion-recovery/test_suite/shared_data/align_data/monte_carlo_testing/generate_data.py
branches/inversion-recovery/test_suite/shared_data/model_free/bug_20213_asn_sidechain/1U06-H_trunc.pdb
branches/inversion-recovery/test_suite/system_tests/angles.py
branches/inversion-recovery/test_suite/system_tests/diffusion_tensor.py
branches/inversion-recovery/test_suite/system_tests/interatomic.py
branches/inversion-recovery/test_suite/system_tests/model_free.py
branches/inversion-recovery/test_suite/system_tests/palmer.py
branches/inversion-recovery/test_suite/system_tests/scripts/frame_order/opt_rigid_no_rot.py
branches/inversion-recovery/test_suite/system_tests/scripts/n_state_model/absolute_rdcs.py
branches/inversion-recovery/test_suite/system_tests/scripts/n_state_model/align_fit.py
branches/inversion-recovery/test_suite/system_tests/scripts/n_state_model/monte_carlo_testing.py
branches/inversion-recovery/test_suite/system_tests/scripts/palmer.py
branches/inversion-recovery/test_suite/system_tests/scripts/palmer_omp.py
branches/inversion-recovery/test_suite/unit_tests/_data/test_diff_tensor.py
branches/inversion-recovery/test_suite/unit_tests/_maths_fns/test_kronecker_product.py
branches/inversion-recovery/test_suite/unit_tests/_maths_fns/test_rotation_matrix.py
branches/inversion-recovery/test_suite/unit_tests/package_checking.py
branches/inversion-recovery/test_suite/unit_tests/unit_test_runner.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/inversion-recovery/devel_scripts/test_python_versions.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/devel_scripts/test_python_versions.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/docs/latex/intro.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/docs/latex/intro.tex?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/docs/latex/model-free.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/docs/latex/model-free.tex?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/extern/scientific_python/IO/FortranFormat.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/extern/scientific_python/IO/FortranFormat.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/extern/scientific_python/IO/PDB.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/extern/scientific_python/IO/PDB.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/align_tensor.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/diffusion_tensor.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/minimise.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/model_selection.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/model_selection.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/mol_res_spin.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/mol_res_spin.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/paramag.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/paramag.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/pcs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/pcs.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/pipes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/pipes.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/spectrum.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/structure/api_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/structure/api_base.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/structure/geometric.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/structure/geometric.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/structure/internal.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/structure/internal.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/structure/main.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/structure/main.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/structure/mass.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/structure/mass.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/structure/scientific.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/structure/scientific.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/generic_fns/structure/superimpose.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/generic_fns/structure/superimpose.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/graphics/wizards/dipole_pair/VectorFieldPlot.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/graphics/wizards/dipole_pair/VectorFieldPlot.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/opendx/isosurface_3D.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/opendx/isosurface_3D.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/prompt/help.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/prompt/help.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/prompt/tab_completion.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/prompt/tab_completion.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/relax.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/relax.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/relax_io.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/relax_io.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/sample_scripts/model_free/modsel.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/sample_scripts/model_free/modsel.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/sample_scripts/model_free/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/sample_scripts/model_free/palmer.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/scons/distrib.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/scons/distrib.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/scons/install.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/scons/install.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/scons/manuals.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/scons/manuals.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/specific_fns/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/specific_fns/frame_order.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/specific_fns/model_free/main.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/specific_fns/model_free/main.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/specific_fns/model_free/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/specific_fns/model_free/results.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/specific_fns/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/specific_fns/n_state_model.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/specific_fns/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/specific_fns/relax_fit.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/status.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/status.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/shared_data/align_data/CaM/generate_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/shared_data/align_data/CaM/generate_data.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/shared_data/align_data/CaM/pre_bleach.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/shared_data/align_data/CaM/pre_bleach.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/shared_data/align_data/missing_data/generate_missing.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/shared_data/align_data/missing_data/generate_missing.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/shared_data/align_data/monte_carlo_testing/generate_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/shared_data/align_data/monte_carlo_testing/generate_data.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/shared_data/model_free/bug_20213_asn_sidechain/1U06-H_trunc.pdb
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/shared_data/model_free/bug_20213_asn_sidechain/1U06-H_trunc.pdb?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/test_suite/system_tests/angles.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/angles.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/system_tests/diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/diffusion_tensor.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/test_suite/system_tests/interatomic.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/interatomic.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/test_suite/system_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/model_free.py?rev=17873&r1=17872&r2=17873&view=diff
Modified: branches/inversion-recovery/test_suite/system_tests/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/palmer.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/system_tests/scripts/frame_order/opt_rigid_no_rot.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/scripts/frame_order/opt_rigid_no_rot.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/system_tests/scripts/n_state_model/absolute_rdcs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/scripts/n_state_model/absolute_rdcs.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/system_tests/scripts/n_state_model/align_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/scripts/n_state_model/align_fit.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/system_tests/scripts/n_state_model/monte_carlo_testing.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/scripts/n_state_model/monte_carlo_testing.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/system_tests/scripts/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/scripts/palmer.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/system_tests/scripts/palmer_omp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/scripts/palmer_omp.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/unit_tests/_data/test_diff_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/unit_tests/_data/test_diff_tensor.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/unit_tests/_maths_fns/test_kronecker_product.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/unit_tests/_maths_fns/test_kronecker_product.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/unit_tests/_maths_fns/test_rotation_matrix.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/unit_tests/_maths_fns/test_rotation_matrix.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/unit_tests/package_checking.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/unit_tests/package_checking.py?rev=17873&r1=17872&r2=17873&view=diff
Modified:
branches/inversion-recovery/test_suite/unit_tests/unit_test_runner.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/unit_tests/unit_test_runner.py?rev=17873&r1=17872&r2=17873&view=diff
r17873 - in /branches/inversion-recovery: ./ devel_scripts/ docs/ docs/latex/ extern/scientific_python/IO/ generic_fns/ gene...