X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=cf6380a88cc105b8e229da1b48cd7242a1f6fb0a;hb=e840f5e321744d617b9b0d607500b960e41d1468;hp=1900db329d5c51453e497e6e86f27c18d1b7fc7a;hpb=1bd1592eae6f20ec52e1fae354a0a988e61a9c79;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 1900db32..cf6380a8 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/600)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "0.0 + 100.0*int(step/120)", # 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]