From 477013fcdd161b86d361c7797847bf9cbbc334bf Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Wed, 31 Dec 2014 11:03:36 +0200 Subject: [PATCH] recv: remove saturation detection --- amodem/common.py | 11 ----------- amodem/recv.py | 2 -- amodem/stream.py | 6 +----- tests/test_common.py | 9 --------- 4 files changed, 1 insertion(+), 27 deletions(-) diff --git a/amodem/common.py b/amodem/common.py index 7a29dc2..70788b7 100644 --- a/amodem/common.py +++ b/amodem/common.py @@ -5,17 +5,6 @@ import logging log = logging.getLogger(__name__) scaling = 32000.0 # out of 2**15 -SATURATION_THRESHOLD = (2**15 - 1) / scaling - - -class SaturationError(ValueError): - pass - - -def check_saturation(x): - peak = np.max(np.abs(x)) - if peak >= SATURATION_THRESHOLD: - raise SaturationError(peak) def load(fileobj): diff --git a/amodem/recv.py b/amodem/recv.py index 8cec3a2..d0936dc 100644 --- a/amodem/recv.py +++ b/amodem/recv.py @@ -217,8 +217,6 @@ def main(config, src, dst, pylab=None): log.debug('Skipping %.3f seconds', config.skip_start) common.take(signal, to_skip) - reader.check = common.check_saturation - detector = detect.Detector(config=config) receiver = Receiver(config=config, pylab=pylab) success = False diff --git a/amodem/stream.py b/amodem/stream.py index 8fd2edb..ebea89b 100644 --- a/amodem/stream.py +++ b/amodem/stream.py @@ -12,7 +12,6 @@ class Reader(object): self.timeout = timeout self.wait = wait self.total = 0 - self.check = None def __iter__(self): return self @@ -37,10 +36,7 @@ class Reader(object): block.extend(data) if len(block) == self.bufsize: - values = self.data_type(block) - if self.check: - self.check(values) - return values + return self.data_type(block) time.sleep(self.wait) diff --git a/tests/test_common.py b/tests/test_common.py index 28e5572..80647f4 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -47,15 +47,6 @@ def test_dumps_loads(): assert all(x == y) -def test_saturation(): - x = np.array([1, -1, 1, -1]) * 1e10 - try: - common.check_saturation(x) - assert False - except common.SaturationError as e: - assert e.args == (max(x),) - - def test_izip(): x = range(10) y = range(-10, 0)