Merge remote-tracking branch 'origin/master'

# Conflicts: # ephemeris.py # postProcessing.py # probeData.py
perrysou · Jul 13, 2018 · 0e49b5d · 0e49b5d
2 parents 89bc8ed + ad21cbc
commit 0e49b5d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/probeData.py b/probeData.py
@@ -1,6 +1,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
-from scipy.signal import hamming, welch
+from scipy.signal import welch
+from scipy.signal.windows.windows import hamming
 
 
 # ./probeData.m