aboutsummaryrefslogtreecommitdiffstats
path: root/src/gr-fadingui
diff options
context:
space:
mode:
authorNao Pross <np@0hm.ch>2021-12-09 17:46:06 +0100
committerNao Pross <np@0hm.ch>2021-12-09 17:46:17 +0100
commit4b4589a3d6264059b6e0949681ec697605fb990c (patch)
tree484b33ece38cc653291323c77393c6002689a0ca /src/gr-fadingui
parentCreate phase correction block in gr-fadingui (diff)
downloadFading-4b4589a3d6264059b6e0949681ec697605fb990c.tar.gz
Fading-4b4589a3d6264059b6e0949681ec697605fb990c.zip
Remove unnecessary (out of date) FIXME
Diffstat (limited to 'src/gr-fadingui')
-rw-r--r--src/gr-fadingui/python/phasecorrection.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/gr-fadingui/python/phasecorrection.py b/src/gr-fadingui/python/phasecorrection.py
index 7d79529..75ca280 100644
--- a/src/gr-fadingui/python/phasecorrection.py
+++ b/src/gr-fadingui/python/phasecorrection.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+#
+# Copyright 2021 Naoki Pross.
import pmt
@@ -34,6 +36,10 @@ class phasecorrection(gr.sync_block):
self.last = None
self.lastfreq = 0
+ # debugging variables to check if an error happened in block processing
+ self.lastnsamples = 0
+ self.lastnback = 0
+
def block_phase(self, start, end):
"""
Compute a vector for the phase and frequency correction for the samples
@@ -62,6 +68,7 @@ class phasecorrection(gr.sync_block):
# debugging
log.debug(f"Correction for chunk of {nsamples:2d} samples is " \
f"sphase={sphase: .4f} rad and freq={freq*1e3: .4f}e-3 rad / sample")
+ self.lastnsamples = nsamples
# compute chunk values
return sphase * np.ones(nsamples) + freq * np.arange(0, nsamples)
@@ -105,6 +112,14 @@ class phasecorrection(gr.sync_block):
start = self.block_phase(self.last, tags[0])[-nfront:] \
if self.last and nfront else np.zeros(nfront)
+ # debugging
+ if self.lastnback + self.nfront != self.lastnsamples:
+ log.warn("Something went wrong during block processing!\n" \
+ f"Last block finished with nback = {self.lastnback} samples, " \
+ f"current block starts with nstart = {self.nstart}, but their sum" \
+ f"is not {self.latnsamples} = size of last chunk")
+ self.lastnback = nback
+
# compute correction
correction = np.exp(-1j * np.concatenate([start, middle, end]))
length = len(correction)
@@ -119,6 +134,4 @@ class phasecorrection(gr.sync_block):
for tag in tags:
self.add_item_tag(0, tag.offset, pmt.intern("frame_start"), pmt.PMT_T)
- # FIXME: should return `length' but then the last sample is not
- # included and self.last does something weird
return len(out) \ No newline at end of file