Hi Troels, The white space change in branches/R1_fitting/specific_analyses/relax_disp/data.py really should have been in a different commit. Please try to keep commits clean and not introduce unrelated changes, undocumented in the commit message.
Cheers, Edward On 4 August 2014 16:27, <[email protected]> wrote: > Author: tlinnet > Date: Mon Aug 4 16:27:48 2014 > New Revision: 24931 > > URL: http://svn.gna.org/viewcvs/relax?rev=24931&view=rev > Log: > Added model DPL94_FIT_R1 to the list of MODEL_LIST_R1RHO and > MODEL_LIST_R1RHO_FULL. > > sr #3135(https://gna.org/support/?3135): Optimisation of the R1 relaxation > rate for the off-resonance R1rho relaxation dispersion models. > > Modified: > branches/R1_fitting/specific_analyses/relax_disp/data.py > branches/R1_fitting/specific_analyses/relax_disp/variables.py > > Modified: branches/R1_fitting/specific_analyses/relax_disp/data.py > URL: > http://svn.gna.org/viewcvs/relax/branches/R1_fitting/specific_analyses/relax_disp/data.py?rev=24931&r1=24930&r2=24931&view=diff > ============================================================================== > --- branches/R1_fitting/specific_analyses/relax_disp/data.py (original) > +++ branches/R1_fitting/specific_analyses/relax_disp/data.py Mon Aug 4 > 16:27:48 2014 > @@ -868,6 +868,7 @@ > > # Interpolate the spin-lock field strengths. > spin_lock_nu1 = return_spin_lock_nu1(ref_flag=False) > + > if spin_lock_nu1 != None and len(spin_lock_nu1[0][0][0]): > spin_lock_nu1_new = [] > for ei in range(len(spin_lock_nu1)): > > Modified: branches/R1_fitting/specific_analyses/relax_disp/variables.py > URL: > http://svn.gna.org/viewcvs/relax/branches/R1_fitting/specific_analyses/relax_disp/variables.py?rev=24931&r1=24930&r2=24931&view=diff > ============================================================================== > --- branches/R1_fitting/specific_analyses/relax_disp/variables.py > (original) > +++ branches/R1_fitting/specific_analyses/relax_disp/variables.py Mon > Aug 4 16:27:48 2014 > @@ -196,10 +196,10 @@ > MODEL_LIST_CPMG_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, > MODEL_LM63_3SITE, MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, > MODEL_B14, MODEL_B14_FULL, MODEL_NS_CPMG_2SITE_3D, > MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_STAR, > MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_CPMG_2SITE_EXPANDED] > """The list of the R2eff model together with all dispersion models > specifically for CPMG-type experiments.""" > > -MODEL_LIST_R1RHO = [MODEL_NOREX, MODEL_M61, MODEL_M61B, MODEL_DPL94, > MODEL_TP02, MODEL_TAP03, MODEL_MP05, MODEL_NS_R1RHO_2SITE, > MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR] > +MODEL_LIST_R1RHO = [MODEL_NOREX, MODEL_M61, MODEL_M61B, MODEL_DPL94, > MODEL_DPL94_FIT_R1, MODEL_TP02, MODEL_TAP03, MODEL_MP05, > MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR] > """The list of all dispersion models specifically for R1rho-type experiments > (excluding the R2eff model).""" > > -MODEL_LIST_R1RHO_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_M61, MODEL_M61B, > MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MP05, MODEL_NS_R1RHO_2SITE, > MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR] > +MODEL_LIST_R1RHO_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_M61, MODEL_M61B, > MODEL_DPL94, MODEL_DPL94_FIT_R1, MODEL_TP02, MODEL_TAP03, MODEL_MP05, > MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR] > """The list of the R2eff model together with all dispersion models > specifically for R1rho-type experiments.""" > > MODEL_LIST_R1RHO_W_R1 = [MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MP05, > MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR] > > > _______________________________________________ > relax (http://www.nmr-relax.com) > > This is the relax-commits mailing list > [email protected] > > 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 _______________________________________________ relax (http://www.nmr-relax.com) This is the relax-devel mailing list [email protected] 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-devel

