X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=2cde38aeed0a3876c2c1a7119283ff11ccb4a427;hb=acc30537c11391b8f99338b84a6428647e471fea;hp=551c70fd6b1fede401d82668a041b48bec38d59a;hpb=9e97d887dac0be9c467f7da33b4e6ae70fb78270;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 551c70fd..2cde38ae 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 + 50.0*int(step/1000)", # 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, 1500, "ADC4 = Power supply output. Sweep " + str(sweep) + " (started on " + aquire["start_date"]+")")
+		record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 2250, "Measure Ie and Is .Sweep " + str(sweep) + " (started on " + aquire["start_date"]+")")
 		sweep += 1