r12829 - /1.3/sample_scripts/model_free/final_data_extraction.py -- May 30, 2011 - 04:28

Author: michaelbieri
Date: Mon May 30 04:28:14 2011
New Revision: 12829

URL: http://svn.gna.org/viewcvs/relax?rev=12829&view=rev
Log:
Corrected placement of seperator (comma).

Modified:
    1.3/sample_scripts/model_free/final_data_extraction.py

Modified: 1.3/sample_scripts/model_free/final_data_extraction.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/model_free/final_data_extraction.py?rev=12829&r1=12828&r2=12829&view=diff
==============================================================================
--- 1.3/sample_scripts/model_free/final_data_extraction.py (original)
+++ 1.3/sample_scripts/model_free/final_data_extraction.py Mon May 30 
04:28:14 2011
@@ -20,9 +20,6 @@
 
 pipe.create('Data_extraction', 'mf')
 results.read()
-
-# Data
-raise RelaxError("Test.")
 
 #create file
 
@@ -54,34 +51,46 @@
                 spin.model = spin.model[1:2]
                 file.write(spin.model)
             # Write separator.
-            else:
-                file.write(",")
+            file.write(",")
 
 
             # S2.
             if  hasattr(spin, 's2'):
                 s2 = str(spin.s2)
-                s2_err = str(spin.s2_err)
                 if spin.s2 == None:
                         file.write("")
                 else:
-                        file.write(s2[0:5]+ " +/- " + s2_err[0:4])
-            # Write separator.
-            else:
-                file.write(",")
+                        file.write(s2[0:5])
+
+                        # Try to read the error, skip if no MC simulation 
was performed
+                        try:
+                            s2_err = str(spin.s2_err)
+                            file.write( " +/- " + s2_err[0:4])
+                        except:
+                            a = 'No MC'
+
+            # Write separator.
+            file.write(",")
 
 
             # Rex.
             if hasattr(spin, 'rex'):
                 rex = str(spin.rex)
-                rex_err = str(spin.rex_err)
+                
                 if spin.rex == None:
                         file.write("")
                 else:
-                        file.write(rex[0:5]+ " +/- " + rex_err[0:4])
-            # Write separator.
-            else:
-                file.write(",")
+                        file.write(rex[0:5])
+
+                        # Try to read the error, skip if no MC simulation 
was performed
+                        try:
+                            rex_err = str(spin.rex_err)
+                            file.write( " +/- " + rex_err[0:4])
+                        except:
+                            a = 'No MC'
+
+            # Write separator.
+            file.write(",")
 
 # Start a new line.
             file.write("\n")