Author: bugman Date: Fri Sep 12 09:49:37 2014 New Revision: 25763 URL: http://svn.gna.org/viewcvs/relax?rev=25763&view=rev Log: Simplified the operation of the frame_order.select_model user function. This is by removing the check of PCS data from the specific_analyses.frame_order.data.pivot_fixed() function using the base_data_types() function call. This allows the model to be set up more easily. Modified: branches/frame_order_cleanup/specific_analyses/frame_order/data.py Modified: branches/frame_order_cleanup/specific_analyses/frame_order/data.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/data.py?rev=25763&r1=25762&r2=25763&view=diff ============================================================================== --- branches/frame_order_cleanup/specific_analyses/frame_order/data.py (original) +++ branches/frame_order_cleanup/specific_analyses/frame_order/data.py Fri Sep 12 09:49:37 2014 @@ -181,11 +181,9 @@ if cdp.model in [MODEL_RIGID]: return True - # The PCS is loaded. - if 'pcs' in base_data_types(): - # The fixed flag is not set. - if hasattr(cdp, 'pivot_fixed') and not cdp.pivot_fixed: - return False + # The fixed flag is not set. + if hasattr(cdp, 'pivot_fixed') and not cdp.pivot_fixed: + return False # The point is fixed. return True