r20856 - /branches/relax_disp/target_functions/relax_disp.py -- September 05, 2013 - 17:11

Author: bugman
Date: Thu Sep  5 17:11:14 2013
New Revision: 20856

URL: http://svn.gna.org/viewcvs/relax?rev=20856&view=rev
Log:
Fix for a bug introduced at r20855.


Modified:
    branches/relax_disp/target_functions/relax_disp.py

Modified: branches/relax_disp/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/target_functions/relax_disp.py?rev=20856&r1=20855&r2=20856&view=diff
==============================================================================
--- branches/relax_disp/target_functions/relax_disp.py (original)
+++ branches/relax_disp/target_functions/relax_disp.py Thu Sep  5 17:11:14 
2013
@@ -423,9 +423,9 @@
             self.missing = self.missing[0]
 
             # Check that the data is correct.
-            if self.model in MODEL_LIST_CPMG and self.exp_types[0] in 
EXP_TYPE_LIST_R1RHO:
+            if self.model != MODEL_NOREX and self.model in MODEL_LIST_CPMG 
and self.exp_types[0] in EXP_TYPE_LIST_R1RHO:
                 raise RelaxError("The '%s' CPMG model is not compatible with 
the R1rho experiment type." % self.model)
-            if self.model in MODEL_LIST_R1RHO and self.exp_types[0] in 
EXP_TYPE_LIST_CPMG:
+            if self.model != MODEL_NOREX and self.model in MODEL_LIST_R1RHO 
and self.exp_types[0] in EXP_TYPE_LIST_CPMG:
                 raise RelaxError("The '%s' R1rho model is not compatible 
with the CPMG experiment type." % self.model)