r25090 - /trunk/specific_analyses/relax_disp/checks.py -- August 20, 2014 - 13:56

Author: tlinnet
Date: Wed Aug 20 13:56:52 2014
New Revision: 25090

URL: http://svn.gna.org/viewcvs/relax?rev=25090&view=rev
Log:
Inserted to the check of missing R1, that MODEL_NOREX_R1RHO also dependends 
on R1.

Modified:
    trunk/specific_analyses/relax_disp/checks.py

Modified: trunk/specific_analyses/relax_disp/checks.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/checks.py?rev=25090&r1=25089&r2=25090&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/checks.py        (original)
+++ trunk/specific_analyses/relax_disp/checks.py        Wed Aug 20 13:56:52 
2014
@@ -30,7 +30,7 @@
 from dep_check import C_module_exp_fn
 from lib.errors import RelaxError, RelaxFuncSetupError, 
RelaxNoPeakIntensityError
 import specific_analyses
-from specific_analyses.relax_disp.variables import EXP_TYPE_LIST_CPMG, 
EXP_TYPE_LIST_R1RHO, MODEL_LIST_R1RHO_W_R1_ONLY
+from specific_analyses.relax_disp.variables import EXP_TYPE_LIST_CPMG, 
EXP_TYPE_LIST_R1RHO, MODEL_LIST_R1RHO_W_R1_ONLY, MODEL_NOREX_R1RHO
 
 
 def check_c_modules():
@@ -188,7 +188,7 @@
     """
 
     # Check that the model uses R1 data.
-    if model in MODEL_LIST_R1RHO_W_R1_ONLY:
+    if model in [MODEL_NOREX_R1RHO] + MODEL_LIST_R1RHO_W_R1_ONLY:
         # If R1 ids are present.
         if hasattr(cdp, 'ri_ids'):
             return False