r20953 - in /branches/relax_disp: lib/dispersion/tsmfk01.py specific_analyses/relax_disp/api.py target_functions/relax_disp.py -- September 10, 2013 - 08:41

Author: bugman
Date: Tue Sep 10 08:41:38 2013
New Revision: 20953

URL: http://svn.gna.org/viewcvs/relax?rev=20953&view=rev
Log:
Changed reference to Tollinger et al. instead of Tollinger/Kay.

Progress sr #3071: https://gna.org/support/index.php?3071 - Implementation of 
Tollinger/Kay dispersion model (2001)
Following the guide at: 
http://wiki.nmr-relax.com/Tutorial_for_adding_relaxation_dispersion_models_to_relax

Troels E. Linnet provided this patch. Commit by: tlinnet _aaattt_ 
gmail_dot_com

Signed-off-by: Edward d'Auvergne <edward@xxxxxxxxxxxxx>

Modified:
    branches/relax_disp/lib/dispersion/tsmfk01.py
    branches/relax_disp/specific_analyses/relax_disp/api.py
    branches/relax_disp/target_functions/relax_disp.py

Modified: branches/relax_disp/lib/dispersion/tsmfk01.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/dispersion/tsmfk01.py?rev=20953&r1=20952&r2=20953&view=diff
==============================================================================
--- branches/relax_disp/lib/dispersion/tsmfk01.py (original)
+++ branches/relax_disp/lib/dispersion/tsmfk01.py Tue Sep 10 08:41:38 2013
@@ -22,7 +22,7 @@
 
###############################################################################
 
 # Module docstring.
-"""The Tollinger, Kay et al. (2001) 2-site very-slow exchange model, range 
of microsecond to second time scale.
+"""The Tollinger et al. (2001) 2-site very-slow exchange model, range of 
microsecond to second time scale.
 Applicable in the limit of slow exchange, when |R2A-R2B| << k_AB, kB << 
1/tau_CP. R20A is the transverse relaxation rate of site A in the absence of 
exchange.
 2*tau_CP is is the time between successive 180 deg. pulses.
 

Modified: branches/relax_disp/specific_analyses/relax_disp/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/api.py?rev=20953&r1=20952&r2=20953&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/api.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/api.py Tue Sep 10 
08:41:38 2013
@@ -671,7 +671,7 @@
 
         # TSMFK01 model.
         elif model == MODEL_TSMFK01:
-            print("The Tollinger, Kay et al. (2001) 2-site very-slow 
exchange model, range of microsecond to second time scale.")
+            print("The Tollinger et al. (2001) 2-site very-slow exchange 
model, range of microsecond to second time scale.")
             params = []
             for frq in loop_frq():
                 params.append('r2a')

Modified: branches/relax_disp/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/target_functions/relax_disp.py?rev=20953&r1=20952&r2=20953&view=diff
==============================================================================
--- branches/relax_disp/target_functions/relax_disp.py (original)
+++ branches/relax_disp/target_functions/relax_disp.py Tue Sep 10 08:41:38 
2013
@@ -61,7 +61,7 @@
             - '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, Kay et al. (2001) 2-site very-slow 
exchange model, range of microsecond to second time scale.
+            - 'TSMFK01':  The Tollinger et al. (2001) 2-site very-slow 
exchange model, range of microsecond to second time scale.
             - '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.
@@ -1069,7 +1069,7 @@
 
 
     def func_TSMFK01(self, params):
-        """Target function for the the Tollinger, Kay et al. (2001) 2-site 
very-slow exchange model, range of microsecond to second time scale.
+        """Target function for the the Tollinger et al. (2001) 2-site 
very-slow exchange model, range of microsecond to second time scale.
 
         @param params:  The vector of parameter values.
         @type params:   numpy rank-1 float array