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

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 94d6207b..b36a4e5e 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 + 50.0*int(step/5000)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "0.0 + 250.0*int(step/300)", # 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, 2250, "Test 610B as sample current ammeter .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()