r12235 - /1.3/test_suite/system_tests/model_free.py -- January 12, 2011 - 14:23

Author: bugman
Date: Wed Jan 12 14:23:16 2011
New Revision: 12235

URL: http://svn.gna.org/viewcvs/relax?rev=12235&view=rev
Log:
Modified the model-free system test method mesg_opt_debug() to handle all 
model-free models.


Modified:
    1.3/test_suite/system_tests/model_free.py

Modified: 1.3/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_free.py?rev=12235&r1=12234&r2=12235&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Wed Jan 12 14:23:16 2011
@@ -106,9 +106,20 @@
 
 
         # Minimisation info.
-        string = string + "\n%-15s %30.16g\n" % ('s2:',      spin.s2)
-        string = string +   "%-15s %30.13g\n" % ('te:',      spin.te * 1e12)
-        string = string +   "%-15s %30.17g\n" % ('rex:',     spin.rex * (2.0 
* pi * spin.frq[0])**2)
+        if spin.s2 != None:
+            string = string + "\n%-15s %30.16g\n" % ('s2:',      spin.s2)
+        if spin.s2f != None:
+            string = string + "\n%-15s %30.16g\n" % ('s2f:',      spin.s2f)
+        if spin.s2s != None:
+            string = string + "\n%-15s %30.16g\n" % ('s2s:',      spin.s2s)
+        if spin.te != None:
+            string = string +   "%-15s %30.13g\n" % ('te:',      spin.te * 
1e12)
+        if spin.tf != None:
+            string = string +   "%-15s %30.13g\n" % ('tf:',      spin.tf * 
1e12)
+        if spin.ts != None:
+            string = string +   "%-15s %30.13g\n" % ('ts:',      spin.ts * 
1e12)
+        if spin.rex != None:
+            string = string +   "%-15s %30.17g\n" % ('rex:',     spin.rex * 
(2.0 * pi * spin.frq[0])**2)
         string = string +   "%-15s %30.17g\n" % ('chi2:',    spin.chi2)
         string = string +   "%-15s %30i\n"   % ('iter:',    spin.iter)
         string = string +   "%-15s %30i\n"   % ('f_count:', spin.f_count)