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

Compare commits

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

No commits in common. "e5e283f35a4ebb74b1844bb79617e772c0f0967f" and "e57d04525e4592ab4d4715cb1a11faf88b99fd4c" have entirely different histories.
e5e283f35a ... e57d04525e

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

2
canny_shock_finder.py
View File

@ -478,7 +478,7 @@ def canny_shock_finder(time_list, pressure_list, sigma = 4, derivative_threshold
except Exception as e:
print (e)
print ("There was an issue plotting the result.")
#mplt.close('all')
mplt.close('all')
if not return_processing_lists:
# just return the found arrival time/times

3
main.py
View File

@ -160,13 +160,12 @@ def genGraph(gData):
gData = data[loaded_data[0]]
x2_time, scope_time, x2_timestamps = process_data(gData)
time = (gData["x2"][0][:] - gData["x2"][0][0]).astype('float64')
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)
print("Done")
pltKeyClose()
#print("Graphing Data")
#genGraph(data[loaded_data[0]])