Author: bugman Date: Wed Oct 16 15:28:00 2013 New Revision: 21141 URL: http://svn.gna.org/viewcvs/relax?rev=21141&view=rev Log: Modified the relaxation dispersion auto-analysis to take nesting of MQ models. This is specifically the nesting of the analytic 'MQ CR72' model and the 'MQ NS CPMG 2-site' models. The analytic solution is now used as the optimisation starting point for the numeric model. 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=21141&r1=21140&r2=21141&view=diff ============================================================================== --- branches/relax_disp/auto_analyses/relax_disp.py (original) +++ branches/relax_disp/auto_analyses/relax_disp.py Wed Oct 16 15:28:00 2013 @@ -191,6 +191,9 @@ if model in [MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_CPMG_2SITE_STAR] and MODEL_CR72 in self.models: nested_pipe = MODEL_CR72 analytic = True + elif model == MODEL_MQ_NS_CPMG_2SITE and MODEL_MQ_CR72 in self.models: + nested_pipe = MODEL_MQ_CR72 + analytic = True # No nesting. if not nested_pipe: