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

diff --git a/research/TCS/process.py b/research/TCS/process.py
index 31c98d2d..f5e54b9f 100755
--- a/research/TCS/process.py
+++ b/research/TCS/process.py
@@ -262,7 +262,11 @@ 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"))