X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=29c2432e0693f0e4af1133ff3ea66e2e23817ff1;hb=2b0e8a4be8a780603447becf2cf2b04071097991;hp=a650834f8cbcf409b4ddcd2b2eee822f7aae02e5;hpb=358e489033fa6b017db0aaaf36be3785e1494f6a;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index a650834f..29c2432e 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -31,12 +31,12 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "0.0 + 250.0*int(step/1000)", # 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
 }
@@ -146,7 +146,7 @@ def main():
 	#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"]+")")
+		record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 2500, "Measure accelerating lens with DAC Sweep" + str(sweep) + " (started on " + aquire["start_date"]+")")
 		sweep += 1
 	
 
@@ -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()