X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=f578d02015f6c8575a7b13f8b4abd2dc99c308de;hb=cd28e2ad2f0aed5b8f483e53689321c6f5dbaadb;hp=9a9b2eb753a14f7d9b8877371aa6eb997474d15d;hpb=49ec3eb8bb9c070777f8f76b918c4eec4057bee7;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 9a9b2eb7..f578d020 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -31,12 +31,12 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "1500",#"0.0 + 50.0*step", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "0.0 + 250.0*int(step/200)", # 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
 	"ADC_Ie" : 4, # ADC channel to read back Ie through
-	"DAC_Settle" : 2.0, # Time in seconds to wait for DAC to stabilise
+	"DAC_Settle" : 0.0, # Time in seconds to wait for DAC to stabilise
 	#"response_wait" : 0.2, # Time to wait in seconds between sending data and reading back
 	"start_date" : None
 }
@@ -87,9 +87,9 @@ def init():
 	# Connect serial
 	ser.open()
 	ser.isOpen()
-	print("Waiting for \"# hello\" from device...")
-	while (ser.readline().strip("\r\n") != "# hello"):
-		pass
+#	print("Waiting for \"# hello\" from device...")
+#	while (ser.readline().strip("\r\n") != "# hello"):
+#		pass
 	#while (ser.readline().strip("\r\n ") != "#"):
 	#	pass
 	time.sleep(1.0)
@@ -138,16 +138,17 @@ def main():
 	#checkList()
 
 	
-	
+	comment = None
+		
 
 	# Experiment
 	# TODO: Modify data to record here
-	#sweep = 1
-	record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, None, "Measure emission&sample current varying with time, constant initial energy.")
-	#while True:
-	#	os.system("mkdir -p " + getDate())
-	#	record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 2300, "Sweep " + str(sweep) + " (started on " + aquire["start_date"]+")")
-	#	sweep += 1
+	sweep = 1
+	#record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, None, "Measure emission&sample current varying with time, constant initial energy.")
+	while True:
+		os.system("mkdir -p " + getDate())
+		record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 2500, "Measure deflection plate. lens with DAC. Sweep" + str(sweep) + " (started on " + aquire["start_date"]+")")
+		sweep += 1
 	
 
 def checkList():
@@ -191,9 +192,13 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None, comment =
 			nextDacValue = int(eval(aquire["DAC_Sweep"]))
 			if (nextDacValue != dacValue):
 				dacValue = nextDacValue
+				if (dacValue < 0):
+					break
 				setDAC(dacValue)
 			step += 1
-		if (dac_max != None and dacValue == dac_max):
+		
+
+		if (dac_max != None and dacValue >= dac_max):
 			break
 
 		measure_start = time.time()