Compare commits
2 Commits
e57d04525e
...
e5e283f35a
Author | SHA1 | Date | |
---|---|---|---|
|
e5e283f35a | ||
|
e0e6205895 |
@ -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
3
main.py
@ -160,12 +160,13 @@ 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('int')
|
||||
time = (gData["x2"][0][:] - gData["x2"][0][0]).astype('float64')
|
||||
|
||||
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]])
|
||||
|
Loading…
x
Reference in New Issue
Block a user