git.ucc.asn.au
/
matches
/
honours.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automatic commit. Thu Oct 11 12:00:08 WST 2012
[matches/honours.git]
/
research
/
TCS
/
process.py
diff --git
a/research/TCS/process.py
b/research/TCS/process.py
index
f5e54b9
..
2456d8a
100755
(executable)
--- 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
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
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)):
#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"))
if (len(tcs[i-1]) > 0):
gnuplot.replot(Gnuplot.Data(tcs[i-1], title=sys.argv[i], with_="lp"))
UCC
git Repository :: git.ucc.asn.au