relax SVN archive

Molecular dynamics by NMR data analysis

Brought to you by: edauvergne, troelslinnet

Commit [r19004] Maximize Restore History

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.

Authored by: bugman 2013-03-22

Browse code at this revision

Parent: [r19003]

Child: [r19005]

1 2 > >> (Page 1 of 2)

changed	/trunk/generic_fns/structure/internal.py
changed	/trunk/generic_fns/structure/main.py
changed	/trunk/maths_fns/frame_order/__init__.py
changed	/trunk/maths_fns/n_state_model.py
changed	/trunk/specific_fns/n_state_model.py
changed	/trunk/test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/rotor/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
changed	/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py