Skip to content

Commit bfd97e1

Browse files
authored
Merge pull request #46 from fronzbot/dev
0.2.2
2 parents 0eeaa2e + c2c2baa commit bfd97e1

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ python_adc_eval.egg-info
55
dist
66
.ruff_cache
77
.coverage
8+
build

adc_eval/spectrum.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,22 @@ def find_harmonics(spectrum, freq, nfft, bin_sig, psig, harms=5, leak=20):
9494
if bin_harm == nfft / 2:
9595
bin_harm = 0
9696
pwr_max = spectrum[bin_harm]
97+
bin_harm_max = bin_harm
9798
for i in range(bin_harm - leak, bin_harm + leak + 1):
9899
try:
99100
pwr = spectrum[i]
100101
if pwr > pwr_max:
101-
bin_harm = i
102+
bin_harm_max = i
102103
pwr_max = pwr
103104
except IndexError:
104105
# bin + leakage out of bounds, so stop looking
105106
break
106107

107-
harm_stats["harm"][harm_index]["bin"] = bin_harm
108-
harm_stats["harm"][harm_index]["power"] = pwr
108+
harm_stats["harm"][harm_index]["bin"] = bin_harm_max
109+
harm_stats["harm"][harm_index]["power"] = pwr_max
109110
harm_stats["harm"][harm_index]["freq"] = round(freq[bin_harm] / 1e6, 1)
110-
harm_stats["harm"][harm_index]["dBc"] = dBW(pwr / psig)
111-
harm_stats["harm"][harm_index]["dB"] = dBW(pwr)
111+
harm_stats["harm"][harm_index]["dBc"] = dBW(pwr_max / psig)
112+
harm_stats["harm"][harm_index]["dB"] = dBW(pwr_max)
112113

113114
harm_index = harm_index + 1
114115

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "python-adc-eval"
7-
version = "0.2.1"
7+
version = "0.2.2"
88
license = {text = "MIT"}
99
description = "ADC Evaluation Library"
1010
readme = "README.rst"

0 commit comments

Comments
 (0)