mailr19004 - in /trunk: generic_fns/structure/ maths_fns/ maths_fns/frame_order/ specific_fns/ test_suite/shared_data/frame_orde...


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on March 22, 2013 - 17:49:
Author: bugman
Date: Fri Mar 22 17:49:23 2013
New Revision: 19004

URL: http://svn.gna.org/viewcvs/relax?rev=19004&view=rev
Log:
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.


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

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/generic_fns/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/internal.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/generic_fns/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/main.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/maths_fns/frame_order/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/__init__.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/maths_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/n_state_model.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/n_state_model.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/test_suite/shared_data/frame_order/cam/rotor/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py?rev=19004&r1=19003&r2=19004&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py?rev=19004&r1=19003&r2=19004&view=diff

Removed: trunk/test_suite/system_tests/scripts/frame_order/opt_rigid_no_rot.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/opt_rigid_no_rot.py?rev=19003&view=auto

Removed: trunk/test_suite/system_tests/scripts/frame_order/pseudo_ellipse.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/pseudo_ellipse.py?rev=19003&view=auto

Removed: 
trunk/test_suite/system_tests/scripts/frame_order/pseudo_ellipse_torsionless.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/pseudo_ellipse_torsionless.py?rev=19003&view=auto

Related Messages


Powered by MHonArc, Updated Fri Mar 22 18:00:02 2013