X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=research%2FTCS%2Finterface.py;h=d49f1f8a87d20ada1c88110c74731474d814ff63;hb=033d1952a8daab47f3f4c62e5ce1589479a71ab6;hp=3963e4431e0e42c267d91fffe38c0171b0657e88;hpb=3e0bbeaa77f2305ae77c99654c3e46474fe0a0e2;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 3963e443..d49f1f8a 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",#"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)
@@ -142,12 +142,12 @@ def main():
 
 	# 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, 2300, "ADC4 = Is; ADC5 = Va, manually change initial energy" + str(sweep) + " (started on " + aquire["start_date"]+")")
+		sweep += 1
 	
 
 def checkList():
@@ -191,9 +191,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()
@@ -214,7 +218,8 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None, comment =
 			out.write("\t"+str(dacValue))
 			for adc in raw_adc:
 				out.write("\t" + str(adc[1]) + "\t" + str(adc[2]))
-			out.write("\n")		
+			out.write("\n")	
+	
 		
 	for out in output:		
 		if out != sys.stdout: