Re: r25054 - /trunk/specific_analyses/relax_disp/model.py -- August 18, 2014 - 18:13

Hi,

I don't think the DPL94 model should be used for any model nesting.
It is only for fast exchange, so it does not apply to slow exchange
cases at all.

Regards,

Edward



On 18 August 2014 17:59,  <tlinnet@xxxxxxxxxxxxx> wrote:
> Author: tlinnet
> Date: Mon Aug 18 17:59:14 2014
> New Revision: 25054
>
> URL: http://svn.gna.org/viewcvs/relax?rev=25054&view=rev
> Log:
> Modified, that the order of sorting models for auto_analysis, should be:
>
> Analytical first, then silico, and then numeric.
> After this, the year for implementation should come first.
>
> This makes sure that CR72 is analysed first.
>
> And also DPL94 will be sorted first.
>
> 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=25054&r1=25053&r2=25054&view=diff
> ==============================================================================
> --- trunk/specific_analyses/relax_disp/model.py (original)
> +++ trunk/specific_analyses/relax_disp/model.py Mon Aug 18 17:59:14 2014
> @@ -78,7 +78,7 @@
>          self.eq_i = order_eq.index(self.eq)
>
>          # Define the order of how equation type ranks, when sorting before 
> auto analyses.
> -        order_s = [EQ_SILICO, EQ_ANALYTIC, EQ_NUMERIC]
> +        order_s = [EQ_ANALYTIC, EQ_SILICO, EQ_NUMERIC]
>
>          # Save the index of current model to order of equation type.
>          self.eq_s = order_s.index(self.eq)
> @@ -297,7 +297,7 @@
>      all_models_info = models_info(models)
>
>      # Sort the models according to: exp_type, equation type, chemical 
> sites, year for model, number of parameters.
> -    all_models_info_sorted = sorted(all_models_info, 
> key=attrgetter('exp_type_i', 'eq_s', 'sites', 'year_diff', 'params_nr'))
> +    all_models_info_sorted = sorted(all_models_info, 
> key=attrgetter('exp_type_i', 'eq_s', 'sites', 'year', 'params_nr'))
>
>      # Define list of sorted models.
>      sorted_models = []
>
>
> _______________________________________________
> relax (http://www.nmr-relax.com)
>
> This is the relax-commits mailing list
> relax-commits@xxxxxxx
>
> To unsubscribe from this list, get a password
> reminder, or change your subscription options,
> visit the list information page at
> https://mail.gna.org/listinfo/relax-commits