X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=22e04a4b1627dd14a35578d402c6bf8dd2d9d7b3;hb=ced554da0fb721d190eed99618e2cd82130f0797;hp=1b85fb1c8052c7f9e4d404e3c71f7be06c595180;hpb=19cb61f75ddda901224f7ce2bae0d3934f67d9ee;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 1b85fb1c..22e04a4b 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -66,11 +66,12 @@ parameters = odict.odict([
 	("Venault Voltage" , None),
 	("Initial Voltage" , None),
 	("Heating Current" , None),
-	("Heating Voltage" , None),
+	("Heating Voltage (across filament)" , None),
+	("Heating Voltage (across power supply)", None),
 	("Chamber Pressure" , None),
-	("610B Zero" , None),
+	#("610B Zero" , None),
 	("602 Zero" , None),
-	("610B Scale" , None),
+	#("610B Scale" , None),
 	("602 Scale" , None),
 	("602 0.1 Battery" , None),
 	("602 0.03 Battery" , None),
@@ -207,11 +208,11 @@ def main():
 	# Experiment
 	# TODO: Modify data to record here
 	sweep = 1
-	while True:
+	for i in range(0,1):
 		os.system("mkdir -p " + getDate())
 		record_data([5], getDate()+"/"+str(getTime())+".dat", None, 4000)
 		sweep += 1
-	
+	setDAC(500)
 
 def checkList():
 	try:
@@ -347,7 +348,7 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None):
 			out.write("\n")	
 	
 	
-		gnuplot.plot(Gnuplot.Data(data, title="t = "+str(measure_time), with_="lp", using="2:3"))
+		#gnuplot.plot(Gnuplot.Data(data, title="t = "+str(measure_time), with_="lp", using="2:3"))
 	for out in output:		
 		if out != sys.stdout:
 			log_close(out)