X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=research%2FTCS%2Finterface.py;h=6ccea1f1543e4031e10ddac3416da6f9bafb44b5;hb=5681e6a23ecf734cbdc2d9a2305fc002c3ee67d9;hp=f1e3997b66a40af95262dbf3501e590308556aaa;hpb=df79d0a9c6c8d8fb2f91212a31868033e4841b8b;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index f1e3997b..6ccea1f1 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -32,12 +32,12 @@ 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)", # 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
-	"DAC_Settle" : 0.0, # Time in seconds to wait for DAC to stabilise
+	"DAC_Settle" : 1.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,
 	"open_files" : []
@@ -77,6 +77,7 @@ parameters = odict.odict([
 	("602 0.001 Battery" , None), 
 	("ADC Regulator" , None),
 	("Sample", None),
+	("Sample Angle", None),
 	("Title" , None),
 	("Comment" , None),
 	("Data" , None),
@@ -109,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)
 
 	
@@ -206,7 +207,7 @@ def main():
 	sweep = 1
 	while True:
 		os.system("mkdir -p " + getDate())
-		record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 4000)
+		record_data([4, 5, 0], getDate()+"/"+str(getTime())+".dat", None, 4000)
 		sweep += 1