X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Fprocess.py;h=2456d8aead242902f87b41f188025fe6f1dad0a2;hb=c96d074a39d00f7ac7b19b3e811c93582f3b3cbe;hp=f5e54b9f4fa270cf67a6be5cbf1b7e52ecc457f7;hpb=27361ccba35f1ee422b556bd9f5ddc46f69c0dde;p=matches%2Fhonours.git

diff --git a/research/TCS/process.py b/research/TCS/process.py
index f5e54b9f..2456d8ae 100755
--- a/research/TCS/process.py
+++ b/research/TCS/process.py
@@ -248,7 +248,8 @@ def ShowData(filename,calibrate=True, normalise=False, show_error=False, plot=gn
 		
 	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
@@ -262,12 +263,6 @@ def main():
 	#gnuplot("set term postscript colour")
 	#gnuplot("set output \"test.eps\"")
 	for i in range(1, len(sys.argv)):
-<<<<<<< HEAD
-		tcs.append(Derivative(map(lambda e : [e[1], e[2]], GetData(sys.argv[i]))))
-=======
-		tcs.append(Derivative(GetData(sys.argv[i]), 1, 2))
->>>>>>> 95832ff21f52524b602dcb863a064873555a1ee9
-		#tcs.append(GetTCS(GetData(sys.argv[i])))
 		if (len(tcs[i-1]) > 0):
 			gnuplot.replot(Gnuplot.Data(tcs[i-1], title=sys.argv[i], with_="lp"))