r20358 - /branches/relax_disp/auto_analyses/relax_disp.py -- July 17, 2013 - 14:52

Author: bugman
Date: Wed Jul 17 14:52:01 2013
New Revision: 20358

URL: http://svn.gna.org/viewcvs/relax?rev=20358&view=rev
Log:
Added support for nesting to the relaxation dispersion auto-analysis for the 
'NS 2-site 3D*' models.


Modified:
    branches/relax_disp/auto_analyses/relax_disp.py

Modified: branches/relax_disp/auto_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/auto_analyses/relax_disp.py?rev=20358&r1=20357&r2=20358&view=diff
==============================================================================
--- branches/relax_disp/auto_analyses/relax_disp.py (original)
+++ branches/relax_disp/auto_analyses/relax_disp.py Wed Jul 17 14:52:01 2013
@@ -36,7 +36,7 @@
 from pipe_control.pipes import has_pipe
 from prompt.interpreter import Interpreter
 from specific_analyses.relax_disp.disp_data import loop_frq
-from specific_analyses.relax_disp.variables import CPMG_EXP, FIXED_TIME_EXP, 
MODEL_CR72, MODEL_CR72_RED, MODEL_DPL94, MODEL_IT99, MODEL_LIST_CPMG, 
MODEL_LIST_R1RHO, MODEL_LM63, MODEL_M61, MODEL_M61B, MODEL_NS_2SITE_STAR, 
MODEL_NS_2SITE_STAR_RED, MODEL_R2EFF, R1RHO_EXP
+from specific_analyses.relax_disp.variables import CPMG_EXP, FIXED_TIME_EXP, 
MODEL_CR72, MODEL_CR72_RED, MODEL_DPL94, MODEL_IT99, MODEL_LIST_CPMG, 
MODEL_LIST_R1RHO, MODEL_LM63, MODEL_M61, MODEL_M61B, MODEL_NS_2SITE_3D, 
MODEL_NS_2SITE_3D_RED, MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_STAR_RED, 
MODEL_R2EFF, R1RHO_EXP
 from status import Status; status = Status()
 
 
@@ -156,6 +156,8 @@
         nested_pipe = None
         if model == MODEL_CR72 and MODEL_CR72_RED in self.models:
             nested_pipe = MODEL_CR72_RED
+        if model == MODEL_NS_2SITE_3D and MODEL_NS_2SITE_3D_RED in 
self.models:
+            nested_pipe = MODEL_NS_2SITE_3D_RED
         if model == MODEL_NS_2SITE_STAR and MODEL_NS_2SITE_STAR_RED in 
self.models:
             nested_pipe = MODEL_NS_2SITE_STAR_RED