r18285 - /trunk/specific_fns/n_state_model.py -- January 23, 2013 - 22:12

Author: bugman
Date: Wed Jan 23 22:12:42 2013
New Revision: 18285

URL: http://svn.gna.org/viewcvs/relax?rev=18285&view=rev
Log:
Bug fixes for the _opt_uses_pcs() and _opt_uses_rdc() N-state model methods.

These now check that the populations are optimised as well.


Modified:
    trunk/specific_fns/n_state_model.py

Modified: trunk/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/n_state_model.py?rev=18285&r1=18284&r2=18285&view=diff
==============================================================================
--- trunk/specific_fns/n_state_model.py (original)
+++ trunk/specific_fns/n_state_model.py Wed Jan 23 22:12:42 2013
@@ -1422,8 +1422,13 @@
         if hasattr(cdp, 'paramag_centre_fixed') and not 
cdp.paramag_centre_fixed:
             pos_flag = True
 
+        # Are the populations optimised?
+        prob_flag = False
+        if cdp.model == 'population':
+            prob_flag = True
+
         # Not used.
-        if not tensor_flag and not pos_flag:
+        if not tensor_flag and not pos_flag and not prob_flag:
             return False
 
         # The PCS data is to be used for optimisation.
@@ -1455,8 +1460,13 @@
         if hasattr(cdp, 'paramag_centre_fixed') and not 
cdp.paramag_centre_fixed:
             pos_flag = True
 
+        # Are the populations optimised?
+        prob_flag = False
+        if cdp.model == 'population':
+            prob_flag = True
+
         # Not used.
-        if not tensor_flag and not pos_flag:
+        if not tensor_flag and not pos_flag and not prob_flag:
             return False
 
         # The RDC data is to be used for optimisation.