X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Fprocess.py;h=32261dfde2862644636670835defb70838a8ea84;hb=a2bb19d04d7caecb83ca44cf58d8ce589b635f55;hp=19834ff504649fcdddd418dccfff8fa666be70d9;hpb=cabb4dd339995baee61abba99bcdd16acc7e447f;p=matches%2Fhonours.git

diff --git a/research/TCS/process.py b/research/TCS/process.py
index 19834ff5..32261dfd 100755
--- a/research/TCS/process.py
+++ b/research/TCS/process.py
@@ -30,28 +30,40 @@ def GetData(filename):
 def GetTCS(data):
 	result = []
 	n = 0
-	for i in range(2, len(data)-1):
-		dE = data[i+1][1] - data[i-1][1]
+	dI = 0
+	dE = 0
+	for i in range(1, len(data)-1):
+		dE = data[i+1][1] - data[i][1]
 		if (dE != 0):
 			n = 0
 			dI = 0
 		
 		n += 1
-		dI += data[i+1][2] - data[i-1][2]			
+		dI += data[i+1][2] - data[i][2]			
 		if (dE != 0):			
-			result.append([data[i][1], dI / (n * dE)])
+			result.append([data[i][1], (dI / (n * dE)) ] ) #/ data[i][2]])
 	return result
 
+def Plot(*args):
+	gnuplot.plot(args)
 
-def main():
-		
-	if (len(sys.argv) != 2):
-		sys.stderr.write(sys.argv[0] + " - Require 1 argument (filename)\n")
-		return 1
+def FitTCS(data):
+	pass
 
-	tcs = GetTCS(GetData(sys.argv[1]))
-	gnuplot.plot(tcs)
 
+def main():	
+	if (len(sys.argv) < 2):
+		sys.stderr.write(sys.argv[0] + " - Require arguments (filename)\n")
+		return 1
+
+	tcs = []
+	gnuplot("set style data lp")
+	for i in range(1, len(sys.argv)):
+		tcs.append(GetTCS(GetData(sys.argv[i])))
+		if (len(tcs[i-1]) > 0):
+			gnuplot.replot(tcs[i-1])
+	
+	
 	print("Press enter to exit")
 	sys.stdin.readline()