X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=7553ab4dddc81319768f780a5031fb3491e05a12;hb=719c502e645607bc071ffbf41a455db899bef8a7;hp=43f7a6dfac0bfdb1760c648bba1c90b91ed6854e;hpb=f1878eefc82b0c465c0062b89ef39fdb4926e8cb;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 43f7a6df..7553ab4d 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -35,8 +35,8 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "2000.0 + 500.0*int(step/500)", # DAC Sweep value (t is in STEPS, not seconds!)
-	"ADC_Averages" : 200,
+aquire = { "DAC_Sweep" : "0.0 + 1.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!)
+	"ADC_Averages" : 100,
 	#"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
@@ -63,13 +63,14 @@ ser = serial.Serial(
 # Put things that are being changed a lot near the top of the list.
 parameters = odict.odict([
 	("Chamber Pressure" , None), # Chamber pressure now automatically determined
+	("Deflection Voltage" , None),
 	("Title" , None),
 	("Comment" , None),
 	("602 Scale" , None),
 	("Venault Voltage" , None),
 	("Accelerating Voltage" , None),
 	("Focus Voltage" , None),
-	("Deflection Voltage" , None),
+	
 	("Initial Voltage" , None),
 	("Heating Current" , None),
 	("Heating Voltage (across filament)" , None),
@@ -226,13 +227,25 @@ def main():
 	# Experiment
 	# TODO: Modify data to record here
 	sweep = 1
-	#for i in range(0,5):
+	#for i in range(0,1):
 	while True:
 		os.system("mkdir -p " + getDate())
 		record_data([5], getDate()+"/"+str(getTime())+".dat", None, 4001)
+
+		try:
+			pass
+			#os.system("echo \"Sweep number " + str(sweep) + " completed\" | festival --tts")
+		except:
+			pass
 		sweep += 1
 	#setDAC(500)
 
+	try:
+		os.system("echo \"Experiment complete\" | festival --tts")
+	except:
+		pass
+	
+
 def checkList():
 	try:
 		input_file = log_open(getDate()+"/checklist", "r")