X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=1422c44350a3503b1bfa27472ec7a127b9ccdf5c;hb=54c6b2111e9033763f58b9ecfc27740ebc19fc7d;hp=a650834f8cbcf409b4ddcd2b2eee822f7aae02e5;hpb=dc4ad65f6ddade54b36d9f05b20187d392e235d7;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index a650834f..1422c443 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -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, 2250, "Sweep " + str(sweep) + " (started on " + aquire["start_date"]+")")
 		sweep += 1
 	
 
@@ -193,7 +193,7 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None, comment =
 				dacValue = nextDacValue
 				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()