Automatic commit. Thu Sep 13 00:00:07 WST 2012

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

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 22e04a4..b008284 100755 (executable)
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -14,6 +14,7 @@ import datetime
 
 import odict
 import Gnuplot, Gnuplot.funcutils
+import subprocess
 
 gnuplot = Gnuplot.Gnuplot()
 
@@ -47,7 +48,7 @@ aquire = { "DAC_Sweep" : "0.0 + 50.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,
@@ -58,17 +59,20 @@ ser = serial.Serial(
        xonxoff=0,
        rtscts=0
 )
-
+#Using an ordered dictionary, so results will be determined (or prompted for) in this order.
+# Put things that are being changed a lot near the top of the list.
 parameters = odict.odict([
+       ("Chamber Pressure" , None), # Chamber pressure now automatically determined
+       ("Venault Voltage" , None),
+       ("Title" , None),
+       ("Comment" , None),
        ("Accelerating Voltage" , None),
        ("Focus Voltage" , None),
        ("Deflection Voltage" , None),
-       ("Venault Voltage" , None),
        ("Initial Voltage" , None),
        ("Heating Current" , None),
        ("Heating Voltage (across filament)" , None),
        ("Heating Voltage (across power supply)", None),
-       ("Chamber Pressure" , None),
        #("610B Zero" , None),
        ("602 Zero" , None),
        #("610B Scale" , None),
@@ -81,8 +85,6 @@ parameters = odict.odict([
        ("ADC Regulator" , None),
        ("Sample", None),
        ("Sample Angle", None),
-       ("Title" , None),
-       ("Comment" , None),
        ("Data" , None),
        ("Parameters last checked", None)
 ])
@@ -93,6 +95,11 @@ def getTime():
 def getDate():
        return str(datetime.datetime.now()).split(" ")[0]
 
+def getPressure():
+       p = subprocess.Popen("./pressure/get_pressure.sh", stdout=subprocess.PIPE)
+       return float(p.stdout.readline().strip(" \r\n\t"))
+       
+
 # Used for when I press Control-C to stop things
 def set_exit_handler(func):
     if os.name == "nt":
@@ -155,12 +162,15 @@ def init():
 #              pass
        #while (ser.readline().strip("\r\n ") != "#"):
        #       pass
-       time.sleep(1.0)
+       #time.sleep(1.0)
 
        ser.write("a "+str(aquire["ADC_Averages"]) + "\r\n")
-       print(ser.readline().strip("\r\n"))
-       print(ser.readline().strip("\r\n"))
-       print(ser.readline().strip("\r\n"))
+       ser.readline().strip("\r\n")
+       ser.readline().strip("\r\n")
+       ser.readline().strip("\r\n")
+       #print(ser.readline().strip("\r\n"))
+       #print(ser.readline().strip("\r\n"))
+       #print(ser.readline().strip("\r\n"))
 
        #print("Writing config information to config.dat...")
        #output = log_open("config.dat", "w", 1)
@@ -208,11 +218,12 @@ def main():
        # Experiment
        # TODO: Modify data to record here
        sweep = 1
-       for i in range(0,1):
+       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)
+       #setDAC(500)
 
 def checkList():
        try:
@@ -229,10 +240,13 @@ def checkList():
                                value = k[1].strip("# \r\n")
 
                        if (item in parameters):
-                               parameters[item] = value
+                               if item == "Chamber Pressure":
+                                       parameters[item] = getPressure()
+                               else:
+                                       parameters[item] = value
        
-               print("Checklist found. Overwrite? [Y/n]")
-               response = sys.stdin.readline().strip(" \r\n")
+               #print("Checklist found. Overwrite? [Y/n]")
+               response = "" #sys.stdin.readline().strip(" \r\n")
                if (response == "" or response == "y" or response == "Y"):
                        input_file = log_open(getDate()+"/checklist.old", "w")
                        for item in parameters:
@@ -245,8 +259,16 @@ def checkList():
                for item in parameters:
                        if item == "Parameters last checked":
                                continue
+                       if item == "Chamber Pressure":
+                               #sys.stdout.write("\""+str(item)+"\" = " + str(parameters[item]) + " - get new pressure... ")
+                               #parameters[item] = getPressure()
+                               #sys.stdout.write(str(parameters[item]) + "\n")
+                               continue
+
                        sys.stdout.write("\""+str(item)+"\" = " + str(parameters[item]) + " New value?: ")
                        response = sys.stdin.readline().strip("\r\n ")
+                       if (response == "!"):
+                               break
                        if (response != ""):
                                parameters[item] = response
                        sys.stdout.write("\n")
@@ -277,6 +299,8 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None):
        for out in output:
                out.write("# Parameters:\n")
 
+       parameters["Chamber Pressure"] = getPressure() # Update chamber pressure
+
        for field in parameters:
                for out in output:
                        out.write("# "+str(field)+" = " + str(parameters[field]) + "\n")
@@ -347,8 +371,9 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None):
                                data[len(data)-1].append(adc[2])
                        out.write("\n") 
        
-       
-               #gnuplot.plot(Gnuplot.Data(data, title="t = "+str(measure_time), with_="lp", using="2:3"))
+               #gnuplot("set yrange [0:1023]")
+               #gnuplot("set xrange [0:4000]")
+               gnuplot.plot(Gnuplot.Data(data, title="t = "+str(measure_time), with_="lp", using="2:3"))
        for out in output:              
                if out != sys.stdout:
                        log_close(out)