r12265 - /1.3/test_suite/shared_data/model_free/back_calc.py -- January 12, 2011 - 19:10

Author: bugman
Date: Wed Jan 12 19:10:10 2011
New Revision: 12265

URL: http://svn.gna.org/viewcvs/relax?rev=12265&view=rev
Log:
Converted the rest of the S2 variables to s2.


Modified:
    1.3/test_suite/shared_data/model_free/back_calc.py

Modified: 1.3/test_suite/shared_data/model_free/back_calc.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/shared_data/model_free/back_calc.py?rev=12265&r1=12264&r2=12265&view=diff
==============================================================================
--- 1.3/test_suite/shared_data/model_free/back_calc.py (original)
+++ 1.3/test_suite/shared_data/model_free/back_calc.py Wed Jan 12 19:10:10 
2011
@@ -168,8 +168,8 @@
     @type frq:          numpy rank-1 array
     @keyword tm:        The global correlation time in seconds.
     @type tm:           float
-    @keyword S2:        The generalised order parameter.
-    @type S2:           float
+    @keyword s2:        The generalised order parameter.
+    @type s2:           float
     @keyword te:        The effective internal correlation time.
     @type te:           float
     @keyword rex:       The chemical exchange factor.
@@ -197,8 +197,8 @@
                 tau = 1.0 / (1.0/tm + 1.0/te)
 
             # The spectral density value.
-            J[i, j] = S2 * tm / (1.0 + (tm*omega[j])**2)
-            J[i, j] = J[i, j]  +  (1.0 - S2) * tau / (1.0 + 
(tau*omega[j])**2)
+            J[i, j] = s2 * tm / (1.0 + (tm*omega[j])**2)
+            J[i, j] = J[i, j]  +  (1.0 - s2) * tau / (1.0 + 
(tau*omega[j])**2)
             J[i, j] = 0.4 * J[i, j]
 
     # Return the spectral density values.