r2880 - /1.2/sample_scripts/full_analysis.py -- November 23, 2006 - 07:24

Author: bugman
Date: Thu Nov 23 07:24:17 2006
New Revision: 2880

URL: http://svn.gna.org/viewcvs/relax?rev=2880&view=rev
Log:
Ported r2878 and r2879 from the 1.3 line.

The command used was:
svn merge -r2877:2879 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

This fixes two bugs in the 'full_analysis.py' script.


Modified:
    1.2/sample_scripts/full_analysis.py

Modified: 1.2/sample_scripts/full_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/sample_scripts/full_analysis.py?rev=2880&r1=2879&r2=2880&view=diff
==============================================================================
--- 1.2/sample_scripts/full_analysis.py (original)
+++ 1.2/sample_scripts/full_analysis.py Thu Nov 23 07:24:17 2006
@@ -322,8 +322,8 @@
         ###################
 
         print "# Chi-squared test.\n"
-        print "chi2 (k-1): %s" + self.relax.data.chi2['previous']
-        print "chi2 (k):   %s" + self.relax.data.chi2[run]
+        print "chi2 (k-1): " + `self.relax.data.chi2['previous']`
+        print "chi2 (k):   " + `self.relax.data.chi2[run]`
         if self.relax.data.chi2['previous'] == self.relax.data.chi2[run]:
             print "The chi-squared value has converged.\n"
         else:
@@ -481,7 +481,7 @@
         eliminate()
 
         # Model selection.
-        model_selection('AIC', run)
+        model_selection('AIC', run, runs=self.runs)
 
         # Write the results.
         if write_flag:
@@ -493,14 +493,14 @@
 
         # Set the run names (also the names of preset model-free models).
         if local_tm:
-            runs = ['tm0', 'tm1', 'tm2', 'tm3', 'tm4', 'tm5', 'tm6', 'tm7', 
'tm8', 'tm9']
-        else:
-            runs = ['m0', 'm1', 'm2', 'm3', 'm4', 'm5', 'm6', 'm7', 'm8', 
'm9']
+            self.runs = ['tm0', 'tm1', 'tm2', 'tm3', 'tm4', 'tm5', 'tm6', 
'tm7', 'tm8', 'tm9']
+        else:
+            self.runs = ['m0', 'm1', 'm2', 'm3', 'm4', 'm5', 'm6', 'm7', 
'm8', 'm9']
 
         # Nuclei type
         nuclei('N')
 
-        for name in runs:
+        for name in self.runs:
             # Create the run.
             run.create(name, 'mf')