Author: bugman Date: Wed Dec 4 15:04:45 2013 New Revision: 21776 URL: http://svn.gna.org/viewcvs/relax?rev=21776&view=rev Log: Clean up of the 'NS R1rho 3-site' model names in the manual. The word 'branched' has been removed and the notation now matches the 'NS MMQ 3-site' models. Modified: trunk/docs/latex/dispersion.tex trunk/docs/latex/dispersion_models.tex trunk/docs/latex/dispersion_software.tex Modified: trunk/docs/latex/dispersion.tex URL: http://svn.gna.org/viewcvs/relax/trunk/docs/latex/dispersion.tex?rev=21776&r1=21775&r2=21776&view=diff ============================================================================== --- trunk/docs/latex/dispersion.tex (original) +++ trunk/docs/latex/dispersion.tex Wed Dec 4 15:04:45 2013 @@ -1490,7 +1490,7 @@ \begin{description} \item[`TP04':]\index{relaxation dispersion!TP04 model} The $\Ronerho$-type data \citet{TrottPalmer04} N-site analytic equation for all time scales with parameters $\{\Ronerhoprime, \dots, \pone, \dots, \pN, \aveomega, \konetwo, \dots\, \koneN\}$. \item[`NS $\Ronerho$ 3-site linear':]\index{relaxation dispersion!NS R1rho 3-site linear model} The model of the numeric solution for linear 3-site exchange for $\Ronerho$-type data. -\item[`NS $\Ronerho$ 3-site branched':]\index{relaxation dispersion!NS R1rho 3-site branched model} Similar to the `NS $\Ronerho$ 3-site linear' model but with one of the $\kex$ parameters not set to zero. +\item[`NS $\Ronerho$ 3-site':]\index{relaxation dispersion!NS R1rho 3-site model} Similar to the `NS $\Ronerho$ 3-site linear' model but with one of the $\kex$ parameters not set to zero. \end{description} Information for how these can be added is given in the next section. Modified: trunk/docs/latex/dispersion_models.tex URL: http://svn.gna.org/viewcvs/relax/trunk/docs/latex/dispersion_models.tex?rev=21776&r1=21775&r2=21776&view=diff ============================================================================== --- trunk/docs/latex/dispersion_models.tex (original) +++ trunk/docs/latex/dispersion_models.tex Wed Dec 4 15:04:45 2013 @@ -75,9 +75,9 @@ TP04\footnotemark[1] & Analytic & N & $\{\Ronerhoprime, \dots, \pone, \dots, \pN, \aveomega, \konetwo, \dots\, \koneN\}$ & One site dominant & \citet{TrottPalmer04} \\ MP05 & Analytic & 2 & $\{\Ronerhoprime, \dots, \pA, \dw, \kex\}$ & $\pA > \pB$ & \citet{MiloushevPalmer05} \\ NS R1rho 2-site & Numeric & 2 & $\{\Ronerhoprime, \dots, \pA, \dw, \kex\}$ & $\pA > \pB$ & - \\ -NS R1rho 3-site (linear)\footnotemark[1] & Numeric & 3 & $\{\Ronerhoprime, \dots, \pA, \pB, \dwAB, \dwAC,$ & $\pA > \pB$ and $\pA > \pC$ & - \\ +NS R1rho 3-site linear\footnotemark[1] & Numeric & 3 & $\{\Ronerhoprime, \dots, \pA, \pB, \dwAB, \dwAC,$ & $\pA > \pB$ and $\pA > \pC$ & - \\ & & & $\dwHAB, \dwHAC, \kexAB, \kexAC\}$ \\ -NS R1rho 3-site (branched)\footnotemark[1] & Numeric & 3 & $\{\Ronerhoprime, \dots, \pA, \pB, \dwAB, \dwAC$ & $\pA > \pB$ and $\pA > \pC$ & - \\ +NS R1rho 3-site\footnotemark[1] & Numeric & 3 & $\{\Ronerhoprime, \dots, \pA, \pB, \dwAB, \dwAC$ & $\pA > \pB$ and $\pA > \pC$ & - \\ & & & $, \dwHAB, \dwHAC, \dwHBC, \kexAB, \kexAC, \kexBC\}$ \\ \footnotetext[1]{Not implemented yet} Modified: trunk/docs/latex/dispersion_software.tex URL: http://svn.gna.org/viewcvs/relax/trunk/docs/latex/dispersion_software.tex?rev=21776&r1=21775&r2=21776&view=diff ============================================================================== --- trunk/docs/latex/dispersion_software.tex (original) +++ trunk/docs/latex/dispersion_software.tex Wed Dec 4 15:04:45 2013 @@ -66,9 +66,9 @@ TAP03 & \no & \no & \no & \no & \no & \no & \no & \no & \yes \\ TP04 & \no & \no & \no & \no & \no & \no & \no & \no & \no \\ MP05 & \no & \no & \no & \no & \no & \no & \no & \no & \yes \\ -NS 2-site & \no & \yes & \no & \no & \no & \no & ? & \no & \yes \\ -NS 3-site (linear) & \no & \yes & \no & \no & \no & \no & \no & \no & \no \\ -NS 3-site (branched) & \no & \yes & \no & \no & \no & \no & \no & \no & \no \\ +NS $\Ronerho$ 2-site & \no & \yes & \no & \no & \no & \no & ? & \no & \yes \\ +NS $\Ronerho$ 3-site linear & \no & \yes & \no & \no & \no & \no & \no & \no & \no \\ +NS $\Ronerho$ 3-site & \no & \yes & \no & \no & \no & \no & \no & \no & \no \\ \midrule \vspace{-5pt} \\