ARGH

[matches/honours.git] / research / ellipsometry / process.py

diff --git a/research/ellipsometry/process.py b/research/ellipsometry/process.py
index c4ccd93..ec56d67 100755 (executable)
--- a/research/ellipsometry/process.py
+++ b/research/ellipsometry/process.py
@@ -1,17 +1,22 @@
 #!/usr/bin/python
-"""
-       Script to process ellipsometry data output by WVASE
-       and interface to gnuplot
-
-       @author Sam Moore
-"""
-
 import sys
 import os
+import re # Regular expressions - for removing comments
+import odict #ordered dictionary
+import copy
+
+import Gnuplot, Gnuplot.funcutils
+import string
+import time
+import math
+import cmath
+import random
+
+gnuplot = Gnuplot.Gnuplot()
 
 keys = ["wavelength","angle", "psi", "delta", "uncertainty_psi", "uncertainty_delta"]
 
-def getData(fileName):
+def GetData(fileName):
        dataFile = open(fileName, "r")
        #Format is 
        #wavelength     angle   psi     delta   uncertainty_psi uncertainty_delta
@@ -91,9 +96,9 @@ if __name__ == "__main__":
                
                
        conditions = sys.argv[indexStart+3:len(sys.argv)-1]
-       #sys.stdout.write("Debug: Conditions are " + str(conditions) + "\n")
-       #for condition in conditions:
-       #       sys.stdout.write("      Debug: Condition " + str(condition.split("=")) + "\n")  
+       sys.stdout.write("Debug: Conditions are " + str(conditions) + "\n")
+       for condition in conditions:
+               sys.stdout.write("      Debug: Condition " + str(condition.split("=")) + "\n")  
        outfile = sys.argv[len(sys.argv)-1]
 
        results = getData(datafile)