X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=research%2FTCS%2Finterface.py;h=19946edec603c553b29e439be23cd547510a77b5;hb=dd65f1ddd5e5f16473ff03e7e2290458918789d5;hp=11ed9b298ac79438ff15d7ed4015de19b137a79d;hpb=56f525e2d01cb9e01d8a5d38130729c0a2072cd1;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 11ed9b29..19946ede 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -32,11 +32,11 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "0.0 + 50.0*int(step/60)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "0.0 + 25.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
-	"ADC_Ie" : 4, # ADC channel to read back Ie through
+	#"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" : 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,
@@ -76,6 +76,8 @@ parameters = odict.odict([
 	("602 0.003 Battery" , None),
 	("602 0.001 Battery" , None), 
 	("ADC Regulator" , None),
+	("Sample", None),
+	("Sample Angle", None),
 	("Title" , None),
 	("Comment" , None),
 	("Data" , None),
@@ -108,7 +110,7 @@ def killed_handler(signal, frame):
 	reason = sys.stdin.readline().strip("\r\n ")
 	for out in aquire["open_files"]:
 		sys.stdout.write("# Closing file " + str(out) + "\n")
-		out.write("# Recieved KILL signal.\n# Reason: " + str(reason))
+		out.write("# Recieved KILL signal.\n# Reason: " + str(reason) + "\n")
 		log_close(out)
 
 	
@@ -233,6 +235,7 @@ def checkList():
 			for item in parameters:
 				input_file.write("# " + str(item) + " = " + str(parameters[item]) + "\n")
 			input_file.write("\n")
+			log_close(input_file)
 			input_file = None
 	
 	if (input_file == None):
@@ -251,7 +254,7 @@ def checkList():
 	for item in parameters:
 		checklist.write("# "+str(item) + " = " + str(parameters[item]) + "\n")
 		#output_file.write("# "+str(item) + " = " + str(parameters[item]) + "\n")
-
+	log_close(checklist)
 	
 
 def record_data(ADC_channels, output, pollTime = None, dac_max = None):