diff --git a/main.py b/main.py index 576da55..eac31bc 100644 --- a/main.py +++ b/main.py @@ -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]])