Author: bugman
Date: Fri Oct 2 09:18:46 2015
New Revision: 27933
URL: http://svn.gna.org/viewcvs/relax?rev=27933&view=rev
Log:
Merged revisions 23807-23812 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_cleanup
........
r23807 | bugman | 2014-06-11 08:07:03 +0200 (Wed, 11 Jun 2014) | 5 lines
Added the full optimisation results for the free rotor frame order model.
This is for the CaM test data using the new frame_order.py optimisation
script.
........
r23808 | bugman | 2014-06-11 08:07:50 +0200 (Wed, 11 Jun 2014) | 5 lines
Added the full optimisation results for the 2nd free rotor frame order
model.
This is for the CaM test data using the new frame_order.py optimisation
script.
........
r23809 | bugman | 2014-06-11 08:08:17 +0200 (Wed, 11 Jun 2014) | 5 lines
Removed a PDB file from the free rotor CaM frame order test data directory.
This is now present as a *.gz file, so the uncompressed file can go.
........
r23810 | bugman | 2014-06-11 08:10:02 +0200 (Wed, 11 Jun 2014) | 5 lines
Added the full optimisation results for the free rotor frame order model
with missing data.
This is for the CaM test data using the new frame_order.py optimisation
script.
........
r23811 | bugman | 2014-06-11 08:19:22 +0200 (Wed, 11 Jun 2014) | 5 lines
Added a script for recreating the frame order PDB representation and
displaying it in PyMOL.
This is for the optimised results.
........
r23812 | bugman | 2014-06-11 08:21:48 +0200 (Wed, 11 Jun 2014) | 7 lines
Fixes for the rotor object created by the frame_order.pdb_model user
function.
The rotor is now also shown for the free rotor pseudo-ellipse, despite it
being a useless model, and
the propeller blades are no longer staggered for all the free rotor models
so that two circles are
no longer produced.
........
Added:
trunk/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos.pdb.gz
- copied unchanged from r23812,
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos_fixed_piv.pdb.gz
- copied unchanged from r23812,
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos_fixed_piv.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos_true.pdb.gz
- copied unchanged from r23812,
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos_true.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos.pdb.gz
- copied unchanged from r23812,
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos_fixed_piv.pdb.gz
- copied unchanged from r23812,
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos_fixed_piv.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos_true.pdb.gz
- copied unchanged from r23812,
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos_true.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos.pdb.gz
- copied unchanged from r23812,
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos_fixed_piv.pdb.gz
- copied unchanged from r23812,
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos_fixed_piv.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos_true.pdb.gz
- copied unchanged from r23812,
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos_true.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/represent_frame_order.py
- copied unchanged from r23812,
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/represent_frame_order.py
Removed:
trunk/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos.pdb
trunk/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos_fixed_piv.pdb
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos.pdb
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos_fixed_piv.pdb
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos.pdb
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos_fixed_piv.pdb
Modified:
trunk/ (props changed)
trunk/specific_analyses/frame_order/uf.py
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.bz2
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.log.bz2
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_fixed_piv.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_true.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.bz2
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.log.bz2
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order_fixed_piv.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order_true.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.bz2
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.log.bz2
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order_fixed_piv.pdb.gz
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order_true.pdb.gz
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/specific_analyses/frame_order/uf.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/uf.py?rev=27933&r1=27932&r2=27933&view=diff
Removed: trunk/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos.pdb?rev=27932&view=auto
Removed:
trunk/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos_fixed_piv.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/ave_pos_fixed_piv.pdb?rev=27932&view=auto
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.bz2?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.log.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.log.bz2?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.pdb.gz
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.pdb.gz?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_fixed_piv.pdb.gz
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_fixed_piv.pdb.gz?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_true.pdb.gz
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_true.pdb.gz?rev=27933&r1=27932&r2=27933&view=diff
Removed: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos.pdb?rev=27932&view=auto
Removed:
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos_fixed_piv.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos_fixed_piv.pdb?rev=27932&view=auto
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.bz2?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.log.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.log.bz2?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.pdb.gz
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.pdb.gz?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order_fixed_piv.pdb.gz
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order_fixed_piv.pdb.gz?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order_true.pdb.gz
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order_true.pdb.gz?rev=27933&r1=27932&r2=27933&view=diff
Removed:
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos.pdb?rev=27932&view=auto
Removed:
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos_fixed_piv.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos_fixed_piv.pdb?rev=27932&view=auto
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.bz2?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.log.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.log.bz2?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.pdb.gz
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.pdb.gz?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order_fixed_piv.pdb.gz
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order_fixed_piv.pdb.gz?rev=27933&r1=27932&r2=27933&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order_true.pdb.gz
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order_true.pdb.gz?rev=27933&r1=27932&r2=27933&view=diff
r27933 - in /trunk: ./ specific_analyses/frame_order/ test_suite/shared_data/frame_order/cam/ test_suite/shared_data/frame_o...