r12306 - /1.3/test_suite/system_tests/scripts/model_free/opt_tm_fns.py -- January 13, 2011 - 12:14

Author: bugman
Date: Thu Jan 13 12:14:19 2011
New Revision: 12306

URL: http://svn.gna.org/viewcvs/relax?rev=12306&view=rev
Log:
The S2s parameter is being calculated from S2 and S2f.


Modified:
    1.3/test_suite/system_tests/scripts/model_free/opt_tm_fns.py

Modified: 1.3/test_suite/system_tests/scripts/model_free/opt_tm_fns.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/model_free/opt_tm_fns.py?rev=12306&r1=12305&r2=12306&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/model_free/opt_tm_fns.py (original)
+++ 1.3/test_suite/system_tests/scripts/model_free/opt_tm_fns.py Thu Jan 13 
12:14:19 2011
@@ -77,8 +77,12 @@
         s2f = 1.0
 
     # Default S2s value.
-    if 'S2s' in spin.params and s2s == None:
-        s2s = 1.0
+    if 'S2s' in spin.params:
+        if s2s == None:
+            s2s = 1.0
+    else:
+        if 'S2f' in spin.params:
+            s2s = s2 / s2f
 
     # Default te value.
     if 'te' in spin.params and te == None: