Author: bugman Date: Fri Jul 11 09:07:01 2014 New Revision: 24518 URL: http://svn.gna.org/viewcvs/relax?rev=24518&view=rev Log: Reverted r24495 as this is rubbish. The pivot point needs to be initially guessed to centre the grid search for the pivot to a reasonable 20 Angstrom box in the PDB space. The command used was: svn merge -r24495:r24494 . ..... r24495 | bugman | 2014-07-09 15:31:21 +0200 (Wed, 09 Jul 2014) | 7 lines Changed paths: M /branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py Modified the specific_analyses.frame_order.parameters.update_model() function. The pivot parameters are now set to 0.0 if they do not currently exist. They were previously excluded from this initialisation, but this is required for the frame order models if the pivot is not initially fixed at a give location in the PDB space. ..... Modified: branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py Modified: branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py?rev=24518&r1=24517&r2=24518&view=diff ============================================================================== --- branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py (original) +++ branches/frame_order_cleanup/specific_analyses/frame_order/parameters.py Fri Jul 11 09:07:01 2014 @@ -261,5 +261,5 @@ # Initialise the parameters in the current data pipe. for param in cdp.params: - if not hasattr(cdp, param): + if not param in ['pivot_x', 'pivot_y', 'pivot_z'] and not hasattr(cdp, param): setattr(cdp, param, 0.0)