diff options
| author | mleech <mleech@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-05-29 11:37:08 +0000 |
|---|---|---|
| committer | mleech <mleech@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-05-29 11:37:08 +0000 |
| commit | 25c5610e7e74bc875a70aa091e11d8c89d4b4ff1 (patch) | |
| tree | 8fff519dad2bda09fb50bc16552566f1406d0060 /gr-radio-astronomy/src/python/usrp_psr_receiver.py | |
| parent | 8e8b38dd844ded1017bff0ca79622e497ed7eabf (diff) | |
Changed detector chain in usrp_psr_receiver to use complex_to_mag_squared.
Changed usrp_ra_receiver to use dbid() method to determine which card type
is being used.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5564 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-radio-astronomy/src/python/usrp_psr_receiver.py')
| -rwxr-xr-x | gr-radio-astronomy/src/python/usrp_psr_receiver.py | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/gr-radio-astronomy/src/python/usrp_psr_receiver.py b/gr-radio-astronomy/src/python/usrp_psr_receiver.py index 759022cfb3..3c7dedac8d 100755 --- a/gr-radio-astronomy/src/python/usrp_psr_receiver.py +++ b/gr-radio-astronomy/src/python/usrp_psr_receiver.py @@ -356,17 +356,8 @@ class app_flow_graph(stdgui.gui_flow_graph): self.second = gr.fir_filter_fff (int(p), second_filter) self.third = gr.fir_filter_fff (10, third_filter) - # Split complex USRP stream into a pair of floats - self.splitter = gr.complex_to_float (1); - - # I squarer (detector) - self.multI = gr.multiply_ff(); - - # Q squarer (detector) - self.multQ = gr.multiply_ff(); - - # Adding squared I and Q to produce instantaneous signal power - self.adder = gr.add_ff(); + # Detector + self.detector = gr.complex_to_mag_squared() self.enable_comb_filter = False # Epoch folder comb filter @@ -402,25 +393,12 @@ class app_flow_graph(stdgui.gui_flow_graph): # Start connecting configured modules in the receive chain # - # Connect raw USRP to de-dispersion filter, complex->float splitter - self.connect(self.u, self.dispfilt, self.splitter) - - # Connect splitter outputs to multipliers - # First do I^2 - self.connect((self.splitter, 0), (self.multI,0)) - self.connect((self.splitter, 0), (self.multI,1)) - - # Then do Q^2 - self.connect((self.splitter, 1), (self.multQ,0)) - self.connect((self.splitter, 1), (self.multQ,1)) - - # Then sum the squares - self.connect(self.multI, (self.adder,0)) - self.connect(self.multQ, (self.adder,1)) + # Connect raw USRP to de-dispersion filter, detector + self.connect(self.u, self.dispfilt, self.detector) - # Connect detector/adder output to FIR LPF + # Connect detector output to FIR LPF # in two stages, followed by the FFT scope - self.connect(self.adder, self.first, + self.connect(self.detector, self.first, self.second, self.third, self.scope) # Connect audio output |