Automatic commit. Wed Sep 5 00:00:03 WST 2012

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

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index eab484b..cf162b6 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)", # DAC Sweep value (t is in STEPS, not seconds!)
-       "ADC_Averages" : 2000,
+aquire = { "DAC_Sweep" : "0.0 + 10.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" : 2.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" : []
@@ -207,7 +207,7 @@ def main():
        sweep = 1
        while True:
                os.system("mkdir -p " + getDate())
-               record_data([4, 5, 0], getDate()+"/"+str(getTime())+".dat", None, 4000)
+               record_data([5, 0], getDate()+"/"+str(getTime())+".dat", None, 4000)
                sweep += 1