canny_shock_finder.py

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

main.py

@@ -160,12 +160,10 @@ 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')
-
-x2_out = canny_shock_finder(time, (gData["x2"][4][:] - gData["x2"][4][0]) * 0.0148)
+x2_out = canny_shock_finder(x2_timestamps, (gData["x2"][4][:] - gData["x2"][4][0]) * 0.0148)
 
 print(x2_out)
-print("Done")
+input("foo")
 
 #print("Graphing Data")
 #genGraph(data[loaded_data[0]])