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

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index b36a4e5e..f578d020 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -31,7 +31,7 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "0.0 + 250.0*int(step/300)", # 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
@@ -138,7 +138,8 @@ def main():
 	#checkList()
 
 	
-	
+	comment = None
+		
 
 	# Experiment
 	# TODO: Modify data to record here
@@ -146,7 +147,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, 2250, "Test 610B as sample current ammeter .Sweep " + str(sweep) + " (started on " + aquire["start_date"]+")")
+		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
 	
 
@@ -191,8 +192,12 @@ 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):
 			break