r25798 - /branches/frame_order_cleanup/specific_analyses/frame_order/data.py -- September 12, 2014 - 16:50

Author: bugman
Date: Fri Sep 12 16:50:28 2014
New Revision: 25798

URL: http://svn.gna.org/viewcvs/relax?rev=25798&view=rev
Log:
Fix for the specific_analyses.frame_order.data.pivot_fixed() function.

This was recently introduced (r25763) when the check for PCS data was removed 
from this function.
To fix the problem, instead of calling base_data_types() to see if PCS data 
is present, the
cdp.pcs_ids data structure is checked instead.


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=25798&r1=25797&r2=25798&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 16:50:28 2014
@@ -199,6 +199,10 @@
     if cdp.model in [MODEL_RIGID]:
         return True
 
+    # No PCS data, so the pivot cannot be optimised.
+    if not hasattr(cdp, 'pcs_ids') or len(cdp.pcs_ids) == 0:
+        return True
+
     # The fixed flag is not set.
     if hasattr(cdp, 'pivot_fixed') and not cdp.pivot_fixed:
         return False