X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=be7489e778b24de30c9ca75786f2e8dad7fbd35e;hb=bfb0dbb03cc8975105fb8dedacb56807c56c4209;hp=a16ae8ebcd9de3480d848fa4209f2eff531f82dd;hpb=1d39c460aa1b62468491f9d88ffcc6912822d888;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index a16ae8eb..be7489e7 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 + 500.0*int(step/600)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "0.0 + 50.0*int(step/60)", # 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
@@ -156,7 +156,7 @@ def main():
 	sweep = 1
 	while True:
 		os.system("mkdir -p " + getDate())
-		record_data([4], getDate()+"/"+str(getTime())+".dat", None, 2500)
+		record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 4000)
 		sweep += 1
 	
 
@@ -199,7 +199,7 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None):
 	
 	if (output != None):
 		output = [open(output, "w", 0), sys.stdout]
-		checkList(output[0])
+		#checkList(output[0])
 	else:
 		output = [sys.stdout]