Skip to content
This repository was archived by the owner on Dec 2, 2021. It is now read-only.

Commit 082015d

Browse files
committed
replaced PVSS bin generation with endaq.calc.logfreqs
1 parent 24404a6 commit 082015d

1 file changed

Lines changed: 2 additions & 12 deletions

File tree

endaq/batch/analyzer.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,18 +239,8 @@ def _PVSSData(self):
239239
pvss.index.name = "frequency (Hz)"
240240
return pvss
241241

242-
log2_f0 = np.log2(self._pvss_init_freq)
243-
log2_f1 = np.log2(self._accelerationFs)
244-
num_bins = np.floor(
245-
self._pvss_bins_per_octave * (log2_f1 - 1 - log2_f0)
246-
).astype(int)
247-
248-
freqs = np.logspace(
249-
start=log2_f0,
250-
stop=log2_f0 + num_bins / self._pvss_bins_per_octave,
251-
num=num_bins + 1,
252-
base=2,
253-
endpoint=True,
242+
freqs = endaq.calc.logfreqs(
243+
aData, self._pvss_init_freq, self._pvss_bins_per_octave
254244
)
255245
freqs = freqs[
256246
(freqs >= self._accelerationFs / self._accelerationData.shape[-1])

0 commit comments

Comments
 (0)