relax SVN archive

Renamed the relax_string module to lib.text.string.

This is part of the relax library redesign.

Renamed the relax_errors module to lib.errors.

This is part of the relax library redesign.

Deletion of the frame_order_testing branch - this code has now been manually merged into trunk.

Added the script used to recover the frame_order_testing branch to the devel_scripts directory.

This might be useful at some point in the future.

Final synchronisation of all the frame_order_testing branch files back to trunk for the merger.

The manual merger of the frame_order_testing branch did not bring over all changes for some reason.
Maybe this was due to bad conflict resolution. The changes not merged back were found with the
command:

$ diff -qr . ../../relax-trunk | grep -v ".svn"

This was run from the checked out branch. All the differing files were then copied over manually.

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18892:18893 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18916:18917 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18917:18918 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18920:18921 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18921:18922 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18933:18934 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18934:18935 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18935:18936 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18892:18893 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18893 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18916:18917 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18917:18918 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18918 into '.':
G specific_fns/frame_order.py
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18920:18921 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18921 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18921:18922 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18922 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18933:18934 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18934 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18934:18935 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18935 into '.':
U test_suite/system_tests/scripts/frame_order/rigid_test.py
[edau@... relax-trunk]$ svn merge -r18935:18936 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18936 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18860:18861 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18861:18862 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18862:18863 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18863:18864 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18864:18865 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18860:18861 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18861 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18861:18862 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18862 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18862:18863 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18863 into '.':
U specific_fns/frame_order.py
U user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r18863:18864 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18864 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18864:18865 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18865 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18761:18762 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18769:18770 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18803:18804 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18804:18805 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18829:18830 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18830:18831 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18831:18832 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18832:18833 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18833:18834 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18834:18835 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18835:18836 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18761:18762 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18769:18770 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18770 into '.':
U test_suite/system_tests/scripts/frame_order/rigid_test.py
[edau@... relax-trunk]$ svn merge -r18803:18804 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18804 into '.':
U generic_fns/domain.py
U specific_fns/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor_missing_data/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rotation_matrices.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/generate_base.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/generate_distribution.py
U extern/sobol/sobol_lib-not_tested.py
U extern/sobol/sobol_test.py
U extern/sobol/sobol_lib.py
[edau@... relax-trunk]$ svn merge -r18804:18805 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18805 into '.':
G extern/sobol/sobol_test.py
U extern/sobol/test.py
[edau@... relax-trunk]$ svn merge -r18829:18830 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18830 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18830:18831 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18831 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18831:18832 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r18832 into '.':
C specific_fns/frame_order.py
U user_functions/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18832:18833 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18833 into '.':
G specific_fns/frame_order.py
G user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r18833:18834 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18834 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18834:18835 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18835 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18835:18836 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18836 into '.':
G specific_fns/frame_order.py
G user_functions/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18650:18651 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18651:18652 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18652:18653 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18653:18654 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18654:18655 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18655:18656 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18657:18658 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18719:18720 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18729:18730 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18650:18651 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18651:18652 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18652 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18652:18653 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18653 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18653:18654 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18654 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18654:18655 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18655 into '.':
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18655:18656 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18656 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18657:18658 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18658 into '.':
A test_suite/shared_data/frame_order/displacements/optimisation.log.bz2
[edau@... relax-trunk]$ svn merge -r18719:18720 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18720 into '.':
A sample_scripts/frame_order
[edau@... relax-trunk]$ svn merge -r18729:18730 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18730 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18640:18641 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18641:18642 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18642:18643 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18643:18644 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18644:18645 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18647:18648 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18648:18649 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18649:18650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18640:18641 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18641:18642 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18642 into '.':
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
[edau@... relax-trunk]$ svn merge -r18642:18643 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18643 into '.':
A test_suite/shared_data/frame_order/displacements/optimisation.py
[edau@... relax-trunk]$ svn merge -r18643:18644 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18644 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18644:18645 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18645 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18647:18648 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18648 into '.':
U test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r18648:18649 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18649 into '.':
G test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r18649:18650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18650 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$