cal/Thesis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: cal:e57d04525e4592ab4d4715cb1a11faf88b99fd4c
Branches Tags
cal:main
..
compare: cal:cf2c826226c02a8e09547b746306ebe39c90a799
Branches Tags
cal:main

No commits in common. "e57d04525e4592ab4d4715cb1a11faf88b99fd4c" and "cf2c826226c02a8e09547b746306ebe39c90a799" have entirely different histories.
e57d04525e ... cf2c826226

2 changed files with 12 additions and 14 deletions
Show Stats Expand all files Collapse all files

2
canny_shock_finder.py
View File

@ -476,7 +476,7 @@ def canny_shock_finder(time_list, pressure_list, sigma = 4, derivative_threshold
mplt.show() mplt.show()
except Exception as e: except Exception as e:
print (e) print ("{0}: {1}".format(type(e).__name__, e.message))
print ("There was an issue plotting the result.") print ("There was an issue plotting the result.")
mplt.close('all') mplt.close('all')

6
main.py
View File

@ -160,12 +160,10 @@ def genGraph(gData):
gData = data[loaded_data[0]] gData = data[loaded_data[0]]
x2_time, scope_time, x2_timestamps = process_data(gData) x2_time, scope_time, x2_timestamps = process_data(gData)
time = (gData["x2"][0][:] - gData["x2"][0][0]).astype('int') x2_out = canny_shock_finder(x2_timestamps, (gData["x2"][4][:] - gData["x2"][4][0]) * 0.0148)
x2_out = canny_shock_finder(time, (gData["x2"][4][:] - gData["x2"][4][0]) * 0.0148)
print(x2_out) print(x2_out)
print("Done") input("foo")
#print("Graphing Data") #print("Graphing Data")
#genGraph(data[loaded_data[0]]) #genGraph(data[loaded_data[0]])