Author: tlinnet Date: Fri May 2 11:57:06 2014 New Revision: 22917 URL: http://svn.gna.org/viewcvs/relax?rev=22917&view=rev Log: Re-ordered model B14 in target functions. sr #3154: (https://gna.org/support/?3154) Implementation of Baldwin (2014) B14 model - 2-site exact solution model for all time scales. "This follows the tutorial for adding relaxation dispersion models at: http://wiki.nmr-relax.com/Tutorial_for_adding_relaxation_dispersion_models_to_relax#Adding_the_model_to_the_list" The B14 model is explained in: http://wiki.nmr-relax.com/B14. Modified: trunk/target_functions/relax_disp.py Modified: trunk/target_functions/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/trunk/target_functions/relax_disp.py?rev=22917&r1=22916&r2=22917&view=diff ============================================================================== --- trunk/target_functions/relax_disp.py (original) +++ trunk/target_functions/relax_disp.py Fri May 2 11:57:06 2014 @@ -69,11 +69,11 @@ - 'No Rex': The model for no chemical exchange relaxation. - 'LM63': The Luz and Meiboom (1963) 2-site fast exchange model. - 'LM63 3-site': The Luz and Meiboom (1963) 3-site fast exchange model. - - 'B14': The Baldwin (2014) 2-site exact solution model for all time scales. - 'CR72': The reduced Carver and Richards (1972) 2-site model for all time scales with R20A = R20B. - 'CR72 full': The full Carver and Richards (1972) 2-site model for all time scales. - 'IT99': The Ishima and Torchia (1999) 2-site model for all time scales with skewed populations (pA >> pB). - 'TSMFK01': The Tollinger et al. (2001) 2-site very-slow exchange model, range of microsecond to second time scale. + - 'B14': The Baldwin (2014) 2-site exact solution model for all time scales. - 'M61': The Meiboom (1961) 2-site fast exchange model for R1rho-type experiments. - 'DPL94': The Davis, Perlman and London (1994) 2-site fast exchange model for R1rho-type experiments. - 'M61 skew': The Meiboom (1961) on-resonance 2-site model with skewed populations (pA >> pB) for R1rho-type experiments. @@ -343,8 +343,6 @@ self.func = self.func_LM63 if model == MODEL_LM63_3SITE: self.func = self.func_LM63_3site - if model == MODEL_B14: - self.func = self.func_B14 if model == MODEL_CR72_FULL: self.func = self.func_CR72_full if model == MODEL_CR72: @@ -353,6 +351,8 @@ self.func = self.func_IT99 if model == MODEL_TSMFK01: self.func = self.func_TSMFK01 + if model == MODEL_B14: + self.func = self.func_B14 if model == MODEL_NS_CPMG_2SITE_3D_FULL: self.func = self.func_ns_cpmg_2site_3D_full if model == MODEL_NS_CPMG_2SITE_3D: