From: Sam Moore <sam@daedalus.(none)>
Date: Fri, 12 Oct 2012 12:04:40 +0000 (+0800)
Subject: Merge branch 'master' of git.ucc.asn.au:/matches/honours
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=4ac4dae6c58dda0530d237f412241c0ce3f7c1a9;p=matches%2Fhonours.git

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

4ac4dae6c58dda0530d237f412241c0ce3f7c1a9
diff --cc research/TCS/process.py
index 894e08f1,2456d8ae..a5f21f0c
--- a/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