r21004 - /branches/relax_disp/gui/analyses/auto_relax_disp.py -- September 13, 2013 - 19:21

Author: bugman
Date: Fri Sep 13 19:21:06 2013
New Revision: 21004

URL: http://svn.gna.org/viewcvs/relax?rev=21004&view=rev
Log:
Rearranged the numeric CPMG models in the dispersion model list in the GUI.


Modified:
    branches/relax_disp/gui/analyses/auto_relax_disp.py

Modified: branches/relax_disp/gui/analyses/auto_relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_relax_disp.py?rev=21004&r1=21003&r2=21004&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_relax_disp.py (original)
+++ branches/relax_disp/gui/analyses/auto_relax_disp.py Fri Sep 13 19:21:06 
2013
@@ -659,11 +659,11 @@
         MODEL_CR72_FULL,
         MODEL_IT99,
         MODEL_TSMFK01,
+        MODEL_NS_CPMG_2SITE_EXPANDED,
         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,
         None,
         MODEL_M61,
         MODEL_M61B,
@@ -683,10 +683,10 @@
         "{%s, ..., %s, %s, %s}" % (r2, phi_ex, padw2, kex),
         "{%s, ..., %s, k_AB}" % (r2a, dw),
         "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
+        "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
         "{%s, %s, ..., pA, %s, %s}" % (r2a, r2b, dw, kex),
         "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
         "{%s, %s, ..., pA, %s, %s}" % (r2a, r2b, dw, kex),
-        "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
         None,
         "{%s, ..., %s, %s}" % (r1rho_prime, phi_ex, kex),
         "{%s, ..., pA, %s, %s}" % (r1rho_prime, dw, kex),
@@ -705,11 +705,11 @@
         "The Carver and Richards (1972) 2-site equation for all time 
scales.",
         "The Ishima and Torchia (1999) 2-site model for all time scales with 
pA >> pB.",
         "The Tollinger et al. (2001) 2-site very-slow exchange model.",
+        "The 2-site numerical solution expanded using Maple by Nikolai 
Skrynnikov.",
         "The 2-site numerical solution using 3D magnetisation vectors (with 
%s = %s)." % (r2a, r2b),
         "The 2-site numerical solution using 3D magnetisation vectors.",
         "The 2-site numerical solution using complex conjugate matrices 
(with %s = %s)." % (r2a, r2b),
         "The 2-site numerical solution using complex conjugate matrices.",
-        "The 2-site numerical solution expanded using Maple by Nikolai 
Skrynnikov.",
         None,
         "The Meiboom (1961) 2-site fast exchange equation.",
         "The Meiboom (1961) 2-site equation for all time scales with pA >> 
pB.",