X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=research%2FTCS%2Finterface.py;h=f2aae229f5725cb3b5a4f21067c853d5486e88a5;hb=77da4af89c3adea6a03a23c51bf4e19237fc50f8;hp=12605820304532287dcf3b347068ff2ad8a6ee14;hpb=dd48610c2cc45b813a2c81f50e7b0c722fa79396;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 12605820..f2aae229 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -31,8 +31,8 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "2000",#"0.0 + 250.0*int(step/200)", # DAC Sweep value (t is in STEPS, not seconds!)
-	"ADC_Averages" : 200,
+aquire = { "DAC_Sweep" : "0.0 + 100.0*int(step/60)", # DAC Sweep value (t is in STEPS, not seconds!)
+	"ADC_Averages" : 50,
 	"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
@@ -154,10 +154,10 @@ def main():
 	# Experiment
 	# TODO: Modify data to record here
 	sweep = 1
-	#while True:
-	os.system("mkdir -p " + getDate())
-	record_data([4], getDate()+"/"+str(getTime())+".dat", None, 2500)
-	sweep += 1
+	while True:
+		os.system("mkdir -p " + getDate())
+		record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 4000)
+		sweep += 1
 	
 
 def checkList(output_file):
@@ -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]