Automatic commit. Tue Aug 7 11:00:04 WST 2012

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

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 1260582..cf6380a 100755 (executable)
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -31,7 +31,7 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "2000",#"0.0 + 250.0*int(step/200)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "0.0 + 100.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
@@ -154,10 +154,10 @@ def main():
        # Experiment
        # TODO: Modify data to record here
        sweep = 1
-       #while True:
-       os.system("mkdir -p " + getDate())
-       record_data([4], getDate()+"/"+str(getTime())+".dat", None, 2500)
-       sweep += 1
+       while True:
+               os.system("mkdir -p " + getDate())
+               record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 4000)
+               sweep += 1
        
 
 def checkList(output_file):
@@ -199,7 +199,7 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None):
        
        if (output != None):
                output = [open(output, "w", 0), sys.stdout]
-               checkList(output[0])
+               #checkList(output[0])
        else:
                output = [sys.stdout]