Merge branch 'master' of git.ucc.asn.au:/matches/honours

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

diff --git a/research/TCS/process.py b/research/TCS/process.py
index 46da7c6..afb38c6 100755 (executable)
--- a/research/TCS/process.py
+++ b/research/TCS/process.py
@@ -242,7 +242,7 @@ def CalibrateData(original, ammeter_scale=1e-6):
                data[i][3] = ammeter_scale * 0.170 * float(data[i][3]) / 268.0
        return data
 
-def ShowTCS(filename, raw=True,calibrate=True, normalise=False, show_error=False, plot=gnuplot.plot,with_="lp", step=1, output=None, title="", master_title="", smooth=0, show_peak=True, inflection=1):
+def ShowTCS(filename, raw=True,calibrate=True, normalise=False, show_error=False, plot=gnuplot.plot,with_="lp", step=1, output=None, title="", master_title="", smooth=0, show_peak=False, inflection=1):
 
        if raw == False:
                calibrate = False
@@ -542,7 +542,7 @@ def main():
                if sys.argv[i] == "--raw":
                        plotFunc = ShowData
                elif sys.argv[i] == "--tcs":
-                       plotFunc = lambda e : ShowTCS(e, show_peak=False)
+                       plotFunc = ShowTCS #lambda e : ShowTCS(e, show_peak=False)
                elif sys.argv[i] == "--output":
                        if i+1 >= len(sys.argv):
                                sys.stderr.write("Need argument for "+sys.argv[i]+" switch\n")