X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=4705c9e48d0f66dec3e67e217ef1b823b015a9a6;hb=ef6b308dcdd9f392caa807e4e1876dc44b8e3407;hp=25c3e6b8529e7b5f7d84fbfa325ac701dab6e90f;hpb=224000e42462de65096338fb9c2888544d5e07d6;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 25c3e6b8..4705c9e4 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -35,7 +35,7 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "4000",#"0.0 + 10.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "0.0 + 50.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!)
 	"ADC_Averages" : 200,
 	#"ADC_Vi" : 5, # ADC channel to read back Vi (set by DAC) through
 	#"ADC_Is" : 4, # ADC channel to read back Is through
@@ -62,7 +62,7 @@ ser = serial.Serial(
 #Using an ordered dictionary, so results will be determined (or prompted for) in this order.
 # Put things that are being changed a lot near the top of the list.
 parameters = odict.odict([
-	("Chamber Pressure" , None), # Chamber pressure now automatically determined
+	#("Chamber Pressure" , None), # Chamber pressure now automatically determined
 	("Venault Voltage" , None),
 	("Title" , None),
 	("Comment" , None),
@@ -218,8 +218,8 @@ def main():
 	# Experiment
 	# TODO: Modify data to record here
 	sweep = 1
-	for i in range(0,5):
-	#while True:
+	#for i in range(0,5):
+	while True:
 		os.system("mkdir -p " + getDate())
 		record_data([5], getDate()+"/"+str(getTime())+".dat", None, 4001)
 		sweep += 1
@@ -371,8 +371,11 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None):
 				data[len(data)-1].append(adc[2])
 			out.write("\n")	
 	
-	
-		gnuplot.plot(Gnuplot.Data(data, title="t = "+str(measure_time), with_="lp", using="1:3"))
+		#gnuplot("set yrange [0:1023]")
+		#gnuplot("set xrange [0:4000]")
+		gnuplot("set xlabel \"DAC (counts)\"")
+		gnuplot("set ylabel \"Sample Current (ADC counts)\"")
+		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)