From: Sam Moore <matches@ucc.asn.au>
Date: Thu, 11 Oct 2012 01:45:11 +0000 (+0800)
Subject: Merge branch 'master' of mussel.ucc.asn.au:matches/honours
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=27361ccba35f1ee422b556bd9f5ddc46f69c0dde;p=matches%2Fhonours.git

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

Argh what is going on

Conflicts:
	research/TCS/process.py
---

27361ccba35f1ee422b556bd9f5ddc46f69c0dde
diff --cc research/TCS/process.py
index 85cd47fc,31c98d2d..f5e54b9f
--- a/research/TCS/process.py
+++ b/research/TCS/process.py
@@@ -136,7 -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"))