Author: bugman
Date: Tue Oct 22 08:47:56 2013
New Revision: 21207
URL: http://svn.gna.org/viewcvs/relax?rev=21207&view=rev
Log:
Shifted the 'NS CPMG 2-site expanded' model to the top of the CPMG numerical
solutions in the manual.
This is because this is the default model which should be used in most cases.
Modified:
branches/relax_disp/docs/latex/dispersion.tex
branches/relax_disp/docs/latex/dispersion_models.tex
Modified: branches/relax_disp/docs/latex/dispersion.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/dispersion.tex?rev=21207&r1=21206&r2=21207&view=diff
==============================================================================
--- branches/relax_disp/docs/latex/dispersion.tex (original)
+++ branches/relax_disp/docs/latex/dispersion.tex Tue Oct 22 08:47:56 2013
@@ -89,11 +89,11 @@
For the CPMG-type experiments, the numeric models currently supported are:
\begin{description}
+\item[`NS CPMG 2-site expanded':]\index{relaxation dispersion!NS CPMG 2-site
expanded model} A model for 2-site exchange expanded using Maple by Nikolai
Skrynnikov \citep{Tollinger01}. It has the parameters $\{\Rtwozero, \dots,
\pA, \dw, \kex\}$. See Section~\ref{sect: dispersion: NS CPMG 2-site
expanded model} on page~\pageref{sect: dispersion: NS CPMG 2-site expanded
model}.
\item[`NS CPMG 2-site 3D':]\index{relaxation dispersion!NS CPMG 2-site 3D
model} The reduced model for 2-site exchange using 3D magnetisation vectors
whereby the simplification $\RtwozeroA = \RtwozeroB$ is assumed. It has the
parameters $\{\Rtwozero, \dots, \pA, \dw, \kex\}$. See Section~\ref{sect:
dispersion: NS CPMG 2-site 3D model} on page~\pageref{sect: dispersion: NS
CPMG 2-site 3D model}.
\item[`NS CPMG 2-site 3D full':]\index{relaxation dispersion!NS CPMG 2-site
3D full model} The full model for 2-site exchange using 3D magnetisation
vectors with parameters $\{\RtwozeroA, \RtwozeroB, \dots, \pA, \dw, \kex\}$.
See Section~\ref{sect: dispersion: NS CPMG 2-site 3D full model} on
page~\pageref{sect: dispersion: NS CPMG 2-site 3D full model}.
\item[`NS CPMG 2-site star':]\index{relaxation dispersion!NS CPMG 2-site
star model} The reduced model for 2-site exchange using complex conjugate
matrices whereby the simplification $\RtwozeroA = \RtwozeroB$ is assumed. It
has the parameters $\{\Rtwozero, \dots, \pA, \dw, \kex\}$. See
Section~\ref{sect: dispersion: NS CPMG 2-site star model} on
page~\pageref{sect: dispersion: NS CPMG 2-site star model}.
\item[`NS CPMG 2-site star full':]\index{relaxation dispersion!NS CPMG
2-site star full model} The full model for 2-site exchange using complex
conjugate matrices with parameters $\{\RtwozeroA, \RtwozeroB, \dots, \pA,
\dw, \kex\}$. See Section~\ref{sect: dispersion: NS CPMG 2-site star full
model} on page~\pageref{sect: dispersion: NS CPMG 2-site star full model}.
-\item[`NS CPMG 2-site expanded':]\index{relaxation dispersion!NS CPMG 2-site
expanded model} A model for 2-site exchange expanded using Maple by Nikolai
Skrynnikov \citep{Tollinger01}. It has the parameters $\{\Rtwozero, \dots,
\pA, \dw, \kex\}$. See Section~\ref{sect: dispersion: NS CPMG 2-site
expanded model} on page~\pageref{sect: dispersion: NS CPMG 2-site expanded
model}.
\end{description}
@@ -417,54 +417,6 @@
\index{relaxation dispersion!Numeric CPMG model|textbf}
-% Full NS CPMG 2-site 3D model.
-%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-\subsection{The full NS 2-site 3D CPMG model}
-\label{sect: dispersion: NS CPMG 2-site 3D full model}
-\index{relaxation dispersion!NS CPMG 2-site 3D full model|textbf}
-
-This is the numerical model for 2-site exchange using 3D magnetisation
vectors.
-It is selected by setting the model to `NS CPMG 2-site 3D full'.
-The simple constraint $\pA > \pB$ is used to halve the optimisation space,
as both sides of the limit are mirror image spaces.
-
-
-% Reduced NS CPMG 2-site 3D model.
-%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-\subsection{The reduced NS 2-site 3D CPMG model}
-\label{sect: dispersion: NS CPMG 2-site 3D model}
-\index{relaxation dispersion!NS CPMG 2-site 3D model|textbf}
-
-This is the numerical model for 2-site exchange using 3D magnetisation
vectors, whereby the simplification $\RtwozeroA = \RtwozeroB$ is assumed.
-It is selected by setting the model to `NS CPMG 2-site 3D'.
-The simple constraint $\pA > \pB$ is used to halve the optimisation space,
as both sides of the limit are mirror image spaces.
-
-
-% Full NS CPMG 2-site star model.
-%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-\subsection{The full NS 2-site star CPMG model}
-\label{sect: dispersion: NS CPMG 2-site star full model}
-\index{relaxation dispersion!NS CPMG 2-site star full model|textbf}
-
-This is the numerical model for 2-site exchange using complex conjugate
matrices.
-It is selected by setting the model to `NS CPMG 2-site star full'.
-The simple constraint $\pA > \pB$ is used to halve the optimisation space,
as both sides of the limit are mirror image spaces.
-
-
-% Reduced NS CPMG 2-site star model.
-%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-\subsection{The reduced NS 2-site star CPMG model}
-\label{sect: dispersion: NS CPMG 2-site star model}
-\index{relaxation dispersion!NS CPMG 2-site star model|textbf}
-
-This is the numerical model for 2-site exchange using complex conjugate
matrices, whereby the simplification $\RtwozeroA = \RtwozeroB$ is assumed.
-It is selected by setting the model to `NS CPMG 2-site star'.
-The simple constraint $\pA > \pB$ is used to halve the optimisation space,
as both sides of the limit are mirror image spaces.
-
-
% NS CPMG 2-site expanded model.
%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -480,6 +432,54 @@
\begin{itemize}
\item \bibentry{Tollinger01}
\end{itemize}
+
+
+% Full NS CPMG 2-site 3D model.
+%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+\subsection{The full NS 2-site 3D CPMG model}
+\label{sect: dispersion: NS CPMG 2-site 3D full model}
+\index{relaxation dispersion!NS CPMG 2-site 3D full model|textbf}
+
+This is the numerical model for 2-site exchange using 3D magnetisation
vectors.
+It is selected by setting the model to `NS CPMG 2-site 3D full'.
+The simple constraint $\pA > \pB$ is used to halve the optimisation space,
as both sides of the limit are mirror image spaces.
+
+
+% Reduced NS CPMG 2-site 3D model.
+%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+\subsection{The reduced NS 2-site 3D CPMG model}
+\label{sect: dispersion: NS CPMG 2-site 3D model}
+\index{relaxation dispersion!NS CPMG 2-site 3D model|textbf}
+
+This is the numerical model for 2-site exchange using 3D magnetisation
vectors, whereby the simplification $\RtwozeroA = \RtwozeroB$ is assumed.
+It is selected by setting the model to `NS CPMG 2-site 3D'.
+The simple constraint $\pA > \pB$ is used to halve the optimisation space,
as both sides of the limit are mirror image spaces.
+
+
+% Full NS CPMG 2-site star model.
+%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+\subsection{The full NS 2-site star CPMG model}
+\label{sect: dispersion: NS CPMG 2-site star full model}
+\index{relaxation dispersion!NS CPMG 2-site star full model|textbf}
+
+This is the numerical model for 2-site exchange using complex conjugate
matrices.
+It is selected by setting the model to `NS CPMG 2-site star full'.
+The simple constraint $\pA > \pB$ is used to halve the optimisation space,
as both sides of the limit are mirror image spaces.
+
+
+% Reduced NS CPMG 2-site star model.
+%~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+\subsection{The reduced NS 2-site star CPMG model}
+\label{sect: dispersion: NS CPMG 2-site star model}
+\index{relaxation dispersion!NS CPMG 2-site star model|textbf}
+
+This is the numerical model for 2-site exchange using complex conjugate
matrices, whereby the simplification $\RtwozeroA = \RtwozeroB$ is assumed.
+It is selected by setting the model to `NS CPMG 2-site star'.
+The simple constraint $\pA > \pB$ is used to halve the optimisation space,
as both sides of the limit are mirror image spaces.
Modified: branches/relax_disp/docs/latex/dispersion_models.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/dispersion_models.tex?rev=21207&r1=21206&r2=21207&view=diff
==============================================================================
--- branches/relax_disp/docs/latex/dispersion_models.tex (original)
+++ branches/relax_disp/docs/latex/dispersion_models.tex Tue Oct 22 08:47:56
2013
@@ -36,11 +36,11 @@
CR72 full & Analytic & 2 & $\{\RtwozeroA, \RtwozeroB,
\dots, \pA, \dw, \kex\}$ & $\pA > \pB$ &
\citet{CarverRichards72} \\
IT99 & Analytic & 2 & $\{\Rtwozero, \dots, \Phiex,
\pA.\dw^2, \kex\}$ & $\pA \gg \pB$ &
\citet{IshimaTorchia99} \\
TSMFK01 & Analytic & 2 & $\{\RtwozeroA, \dots, \dw,
\kAB\}$ & $\pA \gg \pB$ &
\citet{Tollinger01} \\
+NS CPMG 2-site expanded & Numeric & 2 & $\{\Rtwozero, \dots, \pA, \dw,
\kex\}$ & $\pA > \pB$ &
\citet{Tollinger01} \\
NS CPMG 2-site 3D & Numeric & 2 & $\{\Rtwozero, \dots, \pA, \dw,
\kex\}$ & $\pA > \pB$ & - \\
NS CPMG 2-site 3D full & Numeric & 2 & $\{\RtwozeroA, \RtwozeroB,
\dots, \pA, \dw, \kex\}$ & $\pA > \pB$ & - \\
NS CPMG 2-site star & Numeric & 2 & $\{\Rtwozero, \dots, \pA, \dw,
\kex\}$ & $\pA > \pB$ & - \\
NS CPMG 2-site star full & Numeric & 2 & $\{\RtwozeroA, \RtwozeroB,
\dots, \pA, \dw, \kex\}$ & $\pA > \pB$ & - \\
-NS CPMG 2-site expanded & Numeric & 2 & $\{\Rtwozero, \dots, \pA, \dw,
\kex\}$ & $\pA > \pB$ &
\citet{Tollinger01} \\
\\[-5pt]
% R1rho-type models.
r21207 - in /branches/relax_disp/docs/latex: dispersion.tex dispersion_models.tex