summaryrefslogtreecommitdiff
path: root/gr-digital/python/qa_costas_loop_cc.py
diff options
context:
space:
mode:
Diffstat (limited to 'gr-digital/python/qa_costas_loop_cc.py')
-rwxr-xr-xgr-digital/python/qa_costas_loop_cc.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/gr-digital/python/qa_costas_loop_cc.py b/gr-digital/python/qa_costas_loop_cc.py
index 368704093..3f5eaa141 100755
--- a/gr-digital/python/qa_costas_loop_cc.py
+++ b/gr-digital/python/qa_costas_loop_cc.py
@@ -20,11 +20,11 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, blks2, gr_unittest
-import digital_swig
+from gnuradio import gr, gr_unittest
+import digital_swig, psk2
import random, cmath
-class test_digital(gr_unittest.TestCase):
+class test_costas_loop_cc(gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
@@ -34,8 +34,8 @@ class test_digital(gr_unittest.TestCase):
def test01 (self):
# test basic functionality by setting all gains to 0
- damp = 0.4
- natfreq = 0.25
+ damp = 0.0
+ natfreq = 0.0
order = 2
self.test = digital_swig.costas_loop_cc(damp, natfreq, order)
@@ -130,9 +130,9 @@ class test_digital(gr_unittest.TestCase):
self.test = digital_swig.costas_loop_cc(damp, natfreq, order)
rot = cmath.exp(-cmath.pi/8.0j) # rotate to match Costas rotation
- const = blks2.psk.make_constellation(order)
+ const = psk2.psk_constellation(order)
data = [random.randint(0,7) for i in xrange(100)]
- data = [2*rot*const[d] for d in data]
+ data = [2*rot*const.points()[d] for d in data]
N = 40 # settling time
expected_result = data[N:]
@@ -153,4 +153,4 @@ class test_digital(gr_unittest.TestCase):
self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 2)
if __name__ == '__main__':
- gr_unittest.run(test_digital, "test_digital.xml")
+ gr_unittest.run(test_costas_loop_cc, "test_costas_loop_cc.xml")