r14864 - /1.3/specific_fns/n_state_model.py -- October 12, 2011 - 19:12

Author: bugman
Date: Wed Oct 12 19:12:19 2011
New Revision: 14864

URL: http://svn.gna.org/viewcvs/relax?rev=14864&view=rev
Log:
Fixes for the N-state model optimisation set up if PCS or RDC data is not 
loaded.


Modified:
    1.3/specific_fns/n_state_model.py

Modified: 1.3/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/n_state_model.py?rev=14864&r1=14863&r2=14864&view=diff
==============================================================================
--- 1.3/specific_fns/n_state_model.py (original)
+++ 1.3/specific_fns/n_state_model.py Wed Oct 12 19:12:19 2011
@@ -880,7 +880,7 @@
         # The PCS data.
         for align_id in cdp.align_ids:
             # No RDC or PCS data, so jump to the next alignment.
-            if not align_id in cdp.rdc_ids and not align_id in cdp.pcs_ids:
+            if (hasattr(cdp, 'rdc_ids') and not align_id in cdp.rdc_ids) and 
(hasattr(cdp, 'pcs_ids') and not align_id in cdp.pcs_ids):
                 continue
 
             # Append empty arrays to the PCS structures.
@@ -1083,7 +1083,7 @@
         # The RDC data.
         for align_id in cdp.align_ids:
             # No RDC or PCS data, so jump to the next alignment.
-            if not align_id in cdp.rdc_ids and not align_id in cdp.pcs_ids:
+            if (hasattr(cdp, 'rdc_ids') and not align_id in cdp.rdc_ids) and 
(hasattr(cdp, 'pcs_ids') and not align_id in cdp.pcs_ids):
                 continue
 
             # Append empty arrays to the RDC structures.