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

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

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 9e39fd4..25c3e6b 100755 (executable)
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -35,7 +35,7 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "0.0 + 10.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "4000",#"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
@@ -48,7 +48,7 @@ aquire = { "DAC_Sweep" : "0.0 + 10.0*int(step)", # DAC Sweep value (t is in STEP
 
 #Setup the serial connection parameters
 ser = serial.Serial(
-       port="/dev/ttyUSB1", # Modify as needed (note: in linux need to run `sudo chmod a+rw /dev/ttyUSBX' to set permissions)
+       port="/dev/ttyUSB0", # Modify as needed (note: in linux need to run `sudo chmod a+rw /dev/ttyUSBX' to set permissions)
 
        # Do not change the values below here (unless AVR butterfly is reprogrammed to use different values)
        baudrate=4800,
@@ -221,7 +221,7 @@ def main():
        for i in range(0,5):
        #while True:
                os.system("mkdir -p " + getDate())
-               record_data([5], getDate()+"/"+str(getTime())+".dat", None, 4000)
+               record_data([5], getDate()+"/"+str(getTime())+".dat", None, 4001)
                sweep += 1
        #setDAC(500)
 
@@ -372,7 +372,7 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None):
                        out.write("\n") 
        
        
-               gnuplot.plot(Gnuplot.Data(data, title="t = "+str(measure_time), with_="lp", using="2:3"))
+               gnuplot.plot(Gnuplot.Data(data, title="t = "+str(measure_time), with_="lp", using="1:3"))
        for out in output:              
                if out != sys.stdout:
                        log_close(out)