Hi, Cheers, I had a great holiday relaxing in Provence and the Cote d'Azur. It's a pity it was only for 2 weeks. Anyway, the space in directory name problem can be fixed later, as this is part of the auto-analysis. Or a new keyword argument to the Parameter_object _add() method can be added especially for directory names, which then defaults to 'string' if not supplied. This is a problem for all the current models anyway, and it is not specific to relaxation dispersion.
Regards, Edward On 18 August 2014 10:04, Troels Emtekær Linnet <[email protected]> wrote: > Hi Edward. > > Welcome back. > I hope you had a good vacation. > > I can change this. > > There is though a little small problem, that the auto-analysis will > produce results folders > with spaces in the directory name, since it makes the result folders > match the model name. > > I prefer not to have spaces in neither directory or file names. > > But we can discuss this later, when I have assembled a TODO- list. > > Best > Troels > > > > 2014-08-18 9:58 GMT+02:00 Edward d'Auvergne <[email protected]>: >> Hi Troels, >> >> The model is here named as "DPL94_fit_r1". This is the string >> representation presented to the user, for example in the GUI model >> selection list or the relax_disp.select_model user function in all >> UIs. In this format, underscores are not needed (spaces are converted >> to underscores in the wiki URLs though). A cleaner string format >> would be "DPL94 R1 fit". The variable name MODEL_DPL94_FIT_R1 should >> not change though, just its value. >> >> Cheers, >> >> Edward >> >> >> On 4 August 2014 16:27, <[email protected]> wrote: >>> Author: tlinnet >>> Date: Mon Aug 4 16:27:23 2014 >>> New Revision: 24919 >>> >>> URL: http://svn.gna.org/viewcvs/relax?rev=24919&view=rev >>> Log: >>> Added the model "MODEL_DPL94_FIT_R1", to the full list of models. >>> >>> 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/variables.py >>> >>> 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=24919&r1=24918&r2=24919&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:23 2014 >>> @@ -109,6 +109,11 @@ >>> MODEL_DESC_DPL94 = "The Davis, Perlman and London (1994) extension of the >>> Meiboom (1961) model for off-resonance data." >>> MODEL_PARAMS_DPL94 = ['r2', 'phi_ex', 'kex'] >>> >>> +MODEL_DPL94_FIT_R1 = "%s_fit_r1"%MODEL_DPL94 >>> +"""The R1rho 2-site fast exchange model of Davis, Perlman and London >>> (1994), where R1 is fitted.""" >>> +MODEL_DESC_DPL94_FIT_R1 = "The Davis, Perlman and London (1994) extension >>> of the Meiboom (1961) model for off-resonance data, where R1 is fitted." >>> +MODEL_PARAMS_DPL94_FIT_R1 = ['r1_fit', 'r2', 'phi_ex', 'kex'] >>> + >>> MODEL_TP02 = 'TP02' >>> MODEL_DESC_TP02 = "The Trott and Palmer (2002) off-resonance 2-site model >>> for R1rho-type experiments." >>> MODEL_PARAMS_TP02 = ['r2', 'pA', 'dw', 'kex'] >>> @@ -182,7 +187,7 @@ >>> MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, >>> MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, MODEL_B14_FULL, >>> MODEL_M61, MODEL_M61B, MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MP05, >>> 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, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, >>> MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, >>> MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR] >>> """The list of all dispersion models (excluding the R2eff model).""" >>> >>> -MODEL_LIST_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_M61, MODEL_M61B, MODEL_DPL94, MODEL_TP02, >>> MODEL_TAP03, MODEL_MP05, 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, >>> MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, >>> MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, >>> MODEL_NS_MMQ_3SITE_LINEAR] >>> +MODEL_LIST_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_M61, MODEL_M61B, MODEL_DPL94, MODEL_DPL94_FIT_R1, >>> MODEL_TP02, MODEL_TAP03, MODEL_MP05, 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, >>> MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, >>> MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, >>> MODEL_NS_MMQ_3SITE_LINEAR] >>> """The list of the R2eff model together with all dispersion models.""" >>> >>> MODEL_LIST_CPMG = [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] >>> @@ -233,6 +238,7 @@ >>> MODEL_M61: MODEL_DESC_M61, >>> MODEL_M61B: MODEL_DESC_M61B, >>> MODEL_DPL94: MODEL_DESC_DPL94, >>> + MODEL_DPL94_FIT_R1: MODEL_DESC_DPL94_FIT_R1, >>> MODEL_TP02: MODEL_DESC_TP02, >>> MODEL_TAP03: MODEL_DESC_TAP03, >>> MODEL_MP05: MODEL_DESC_MP05, >>> @@ -265,6 +271,7 @@ >>> MODEL_M61: MODEL_PARAMS_M61, >>> MODEL_M61B: MODEL_PARAMS_M61B, >>> MODEL_DPL94: MODEL_PARAMS_DPL94, >>> + MODEL_DPL94_FIT_R1: MODEL_PARAMS_DPL94_FIT_R1, >>> MODEL_TP02: MODEL_PARAMS_TP02, >>> MODEL_TAP03: MODEL_PARAMS_TAP03, >>> MODEL_MP05: MODEL_PARAMS_MP05, >>> >>> >>> _______________________________________________ >>> 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 _______________________________________________ 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
