Author: tlinnet Date: Mon Aug 18 19:37:26 2014 New Revision: 25060 URL: http://svn.gna.org/viewcvs/relax?rev=25060&view=rev Log: Removed special cases for nesting. Now following order is determined. Firs sort completed models into: EQ_NUMERIC, EQ_SILICO, EQ_ANALYTIC Then into year, with newest first. Then number of chemical sites, which reflects number of parameters. Go through the completed models. If the experiment types are the same. Then look for: If a completed model has same parameters, then nest from this. If a completed model has all other parameters than R20 parameters, then nest from this. Special cases are taken care of by: - MODEL_LM63_3SITE from MODEL_LM63 - MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR from MODEL_NS_MMQ_2SITE. - MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR from MODEL_NS_R1RHO_2SITE. - MODEL_MMQ_CR72 from MODEL_CR72. This functionality represents the hard-coding from previous implementation. Modified: trunk/specific_analyses/relax_disp/model.py Modified: trunk/specific_analyses/relax_disp/model.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/model.py?rev=25060&r1=25059&r2=25060&view=diff ============================================================================== --- trunk/specific_analyses/relax_disp/model.py (original) +++ trunk/specific_analyses/relax_disp/model.py Mon Aug 18 19:37:26 2014 @@ -201,18 +201,6 @@ if param in model_info.params: param_in = True - # Special situation, where 'kex' can still be nested from DPL94 model. - elif param == 'phi_ex' and compa_model.model in MODEL_LIST_R1RHO_W_R1_ONLY + MODEL_LIST_R1RHO_FIT_R1_ONLY and model in MODEL_LIST_R1RHO_W_R1_ONLY + MODEL_LIST_R1RHO_FIT_R1_ONLY: - continue - - # Special situation, where 'kex' can still be nested from LM63 model. - elif param == 'phi_ex' and compa_model.model in MODEL_LIST_ANALYTIC_CPMG + MODEL_LIST_NUMERIC_CPMG and model in MODEL_LIST_ANALYTIC_CPMG + MODEL_LIST_NUMERIC_CPMG: - continue - - # Special situation, where 'kex'=1/tex can still be nested from IT99 model. - elif param == 'tex' and compa_model.model in MODEL_LIST_ANALYTIC_CPMG + MODEL_LIST_NUMERIC_CPMG and model in MODEL_LIST_ANALYTIC_CPMG + MODEL_LIST_NUMERIC_CPMG: - continue - # Else break out of the loop. else: # Break the for loop, if not found. @@ -247,22 +235,6 @@ if compa_model.model == MODEL_NS_R1RHO_2SITE: return model_info, compa_model - # Special case for DPL94. - elif model in [MODEL_DPL94, MODEL_DPL94_FIT_R1]: - # Loop over the models. - for compa_model in compa_models: - # If one of the comparable models is in list with R1rho R1, return this. - if compa_model.model in MODEL_LIST_R1RHO_W_R1_ONLY + MODEL_LIST_R1RHO_FIT_R1_ONLY: - return model_info, compa_model - - # Special case for IT99. - elif model in [MODEL_IT99]: - # Loop over the models. - for compa_model in compa_models: - # If one of the comparable models is in list with R1rho R1, return this. - if compa_model.model in MODEL_LIST_ANALYTIC_CPMG + MODEL_LIST_NUMERIC_CPMG: - return model_info, compa_model - # If all fails. return model_info, None