diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-06-13 16:28:42 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-06-13 16:28:42 -0400 |
| commit | 1a285a1d8d8e00f8c135144eb137d1b5c81de586 (patch) | |
| tree | c4f464d4dc35f6a4ac68fe130e6bfb36d8267a3b | |
| parent | a88527a9ca115cc135f0839da656b467123d8d9e (diff) | |
digital: updated QA code for digital blocks that use the pfb resampler to account for the change in delay.
| -rwxr-xr-x | gr-digital/python/digital/qa_mpsk_receiver.py | 12 | ||||
| -rwxr-xr-x | gr-digital/python/digital/qa_pfb_clock_sync.py | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/gr-digital/python/digital/qa_mpsk_receiver.py b/gr-digital/python/digital/qa_mpsk_receiver.py index 1379b52e61..922f685269 100755 --- a/gr-digital/python/digital/qa_mpsk_receiver.py +++ b/gr-digital/python/digital/qa_mpsk_receiver.py @@ -78,7 +78,7 @@ class test_mpsk_receiver(gr_unittest.TestCase): Ncmp = 1000 len_e = len(expected_result) len_d = len(dst_data) - expected_result = expected_result[len_e - Ncmp-1:-1] + expected_result = expected_result[len_e - Ncmp:] dst_data = dst_data[len_d - Ncmp:] #for e,d in zip(expected_result, dst_data): @@ -130,15 +130,13 @@ class test_mpsk_receiver(gr_unittest.TestCase): expected_result = 10000*[complex(-0.5, +0.0), complex(+0.0, -0.5), complex(+0.5, +0.0), complex(+0.0, +0.5)] - # get data after a settling period - dst_data = self.snk.data()[200:] + dst_data = self.snk.data() # Only compare last Ncmp samples + Nstrt = 30000 Ncmp = 1000 - len_e = len(expected_result) - len_d = len(dst_data) - expected_result = expected_result[len_e - Ncmp - 1:-1] - dst_data = dst_data[len_d - Ncmp:] + expected_result = expected_result[Nstrt:Nstrt+Ncmp] + dst_data = dst_data[Nstrt:Nstrt+Ncmp] #for e,d in zip(expected_result, dst_data): # print "{0:+.02f} {1:+.02f}".format(e, d) diff --git a/gr-digital/python/digital/qa_pfb_clock_sync.py b/gr-digital/python/digital/qa_pfb_clock_sync.py index 286953ab34..efa9879d6a 100755 --- a/gr-digital/python/digital/qa_pfb_clock_sync.py +++ b/gr-digital/python/digital/qa_pfb_clock_sync.py @@ -70,7 +70,7 @@ class test_pfb_clock_sync(gr_unittest.TestCase): self.tb.connect(self.src, self.rrc_filter, self.test, self.snk) self.tb.run() - expected_result = 10000*[complex(-1,0), complex(1,0)] + expected_result = 10000*[complex(1,0), complex(-1,0)] dst_data = self.snk.data() # Only compare last Ncmp samples @@ -123,7 +123,7 @@ class test_pfb_clock_sync(gr_unittest.TestCase): self.tb.connect(self.src, self.rrc_filter, self.test, self.snk) self.tb.run() - expected_result = 10000*[-1, 1] + expected_result = 10000*[1, -1] dst_data = self.snk.data() # Only compare last Ncmp samples |