Automatic commit. Sun Aug 19 20:00:08 WST 2012

[matches/honours.git] / research / TCS / interface.py

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index f1e3997..19946ed 100755 (executable)
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -32,7 +32,7 @@ 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
@@ -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)