X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=7553ab4dddc81319768f780a5031fb3491e05a12;hb=719c502e645607bc071ffbf41a455db899bef8a7;hp=1b85fb1c8052c7f9e4d404e3c71f7be06c595180;hpb=145d3c5838a0ad1f57fcdcdf2e496a32428b7859;p=matches%2Fhonours.git diff --git a/research/TCS/interface.py b/research/TCS/interface.py index 1b85fb1c..7553ab4d 100755 --- 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() @@ -34,8 +35,8 @@ 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" : 200, +aquire = { "DAC_Sweep" : "0.0 + 1.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!) + "ADC_Averages" : 100, #"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 @@ -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,30 +59,34 @@ 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([ - ("Accelerating Voltage" , None), - ("Focus Voltage" , None), + ("Chamber Pressure" , None), # Chamber pressure now automatically determined ("Deflection Voltage" , None), + ("Title" , None), + ("Comment" , None), + ("602 Scale" , None), ("Venault Voltage" , None), + ("Accelerating Voltage" , None), + ("Focus Voltage" , None), + ("Initial Voltage" , None), ("Heating Current" , None), - ("Heating Voltage" , None), - ("Chamber Pressure" , None), - ("610B Zero" , None), + ("Heating Voltage (across filament)" , None), + ("Heating Voltage (across power supply)", None), + #("610B Zero" , None), ("602 Zero" , None), - ("610B Scale" , None), - ("602 Scale" , None), + #("610B Scale" , None), + ("602 0.1 Battery" , None), ("602 0.03 Battery" , None), ("602 0.01 Battery" , None), ("602 0.003 Battery" , None), ("602 0.001 Battery" , None), - ("ADC Regulator" , None), ("Sample", None), ("Sample Angle", None), - ("Title" , None), - ("Comment" , None), + ("ADC Regulator" , None), ("Data" , None), ("Parameters last checked", None) ]) @@ -92,6 +97,18 @@ def getTime(): def getDate(): return str(datetime.datetime.now()).split(" ")[0] +def getPressure(): + + try: + p = subprocess.Popen("./pressure/get_pressure.sh", stdout=subprocess.PIPE) + #p = subprocess.Popen("./this_program_does_not_exist.sh", stdout=subprocess.PIPE) + #result = float("a") + result = float(p.stdout.readline().strip(" \r\n\t")) + except: + return 0.0 + return result + + # Used for when I press Control-C to stop things def set_exit_handler(func): if os.name == "nt": @@ -154,12 +171,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) @@ -207,10 +227,23 @@ def main(): # Experiment # TODO: Modify data to record here sweep = 1 + #for i in range(0,1): 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) + + try: + pass + #os.system("echo \"Sweep number " + str(sweep) + " completed\" | festival --tts") + except: + pass sweep += 1 + #setDAC(500) + + try: + os.system("echo \"Experiment complete\" | festival --tts") + except: + pass def checkList(): @@ -228,10 +261,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: @@ -244,8 +280,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") @@ -276,6 +320,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") @@ -346,7 +392,10 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None): data[len(data)-1].append(adc[2]) out.write("\n") - + #gnuplot("set yrange [0:1023]") + #gnuplot("set xrange [0:4000]") + gnuplot("set xlabel \"DAC (counts)\"") + gnuplot("set ylabel \"Sample Current (ADC counts)\"") gnuplot.plot(Gnuplot.Data(data, title="t = "+str(measure_time), with_="lp", using="2:3")) for out in output: if out != sys.stdout: