Automatic commit. Thu Aug 23 16: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..869d11c 100755 (executable)
--- 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!)
-       "ADC_Averages" : 200,
+aquire = { "DAC_Sweep" : "0.0 + 50.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!)
+       "ADC_Averages" : 2000,
        #"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)