Automatic commit. Thu Oct 4 12:00:03 WST 2012

[matches/honours.git] / research / TCS / 2012-09-06 / focus / analysis.py

diff --git a/research/TCS/2012-09-06/focus/analysis.py b/research/TCS/2012-09-06/focus/analysis.py
index e900b7f..5bd1672 100755 (executable)
--- 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"))