Automatic commit. Thu Sep 6 00:00:05 WST 2012

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

diff --git a/research/TCS/process.py b/research/TCS/process.py
index 19834ff..bc2aae0 100755 (executable)
--- a/research/TCS/process.py
+++ b/research/TCS/process.py
@@ -30,30 +30,69 @@ def GetData(filename):
 def GetTCS(data):
        result = []
        n = 0
-       for i in range(2, len(data)-1):
-               dE = data[i+1][1] - data[i-1][1]
+       dI = 0
+       dE = 0
+       for i in range(1, len(data)-1):
+               dE = data[i+1][1] - data[i][1]
                if (dE != 0):
                        n = 0
                        dI = 0
                
                n += 1
-               dI += data[i+1][2] - data[i-1][2]                       
+               dI += data[i+1][2] - data[i][2]                 
                if (dE != 0):                   
-                       result.append([data[i][1], dI / (n * dE)])
+                       result.append([data[i][1], (dI / (n * dE)) ] ) #/ data[i][2]])
        return result
 
+def Plot(*args):
+       gnuplot.plot(args)
 
-def main():
-               
-       if (len(sys.argv) != 2):
-               sys.stderr.write(sys.argv[0] + " - Require 1 argument (filename)\n")
+def FitTCS(data):
+       pass
+
+
+def main():    
+       if (len(sys.argv) < 2):
+               sys.stderr.write(sys.argv[0] + " - Require arguments (filename)\n")
                return 1
 
-       tcs = GetTCS(GetData(sys.argv[1]))
-       gnuplot.plot(tcs)
+       tcs = []
+       gnuplot("set style data lp")
+       gnuplot("set key outside right")
+       #gnuplot("set title \"Au on Si (50min 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(Gnuplot.Data(tcs[i-1], title="", with_="lp"))
+
+       # Now average the 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]})
 
-       print("Press enter to exit")
-       sys.stdin.readline()
+       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 2"))
+       
+       sys.stdout.write("Save averaged data as (blank for no save): ")
+       filename = sys.stdin.readline().strip(" \r\n\t")
+       if (filename != ""):
+               out = open(filename, "w", 0)
+               for a in sorted(avg.items(), key = lambda e : e[0]):
+                       out.write(str(a[0]) + "\t" + str(a[1]) + "\n")
                
        return 0