r27944 - in /trunk: ./ specific_analyses/frame_order/ test_suite/shared_data/frame_order/cam/rotor/ -- October 02, 2015 - 12:14

Author: bugman
Date: Fri Oct  2 12:14:05 2015
New Revision: 27944

URL: http://svn.gna.org/viewcvs/relax?rev=27944&view=rev
Log:
Merged revisions 24709-24713 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_cleanup

........
  r24709 | bugman | 2014-07-24 15:11:29 +0200 (Thu, 24 Jul 2014) | 3 lines
  
  Some more fixes for the optimisation user function changes.
........
  r24710 | bugman | 2014-07-24 16:02:59 +0200 (Thu, 24 Jul 2014) | 7 lines
  
  Removed the parameter scaling for the pivot point frame order parameters.
  
  These were already removed from the frame_order_cleanup branch in the 
assemble_scaling_matrix()
  function, however they were reintroduced accidentally via the parameter 
object where this
  information is now defined.  So this removes the scaling a second time.
........
  r24711 | bugman | 2014-07-24 16:04:13 +0200 (Thu, 24 Jul 2014) | 6 lines
  
  Fixes for the parameter scaling changes in the trunk.
  
  The scaling flag is no longer part of the specific analysis API 
optimisation methods.  Instead the
  pre-assembled scaling matrices are passed into all three API optimisation 
methods.
........
  r24712 | bugman | 2014-07-24 16:21:47 +0200 (Thu, 24 Jul 2014) | 5 lines
  
  Implemented the frame order specific analysis API method 
print_model_title().
  
  This is simply aliased from the API common method 
_print_model_title_global().
........
  r24713 | bugman | 2014-07-24 16:24:53 +0200 (Thu, 24 Jul 2014) | 5 lines
  
  Fix for the grid search in the frame order analysis.
  
  This is a recently introduced problem due to the changes of the 
zooming_grid_search branch.
........

Modified:
    trunk/   (props changed)
    trunk/specific_analyses/frame_order/api.py
    trunk/specific_analyses/frame_order/optimisation.py
    trunk/specific_analyses/frame_order/parameter_object.py
    
trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py

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

Modified: trunk/specific_analyses/frame_order/api.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/api.py?rev=27944&r1=27943&r2=27944&view=diff

Modified: trunk/specific_analyses/frame_order/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/optimisation.py?rev=27944&r1=27943&r2=27944&view=diff

Modified: trunk/specific_analyses/frame_order/parameter_object.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/parameter_object.py?rev=27944&r1=27943&r2=27944&view=diff

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