From 5cc454da14f4a671cfa203e248d04bcc72921b65 Mon Sep 17 00:00:00 2001 From: Holger Mueller Date: Mon, 25 Nov 2019 11:00:30 +0100 Subject: [PATCH] Pep8 cleanups --- NanoVNASaver/RFTools.py | 13 ++++--------- test/test_sitools.py | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/NanoVNASaver/RFTools.py b/NanoVNASaver/RFTools.py index c5a0869..604d540 100644 --- a/NanoVNASaver/RFTools.py +++ b/NanoVNASaver/RFTools.py @@ -21,27 +21,21 @@ from typing import List, NamedTuple from NanoVNASaver.SITools import Value, Format -def clamp_value(value: Real, rmin: Real, rmax: Real) -> Real: - assert rmin <= rmax - if value < rmin: - return rmin - if value > rmax: - return rmax - return value - - def norm_to_impedance(z: complex, ref_impedance: float = 50) -> complex: """Calculate impedance from normalized z""" return z * ref_impedance + def reflection_coefficient(z: complex, ref_impedance: float = 50) -> complex: """Calculate reflection coefficient for z""" return (z - ref_impedance) / (z + ref_impedance) + def gamma_to_impedance(gamma: complex, ref_impedance: float = 50) -> complex: """Calculate reflection coefficient for z""" return ((-gamma - 1) / (gamma - 1)) * ref_impedance + class Datapoint(NamedTuple): freq: int re: float @@ -98,6 +92,7 @@ class Datapoint(NamedTuple): return 0 return imp.imag * 1 / (self.freq * 2 * math.pi) + def clamp_value(value: Real, rmin: Real, rmax: Real) -> Real: assert rmin <= rmax if value < rmin: diff --git a/test/test_sitools.py b/test/test_sitools.py index 01b725d..769d3ab 100644 --- a/test/test_sitools.py +++ b/test/test_sitools.py @@ -98,7 +98,7 @@ class TestTSIToolsValue(unittest.TestCase): self.assertEqual(str(v.parse("1e-1")), "100m") self.assertEqual(str(v.parse("1e-2")), "10m") self.assertEqual(str(v.parse("1e-3")), "1m") - + if __name__ == '__main__': unittest.main(verbosity=2)