Author: bugman Date: Fri Sep 12 15:59:00 2014 New Revision: 25796 URL: http://svn.gna.org/viewcvs/relax?rev=25796&view=rev Log: Reverted r25767 as this was rubbish, the frame_order.pivot user function updates the model itself. The command used was: svn merge -r25767:r25766 . ..... r25767 | bugman | 2014-09-12 10:08:13 +0200 (Fri, 12 Sep 2014) | 6 lines Changed paths: M /branches/frame_order_cleanup/specific_analyses/frame_order/uf.py Added a call to check_pivot() to the frame_order.select_model user function. This is to prevent this user function from being called before the pivot has been set, as otherwise the parameter vector will be incorrectly set up. ..... Modified: branches/frame_order_cleanup/specific_analyses/frame_order/uf.py Modified: branches/frame_order_cleanup/specific_analyses/frame_order/uf.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/uf.py?rev=25796&r1=25795&r2=25796&view=diff ============================================================================== --- branches/frame_order_cleanup/specific_analyses/frame_order/uf.py (original) +++ branches/frame_order_cleanup/specific_analyses/frame_order/uf.py Fri Sep 12 15:59:00 2014 @@ -36,7 +36,6 @@ from lib.geometry.rotations import euler_to_R_zyz, R_to_euler_zyz from lib.warnings import RelaxWarning from pipe_control import pipes -from specific_analyses.frame_order.checks import check_pivot from specific_analyses.frame_order.geometric import create_ave_pos, create_distribution, create_geometric_rep from specific_analyses.frame_order.parameters import update_model from specific_analyses.frame_order.variables import MODEL_ISO_CONE, MODEL_ISO_CONE_FREE_ROTOR, MODEL_ISO_CONE_TORSIONLESS, MODEL_LIST, MODEL_LIST_FREE_ROTORS, MODEL_LIST_ISO_CONE, MODEL_LIST_PSEUDO_ELLIPSE, MODEL_LIST_RESTRICTED_TORSION, MODEL_PSEUDO_ELLIPSE, MODEL_PSEUDO_ELLIPSE_TORSIONLESS, MODEL_RIGID @@ -370,9 +369,8 @@ @type model: str """ - # Checks. - pipes.test() - check_pivot() + # Test if the current data pipe exists. + pipes.test() # Test if the model name exists. if not model in MODEL_LIST: