Hi Ed. It seems i merged two commits into one.
The deselecting of spins, should also cover the R1rho off-resonance No Rex models. 2014-08-18 12:05 GMT+02:00 Edward d'Auvergne <edw...@nmr-relax.com>: > Hi, > > The commit message seems to be the direct opposite of the change. > Which is correct, the change or the commit message? > > Cheers, > > Edward > > > > On 5 August 2014 13:52, <tlin...@nmr-relax.com> wrote: >> Author: tlinnet >> Date: Tue Aug 5 13:52:45 2014 >> New Revision: 24962 >> >> URL: http://svn.gna.org/viewcvs/relax?rev=24962&view=rev >> Log: >> Removed unused variables in auto analyses of relax_disp. >> >> 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/auto_analyses/relax_disp.py >> >> Modified: branches/R1_fitting/auto_analyses/relax_disp.py >> URL: >> http://svn.gna.org/viewcvs/relax/branches/R1_fitting/auto_analyses/relax_disp.py?rev=24962&r1=24961&r2=24962&view=diff >> ============================================================================== >> --- branches/R1_fitting/auto_analyses/relax_disp.py (original) >> +++ branches/R1_fitting/auto_analyses/relax_disp.py Tue Aug 5 13:52:45 >> 2014 >> @@ -38,7 +38,7 @@ >> from prompt.interpreter import Interpreter >> from specific_analyses.relax_disp.data import has_exponential_exp_type, >> has_cpmg_exp_type, has_fixed_time_exp_type, has_r1rho_exp_type, loop_frq >> from specific_analyses.relax_disp.data import INTERPOLATE_DISP, >> INTERPOLATE_OFFSET, X_AXIS_DISP, X_AXIS_W_EFF, X_AXIS_THETA, >> Y_AXIS_R2_R1RHO, Y_AXIS_R2_EFF >> -from specific_analyses.relax_disp.variables import MODEL_B14, >> MODEL_B14_FULL, MODEL_CR72, MODEL_CR72_FULL, MODEL_DPL94, MODEL_IT99, >> MODEL_LIST_ANALYTIC, MODEL_LIST_NUMERIC, MODEL_LIST_R1RHO, >> MODEL_LIST_R1RHO_FIT_R1, MODEL_LIST_R1RHO_W_R1, MODEL_LIST_R1RHO_FULL, >> MODEL_LM63, MODEL_LM63_3SITE, MODEL_M61, MODEL_M61B, MODEL_MP05, >> MODEL_MMQ_CR72, MODEL_NOREX, MODEL_NS_CPMG_2SITE_3D, >> MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_EXPANDED, >> MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_MMQ_2SITE, >> MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR, MODEL_NS_R1RHO_2SITE, >> MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_PARAMS, >> MODEL_R2EFF, MODEL_TAP03, MODEL_TP02, MODEL_TSMFK01, PARAMS_R20 >> +from specific_analyses.relax_disp.variables import MODEL_CR72, >> MODEL_CR72_FULL, MODEL_LIST_ANALYTIC, MODEL_LIST_NUMERIC, >> MODEL_LIST_R1RHO_FIT_R1, MODEL_LIST_R1RHO_W_R1, MODEL_LIST_R1RHO_FULL, >> MODEL_LM63, MODEL_LM63_3SITE, MODEL_MP05, MODEL_MMQ_CR72, MODEL_NOREX, >> MODEL_NOREX_R1RHO, MODEL_NOREX_R1RHO_FIT_R1, MODEL_NS_CPMG_2SITE_3D, >> MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_EXPANDED, >> MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_MMQ_2SITE, >> MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR, MODEL_NS_R1RHO_2SITE, >> MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_PARAMS, >> MODEL_R2EFF, PARAMS_R20 >> from status import Status; status = Status() >> >> >> @@ -387,7 +387,7 @@ >> section(file=sys.stdout, text="Optimisation", prespace=2) >> >> # Deselect insignificant spins. >> - if model not in [MODEL_R2EFF, MODEL_NOREX]: >> + if model not in [MODEL_R2EFF, MODEL_NOREX, MODEL_NOREX_R1RHO, >> MODEL_NOREX_R1RHO_FIT_R1]: >> >> self.interpreter.relax_disp.insignificance(level=self.insignificance) >> >> # Speed-up grid-search by using minium R2eff value. >> >> >> _______________________________________________ >> relax (http://www.nmr-relax.com) >> >> This is the relax-commits mailing list >> relax-comm...@gna.org >> >> 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 > relax-devel@gna.org > > 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 _______________________________________________ relax (http://www.nmr-relax.com) This is the relax-devel mailing list relax-devel@gna.org 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
