Use of np.isclose rather than equality when finding frequency of maximum power.

这个提交包含在:
Craig Warren
2018-01-02 14:09:17 +00:00
父节点 fc7306c101
当前提交 8b81dca756
共有 3 个文件被更改,包括 3 次插入3 次删除

查看文件

@@ -255,7 +255,7 @@ def dispersion_analysis(G):
# FFT
freqs, power = fft_power(waveformvalues, G.dt)
# Get frequency for max power
freqmaxpower = np.where(power == 0)[0][0]
freqmaxpower = np.where(np.isclose(power, 0))[0][0]
# Set maximum frequency to a threshold drop from maximum power, ignoring DC value
try:

查看文件

@@ -86,7 +86,7 @@ def mpl_plot(filename, outputs=Rx.defaultoutputs, fft=False):
if fft:
# FFT
freqs, power = fft_power(outputdata, dt)
freqmaxpower = np.where(power == 0)[0][0]
freqmaxpower = np.where(np.isclose(power, 0))[0][0]
# Set plotting range to -60dB from maximum power or 4 times
# frequency at maximum power

查看文件

@@ -105,7 +105,7 @@ def mpl_plot(w, timewindow, dt, iterations, fft=False):
# Set plotting range to 4 times frequency at max power of waveform or
# 4 times the centre frequency
freqmaxpower = np.where(power == 0)[0][0]
freqmaxpower = np.where(np.isclose(power, 0))[0][0]
if freqs[freqmaxpower] > w.freq:
pltrange = np.where(freqs > 4 * freqs[freqmaxpower])[0][0]
else: