relax SVN archive

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15030:15031 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15031:15032 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15032:15033 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15033:15034 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15034:15035 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15035:15036 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15036:15037 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15037:15038 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15038:15039 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15039:15040 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

No conflicts needed to be resolved.

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15024:15025 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15025:15026 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15026:15027 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15027:15028 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15028:15029 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15029:15030 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

Again much conflict resolution was required.

Started the manual merger of the frame_order_testing branch back to trunk.

The commands used were:
svn merge -r15014:15015 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15019:15020 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15020:15021 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15021:15022 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15022:15023 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15023:15024 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

This manual merger is required because the switch from the 1.3 line to the trunk (at r16829 and
r16830) has resulted in the svnmerge.py script being unusable. Therefore a manual and painful merge
procedure is required. Each branch revision which is not part of an svnmerge.py commit will be
manually ported, one by one. Many conflicts had to be resolved for this commit.

Removed merge tracking for "svnmerge" for
svn+ssh://bugman@.../svn/relax/branches/frame_order_testing

Initialized merge tracking via "svnmerge" with revisions "1-18938" from
svn+ssh://bugman@.../svn/relax/branches/frame_order_testing

Removed merge tracking for "svnmerge" for
svn+ssh://bugman@.../svn/relax/branches/frame_order_testing

Initialized merge tracking via "svnmerge" with revisions "1-18936" from
svn+ssh://bugman@.../svn/relax/branches/frame_order_testing

Fix for the frame order specific _pdb_geometric_rep() method for the pseudo-ellipse.

The axis used for the rotor PDB representation in the pseudo-ellipse needs to be taken from the full
frame. The axis_theta and axis_phi parameters do not exist for this model.

Fixes for the frame order system test for the recent user function changes.

This includes the renaming of frame_order.cone_pdb to frame_order.pdb_model as well as the
elimination of the frame_order.domain_to_pdb user function.

The rotor frame order models now have the rotor PDB object created for them in _pdb_geometric_rep().

This is used by the frame_order.pdb_model user function.