Automatic commit. Mon Aug 27 20:00:02 WST 2012

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

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 11ed9b2..54a8764 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!)
+aquire = { "DAC_Sweep" : "1500.0",# + 50.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
+       #"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" : 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" : []
@@ -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)
 
        
@@ -205,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
        
 
@@ -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):