diff options
| author | Tom Rondeau <tom@trondeau.com> | 2013-10-29 12:02:56 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2013-10-29 12:23:10 -0400 |
| commit | 29a0e3f488512c0cb7b741c1ed780ba4f304e2a5 (patch) | |
| tree | d0037db12de8ca7fd6e03f0525c31d68f865ce8e | |
| parent | beac900842e3dc9c4754669ce4201d04c0363ede (diff) | |
digital: pfb_clock_sync: normalizing differential taps for each channel.
| -rw-r--r-- | gr-digital/lib/pfb_clock_sync_ccf_impl.cc | 2 | ||||
| -rw-r--r-- | gr-digital/lib/pfb_clock_sync_fff_impl.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc index be30da7de5..3e3ae9538d 100644 --- a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc +++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc @@ -306,7 +306,7 @@ namespace gr { // Normalize the taps for(unsigned int i = 0; i < difftaps.size(); i++) { - difftaps[i] /= pwr; + difftaps[i] *= d_nfilters/pwr; } } diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.cc b/gr-digital/lib/pfb_clock_sync_fff_impl.cc index c2a2e7a28b..d73b564302 100644 --- a/gr-digital/lib/pfb_clock_sync_fff_impl.cc +++ b/gr-digital/lib/pfb_clock_sync_fff_impl.cc @@ -267,10 +267,11 @@ namespace gr { diff_filter[2] = 1; float pwr = 0; + difftaps.clear(); difftaps.push_back(0); for(unsigned int i = 0; i < newtaps.size()-2; i++) { float tap = 0; - for(int j = 0; j < 3; j++) { + for(unsigned int j = 0; j < diff_filter.size(); j++) { tap += diff_filter[j]*newtaps[i+j]; } difftaps.push_back(tap); @@ -278,8 +279,9 @@ namespace gr { } difftaps.push_back(0); + // Normalize the taps for(unsigned int i = 0; i < difftaps.size(); i++) { - difftaps[i] /= pwr; + difftaps[i] *= d_nfilters/pwr; } } |