Automatic commit. Wed Sep 5 12:00:03 WST 2012

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

diff --git a/research/TCS/process.py b/research/TCS/process.py
index 5d89001..9254c17 100755 (executable)
--- a/research/TCS/process.py
+++ b/research/TCS/process.py
@@ -58,10 +58,32 @@ def main():
 
        tcs = []
        gnuplot("set style data lp")
+       gnuplot("set key outside right")
+       gnuplot("set title \"Au on Si (95min 3.5A 3-6 e-8mbar)\"")
+       gnuplot("set xlabel \"E (DAC Counts)\"")
+       gnuplot("set ylabel \"S(E) (ADC/DAC Counts)\"")
+       #gnuplot("set term postscript colour")
+       #gnuplot("set output \"test.eps\"")
        for i in range(1, len(sys.argv)):
-               tcs.append(map(lambda e : [e[1], e[2]], GetData(sys.argv[i])))
+               tcs.append(GetTCS(GetData(sys.argv[i])))
                if (len(tcs[i-1]) > 0):
-                       gnuplot.replot(tcs[i-1])
+                       gnuplot.replot(Gnuplot.Data(tcs[i-1], title=sys.argv[i], with_="p"))
+
+       # Now average the TCS data
+       avg = odict.odict()
+       for t in tcs:
+               for p in t:
+                       if p[0] in avg:
+                               avg[p[0]][0] += p[1]
+                               avg[p[0]][1] += 1
+                       else:
+                               avg.update({p[0] : [p[1], 1]})
+
+       for a in avg.keys():
+               avg[a] = float(avg[a][0]) / float(avg[a][1])
+       
+       
+       gnuplot.replot(Gnuplot.Data(sorted(avg.items(), key = lambda e : e[0]), title="Average", with_="l lw 4"))
        
        
        print("Press enter to exit")