diff options
author | japm48 <japm48@users.noreply.github.com> | 2020-01-09 22:52:15 +0100 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2020-01-09 23:07:25 -0800 |
commit | cb19102d3854e1acb40f16839d9bd78a8b086d7b (patch) | |
tree | 977c3f527a85c545ad06aa7dc7e964cfddebd38c | |
parent | 65a8c6c526d05ce5bc060725d9338e81a4bbbc22 (diff) |
gr-digital/costas_loop: use std::norm for |z|^2
-rw-r--r-- | gr-digital/lib/costas_loop_cc_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc index 124a7e3d2f..5fb040d93d 100644 --- a/gr-digital/lib/costas_loop_cc_impl.cc +++ b/gr-digital/lib/costas_loop_cc_impl.cc @@ -123,7 +123,7 @@ float costas_loop_cc_impl::phase_detector_2(gr_complex sample) const float costas_loop_cc_impl::phase_detector_snr_8(gr_complex sample) const { const float K = (sqrtf(2.0) - 1); - const float snr = (sample * std::conj(sample)).real() / d_noise; + const float snr = std::norm(sample) / d_noise; if (fabsf(sample.real()) >= fabsf(sample.imag())) { return ((blocks::tanhf_lut(snr * sample.real()) * sample.imag()) - (blocks::tanhf_lut(snr * sample.imag()) * sample.real() * K)); @@ -135,14 +135,14 @@ float costas_loop_cc_impl::phase_detector_snr_8(gr_complex sample) const float costas_loop_cc_impl::phase_detector_snr_4(gr_complex sample) const { - const float snr = (sample * std::conj(sample)).real() / d_noise; + const float snr = std::norm(sample) / d_noise; return ((blocks::tanhf_lut(snr * sample.real()) * sample.imag()) - (blocks::tanhf_lut(snr * sample.imag()) * sample.real())); } float costas_loop_cc_impl::phase_detector_snr_2(gr_complex sample) const { - const float snr = (sample * std::conj(sample)).real() / d_noise; + const float snr = std::norm(sample) / d_noise; return blocks::tanhf_lut(snr * sample.real()) * sample.imag(); } |