X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=55538015be8f729e8df69feec2b54cdf3a7dafe1;hb=99ba9c4410dd508341c7069ce00bab5aac444f09;hp=a16ae8ebcd9de3480d848fa4209f2eff531f82dd;hpb=1d39c460aa1b62468491f9d88ffcc6912822d888;p=matches%2Fhonours.git diff --git a/research/TCS/interface.py b/research/TCS/interface.py index a16ae8eb..55538015 100755 --- a/research/TCS/interface.py +++ b/research/TCS/interface.py @@ -12,6 +12,7 @@ import time import serial import datetime +import odict # TODO: Insert variables for calibration purposes here. @@ -31,19 +32,20 @@ calibrate = { } # TODO: Adjust aqcuisition parameters here -aquire = { "DAC_Sweep" : "0.0 + 500.0*int(step/600)", # DAC Sweep value (t is in STEPS, not seconds!) +aquire = { "DAC_Sweep" : "0.0 + 10.0*int(step/10)", # 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 + #"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" : 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 + "start_date" : None, + "open_files" : [] } #Setup the serial connection parameters ser = serial.Serial( - port="/dev/ttyUSB0", # Modify as needed (note: in linux need to run `sudo chmod a+rw /dev/ttyUSBX' to set permissions) + port="/dev/ttyUSB1", # 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, @@ -55,31 +57,32 @@ ser = serial.Serial( rtscts=0 ) -parameters = { - "Accelerating Voltage" : None, - "Focus Voltage" : None, - "Deflection Voltage" : None, - "Venault Voltage" : None, - "Initial Voltage" : None, - "Heating Current" : None, - "Heating Voltage" : None, - "Chamber Pressure" : None, - "610B Zero" : None, - "602 Zero" : None, - "610B Scale" : None, - "602 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 Battery" : None, - "ADC Regulator" : None, - "Title" : None, - "Comment" : None, - "Data" : None, - -} +parameters = odict.odict([ + ("Accelerating Voltage" , None), + ("Focus Voltage" , None), + ("Deflection Voltage" , None), + ("Venault Voltage" , None), + ("Initial Voltage" , None), + ("Heating Current" , None), + ("Heating Voltage" , None), + ("Chamber Pressure" , None), + ("610B Zero" , None), + ("602 Zero" , None), + ("610B Scale" , None), + ("602 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), + ("Data" , None), + ("Parameters last checked", None) +]) def getTime(): return str(datetime.datetime.now()).split(" ")[1].split(".")[0].replace(":","") @@ -87,9 +90,56 @@ def getTime(): def getDate(): return str(datetime.datetime.now()).split(" ")[0] -def init(): +# Used for when I press Control-C to stop things +def set_exit_handler(func): + if os.name == "nt": + try: + import win32api + win32api.SetConsoleCtrlHandler(func, True) + except ImportError: + version = ".".join(map(str, sys.version_info[:2])) + raise Exception("pywin32 not installed for Python " + version) + else: + import signal + signal.signal(signal.SIGTERM, func) + signal.signal(signal.SIGINT, func) + +def killed_handler(signal, frame): + reason = "" + sys.stdout.write("\n# Reason for killing program? ") + reason = sys.stdin.readline().strip("\r\n ") + for out in aquire["open_files"]: + sys.stdout.write("# Closing file " + str(out) + "\n") + out.write("# Recieved KILL signal.\n# Reason: " + str(reason) + "\n") + log_close(out) + +def cleanup(): + for out in aquire["open_files"]: + out.write("# Program exits.\n") + log_close(out) + +def log_open(a, b): + result = open(a, b,0) + if (b == "w"): + result.write("# File opened at " + str(datetime.datetime.now()) + "\n") + aquire["open_files"].append(result) + return result + +def log_close(afile): + if (afile in aquire["open_files"]): + afile.write("# File closed at " + str(datetime.datetime.now()) + "\n") + aquire["open_files"].remove(afile) + + afile.close() + + +def init(): + #import atexit + #atexit.register(cleanup) + set_exit_handler(killed_handler) + aquire["start_date"] = getDate() @@ -109,43 +159,44 @@ def init(): print(ser.readline().strip("\r\n")) print(ser.readline().strip("\r\n")) - print("Writing config information to config.dat...") - output = open("config.dat", "w", 1) + #print("Writing config information to config.dat...") + #output = log_open("config.dat", "w", 1) - output.write("# Initialise " + str(datetime.datetime.now()) + "\n") + #output.write("# Initialise " + str(datetime.datetime.now()) + "\n") - for field in calibrate: - output.write("# calibrate["+str(field)+"] = "+str(calibrate[field]) + "\n") - output.write("\n") - for field in aquire: - output.write("# aquire["+str(field)+"] = "+str(aquire[field]) + "\n") + #for field in calibrate: + # output.write("# calibrate["+str(field)+"] = "+str(calibrate[field]) + "\n") + #output.write("\n") + #for field in aquire: + # output.write("# aquire["+str(field)+"] = "+str(aquire[field]) + "\n") - output.write("# Ready " + str(datetime.datetime.now()) + "\n# EOF\n") - output.close() + #output.write("# Ready " + str(datetime.datetime.now()) + "\n# EOF\n") + #output.close() def main(): init() - if (loadCalibration_DAC() == False): - if (calibrateDAC() == False): - return -1 - if (loadCalibration_ADC(aquire["ADC_Is"]) == False): - if (calibrateADC_usingDAC(aquire["ADC_Is"], False) == False): - if (calibrateADC(aquire["ADC_Is"]) == False): - return -1 - - if (loadCalibration_ADC(aquire["ADC_Vi"]) == False): - if (calibrateADC_usingDAC(aquire["ADC_Vi"], True) == False): - if (calibrateADC(aquire["ADC_Vi"]) == False): - return -1 + # I haven't ever used calibrated results, and yet this code is still here, why??? + #if (loadCalibration_DAC() == False): + # if (calibrateDAC() == False): + # return -1 + #if (loadCalibration_ADC(aquire["ADC_Is"]) == False): + # if (calibrateADC_usingDAC(aquire["ADC_Is"], False) == False): + # if (calibrateADC(aquire["ADC_Is"]) == False): + # return -1 + + #if (loadCalibration_ADC(aquire["ADC_Vi"]) == False): + # if (calibrateADC_usingDAC(aquire["ADC_Vi"], True) == False): + # if (calibrateADC(aquire["ADC_Vi"]) == False): + # return -1 # Make directory for today, backup calibration files os.system("mkdir -p " + getDate()) - os.system("cp *.dat " + getDate() +"/") + #os.system("cp *.dat " + getDate() +"/") - #checkList() + checkList() @@ -156,59 +207,82 @@ def main(): sweep = 1 while True: os.system("mkdir -p " + getDate()) - record_data([4], getDate()+"/"+str(getTime())+".dat", None, 2500) + record_data([5, 0], getDate()+"/"+str(getTime())+".dat", None, 4000) sweep += 1 -def checkList(output_file): +def checkList(): try: - input_file = open(getDate()+"/checklist", "r") + input_file = log_open(getDate()+"/checklist", "r") except: input_file = None if (input_file != None): for line in input_file: k = line.split("=") - item = k[0].strip(" \r\n") - value = k[1].strip(" \r\n") + item = None + if (len(k) >= 2): + item = k[0].strip("# \r\n") + value = k[1].strip("# \r\n") + if (item in parameters): parameters[item] = value 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: + input_file.write("# " + str(item) + " = " + str(parameters[item]) + "\n") + input_file.write("\n") + log_close(input_file) input_file = None if (input_file == None): for item in parameters: + if item == "Parameters last checked": + continue sys.stdout.write("\""+str(item)+"\" = " + str(parameters[item]) + " New value?: ") response = sys.stdin.readline().strip("\r\n ") if (response != ""): parameters[item] = response sys.stdout.write("\n") + parameters["Parameters last checked"] = str(datetime.datetime.now()) - checklist = open(getDate()+"/checklist", "w", 0) + checklist = log_open(getDate()+"/checklist", "w") for item in parameters: checklist.write("# "+str(item) + " = " + str(parameters[item]) + "\n") - output_file.write("# "+str(item) + " = " + str(parameters[item]) + "\n") - - + #output_file.write("# "+str(item) + " = " + str(parameters[item]) + "\n") + log_close(checklist) + def record_data(ADC_channels, output, pollTime = None, dac_max = None): if (output != None): - output = [open(output, "w", 0), sys.stdout] - checkList(output[0]) + output = [log_open(output, "w"), sys.stdout] else: output = [sys.stdout] + for field in aquire: + for out in output: + out.write("# aquire["+str(field)+"] = "+str(aquire[field]) + "\n") + + for out in output: + out.write("# Parameters:\n") + + for field in parameters: + for out in output: + out.write("# "+str(field)+" = " + str(parameters[field]) + "\n") + + start_time = time.time() for out in output: + out.write("\n") out.write("# Experiment " + str(datetime.datetime.now()) + "\n") out.write("# Polling for " + str(pollTime) + "s.\n") - out.write("# DAC = " + str(aquire["DAC_Sweep"]) + "\n") + out.write("\n") out.write("# Data:\n") out.write("# time\tDAC") for channel in ADC_channels: @@ -240,8 +314,11 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None): for channel in ADC_channels: read = readADC(channel) if read == False: - print("Abort data collection") - return False + for out in output: + print("# Abort data collection due to failed ADC read") + if out != sys.stdout: + log_close(out) + return False raw_adc.append((channel, read[0], read[1])) end_time = time.time() @@ -256,12 +333,12 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None): for out in output: if out != sys.stdout: - out.close() + log_close(out) return True def loadCalibration_ADC(channel): try: - input_file = open("calibrateADC"+str(channel)+".dat") + input_file = log_open("calibrateADC"+str(channel)+".dat") except: print("Couldn't find calibration file for ADC " + str(channel)) return False @@ -274,7 +351,7 @@ def loadCalibration_ADC(channel): else: split_line = l.split("\t") calibrate["ADC"][channel].append((float(split_line[0]), float(split_line[1]))) - input_file.close() + log_close(input_file) if (len(calibrate["ADC"][channel]) <= 0): print("Empty calibration file for ADC " + str(channel)) @@ -283,7 +360,7 @@ def loadCalibration_ADC(channel): def loadCalibration_DAC(): try: - input_file = open("calibrateDAC.dat") + input_file = log_open("calibrateDAC.dat") except: print("Couldn't find calibration file for DAC") return False @@ -302,7 +379,7 @@ def loadCalibration_DAC(): calibrate["DAC"].append((int(split_line[0]), float(split_line[1]))) - input_file.close() + log_close(input_file) if (len(calibrate["DAC"]) <= 0): print("Empty calibration file for DAC") @@ -411,7 +488,7 @@ def calibrateADC_usingDAC(channel, gain = True): return False calibrate["ADC"][channel] = [] - outfile = open("calibrateADC"+str(channel)+".dat", "w", 1) + outfile = log_open("calibrateADC"+str(channel)+".dat", "w") outfile.write("# Calibrate ADC " + str(channel) + "\n") outfile.write("# Start " + str(datetime.datetime.now()) + "\n") @@ -450,7 +527,7 @@ def calibrateADC_usingDAC(channel, gain = True): calibrate["ADC"][channel].append((value[0], input_value, value[1])) outfile.write("# Stop " + str(datetime.datetime.now()) + "\n# EOF\n") - outfile.close() + log_close(outfile) if (setDAC(0) == False): return False if (len(calibrate["ADC"][channel]) <= 0): @@ -460,7 +537,7 @@ def calibrateADC_usingDAC(channel, gain = True): def calibrateADC(channel): calibrate["ADC"][channel] = [] - outfile = open("calibrateADC"+str(channel)+".dat", "w", 1) + outfile = log_open("calibrateADC"+str(channel)+".dat", "w") outfile.write("# Calibrate ADC " + str(channel) + "\n") outfile.write("# Start " + str(datetime.datetime.now()) + "\n") @@ -485,7 +562,7 @@ def calibrateADC(channel): outfile.write("# Stop " + str(datetime.datetime.now()) + "\n# EOF\n") - outfile.close() + log_close(outfile) if (len(calibrate["ADC"][channel]) <= 0): print("Error: No calibration points taken for ADC " + str(channel)) return False @@ -495,7 +572,7 @@ def calibrateADC(channel): def calibrateDAC(): calibrate["DAC"] = [] - outfile = open("calibrateDAC.dat", "w", 1) + outfile = log_open("calibrateDAC.dat", "w") outfile.write("# Calibrate DAC\n") outfile.write("# Start " + str(datetime.datetime.now()) + "\n") @@ -537,7 +614,7 @@ def calibrateDAC(): level += stepSize outfile.write("# Stop " + str(datetime.datetime.now()) + "\n# EOF\n") - outfile.close() + log_close(outfile) if (len(calibrate["DAC"]) <= 0): print("Error: No calibration points taken for DAC") return False