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

diff --cc research/TCS/process.py
index 894e08f,2456d8a..a5f21f0
--- 1/research/TCS/process.py
--- 2/research/TCS/process.py
+++ b/research/TCS/process.py
@@@ -303,12 -245,11 +303,13 @@@ def ShowData(filename,calibrate=True, n
                        error2[i][2] += 0.50*float(data[i][3])
                gnuplot.replot(Gnuplot.Data(error1, using="2:3", with_=w,title="Error : Low bound"))
                gnuplot.replot(Gnuplot.Data(error2, using="2:3", with_=w, title="Error : Upper bound"))
 -              
 +      
 +      if (output != None and type(output) == type("")):
 +              gnuplot("set term wxt") 
        return data
  
- def main():   
+ def main():
+       return 0        
        if (len(sys.argv) < 2):
                sys.stderr.write(sys.argv[0] + " - Require arguments (filename)\n")
                return 1