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

Compare commits

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

2 Commits
cf2c826226 ... e57d04525e

Author SHA1 Message Date
Cal Wing
e57d04525e Use seconds now 2024-10-15 21:25:37 +10:00
Cal Wing
fe960d1dea Chris fix error handle 2024-10-15 21:22:40 +10:00
2 changed files with 14 additions and 12 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()
except Exception as e:
print ("{0}: {1}".format(type(e).__name__, e.message))
print (e)
print ("There was an issue plotting the result.")
mplt.close('all')

6
main.py
View File

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