X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=research%2FTCS%2F2012-09-06%2Ffocus%2Fanalysis.py;h=5bd1672bce10cda3c6584bad0e355475a31fb16a;hb=11ac23e77329b0d398714a0ed3e3a2bdc5c1c703;hp=e900b7fb6fa2a709e81c2063261733043f56b09c;hpb=ced554da0fb721d190eed99618e2cd82130f0797;p=matches%2Fhonours.git

diff --git a/research/TCS/2012-09-06/focus/analysis.py b/research/TCS/2012-09-06/focus/analysis.py
index e900b7fb..5bd1672b 100755
--- a/research/TCS/2012-09-06/focus/analysis.py
+++ b/research/TCS/2012-09-06/focus/analysis.py
@@ -12,7 +12,7 @@ for f in os.listdir("."):
 	if os.path.isdir(f) == True:
 		data_set = []
 		for datafile in os.listdir("./"+str(f)):
-			data_set.append(process.MaxNormalise(map(lambda e : [e[1], e[2]], process.GetData("./"+str(f)+"/"+str(datafile)))))
+			data_set.append(process.DoNothing(map(lambda e : [e[1], e[2]], process.GetData("./"+str(f)+"/"+str(datafile)))))
 
 		avg = process.Average(data_set)
 		dirs.update({f : avg})
@@ -21,7 +21,9 @@ process.gnuplot("set title \"Vary Focus Voltage\"")
 process.gnuplot("set xlabel \"DAC (counts)\"")
 process.gnuplot("set ylabel \"Normalised S(E)\"")
 
-for p in dirs.items():
+
+
+for p in sorted(dirs.items(), key = lambda e : float(e[0].split("=")[1])):
 	if (len(p[1]) > 0):
 		process.gnuplot.replot(process.Gnuplot.Data(p[1], title=str(p[0])+"", with_="lp"))