diff --git a/examples/nsf/NsfIntegrate60.grc b/examples/nsf/NsfIntegrate60.grc index f7c11d1..ff80d6d 100755 --- a/examples/nsf/NsfIntegrate60.grc +++ b/examples/nsf/NsfIntegrate60.grc @@ -694,6 +694,40 @@ blocks: coordinate: [704, 256] rotation: 180 state: enabled +- name: blocks_float_to_int_0 + id: blocks_float_to_int + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + scale: '10.' + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [80, 580.0] + rotation: 0 + state: true +- name: blocks_int_to_float_0 + id: blocks_int_to_float + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + scale: '10.' + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [80, 628.0] + rotation: 0 + state: true - name: blocks_stream_to_vector_0_0 id: blocks_stream_to_vector parameters: @@ -1343,7 +1377,7 @@ blocks: maxoutbuf: '0' minoutbuf: '0' nave: nAve - nmedian: 4**5 + nmedian: 4**4 observers: observer obstype: obstype record: Record @@ -1370,7 +1404,7 @@ blocks: inttype: Record maxoutbuf: '0' minoutbuf: '0' - nmedian: 4**5 + nmedian: 4**4 observers: observer obstype: obstype setup: ObsName+".not" @@ -1419,23 +1453,6 @@ blocks: coordinate: [336, 320] rotation: 0 state: enabled -- name: radio_astro_vmedian_0_0_0 - id: radio_astro_vmedian - parameters: - affinity: '' - alias: '' - comment: '' - maxoutbuf: '0' - minoutbuf: '0' - n: '4' - vec_length: fftsize - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [520, 248] - rotation: 180 - state: enabled - name: radio_astro_vmedian_0_0_0_0 id: radio_astro_vmedian parameters: @@ -1474,12 +1491,14 @@ blocks: connections: - [blocks_complex_to_float_0, '0', qtgui_histogram_sink_x_0, '0'] - [blocks_complex_to_float_0, '1', qtgui_histogram_sink_x_0, '1'] -- [blocks_complex_to_mag_squared_0, '0', radio_astro_vmedian_0_0_0, '0'] +- [blocks_complex_to_mag_squared_0, '0', radio_astro_vmedian_0_0_0_0, '0'] +- [blocks_float_to_int_0, '0', blocks_int_to_float_0, '0'] +- [blocks_int_to_float_0, '0', qtgui_number_sink_0, '0'] - [blocks_stream_to_vector_0_0, '0', fft_vxx_0, '0'] - [fft_vxx_0, '0', blocks_complex_to_mag_squared_0, '0'] - [osmosdr_source_0, '0', blocks_complex_to_float_0, '0'] - [osmosdr_source_0, '0', blocks_stream_to_vector_0_0, '0'] -- [radio_astro_ra_ascii_sink_0, '0', qtgui_number_sink_0, '0'] +- [radio_astro_ra_ascii_sink_0, '0', blocks_float_to_int_0, '0'] - [radio_astro_ra_integrate_1, '0', qtgui_vector_sink_f_0_0, '0'] - [radio_astro_ra_integrate_1, '1', qtgui_vector_sink_f_0_0, '1'] - [radio_astro_ra_integrate_1, '2', qtgui_vector_sink_f_0_0, '2'] @@ -1487,7 +1506,6 @@ connections: - [radio_astro_ra_integrate_1, '4', qtgui_vector_sink_f_0_0, '4'] - [radio_astro_vmedian_0, '0', radio_astro_vmedian_0_1, '0'] - [radio_astro_vmedian_0_0, '0', radio_astro_vmedian_0, '0'] -- [radio_astro_vmedian_0_0_0, '0', radio_astro_vmedian_0_0_0_0, '0'] - [radio_astro_vmedian_0_0_0_0, '0', radio_astro_vmedian_0_0, '0'] - [radio_astro_vmedian_0_1, '0', radio_astro_ra_ascii_sink_0, '0'] - [radio_astro_vmedian_0_1, '0', radio_astro_ra_integrate_1, '0'] diff --git a/examples/nsf/NsfIntegrate60.py b/examples/nsf/NsfIntegrate60.py index 532db80..5b0432f 100755 --- a/examples/nsf/NsfIntegrate60.py +++ b/examples/nsf/NsfIntegrate60.py @@ -154,8 +154,8 @@ def __init__(self): except: Azimuth_save = 90. self.Azimuth_save = Azimuth_save self.yunits = yunits = ["Counts", "Power (dB)", "Intensity (Kelvins)", "Intensity (K)"] - self.ymins = ymins = [ 0.01, -20, 90.,-5.] - self.ymaxs = ymaxs = [3., 10., 200., 50.] + self.ymins = ymins = [-.5, -20, 90.,-3.] + self.ymaxs = ymaxs = [12., 10., 200., 30.] self.xsteps = xsteps = [Bandwidth*1.E-6/fftsize, -Bandwidth*3.E5/(H1*fftsize), 1] self.xmins = xmins = [numin*1E-6, (H1 - numin)*(3E5/H1), 0 ] self.units = units = 0 @@ -416,11 +416,10 @@ def updateButtonChecked(self, button_id): self.top_grid_layout.setColumnStretch(c, 1) self.radio_astro_vmedian_0_1 = radio_astro.vmedian(fftsize, 4) self.radio_astro_vmedian_0_0_0_0 = radio_astro.vmedian(fftsize, 4) - self.radio_astro_vmedian_0_0_0 = radio_astro.vmedian(fftsize, 4) self.radio_astro_vmedian_0_0 = radio_astro.vmedian(fftsize, 4) self.radio_astro_vmedian_0 = radio_astro.vmedian(fftsize, 4) - self.radio_astro_ra_integrate_1 = radio_astro.ra_integrate(ObsName+".not", observer, fftsize, Frequency, Bandwidth, Azimuth, Elevation, Record, obstype, 4**5, units, 295., 10.) - self.radio_astro_ra_ascii_sink_0 = radio_astro.ra_ascii_sink(ObsName+".not", observer, fftsize, Frequency, Bandwidth, Azimuth, Elevation, Record, obstype, 4**5, nAve, Telescope, Device, float(Gain1), float(Gain2), float(Gain3)) + self.radio_astro_ra_integrate_1 = radio_astro.ra_integrate(ObsName+".not", observer, fftsize, Frequency, Bandwidth, Azimuth, Elevation, Record, obstype, 4**4, units, 295., 10.) + self.radio_astro_ra_ascii_sink_0 = radio_astro.ra_ascii_sink(ObsName+".not", observer, fftsize, Frequency, Bandwidth, Azimuth, Elevation, Record, obstype, 4**4, nAve, Telescope, Device, float(Gain1), float(Gain2), float(Gain3)) self.qtgui_vector_sink_f_0_0 = qtgui.vector_sink_f( fftsize, xmins[Xaxis], @@ -443,7 +442,7 @@ def updateButtonChecked(self, button_id): '', '', '', '', ''] widths = [1, 3, 2, 2, 3, 1, 1, 1, 1, 1] - colors = ["gold", "green", "red", "blue", "purple", + colors = ["yellow", "green", "red", "blue", "dark blue", "magenta", "yellow", "dark red", "dark green", "dark blue"] alphas = [2., 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] @@ -564,6 +563,8 @@ def updateButtonChecked(self, button_id): self.osmosdr_source_0.set_bandwidth(Bandwidth, 0) self.fft_vxx_0 = fft.fft_vcc(fftsize, True, window.hamming(fftsize), True, 1) self.blocks_stream_to_vector_0_0 = blocks.stream_to_vector(gr.sizeof_gr_complex*1, fftsize) + self.blocks_int_to_float_0 = blocks.int_to_float(1, 10.) + self.blocks_float_to_int_0 = blocks.float_to_int(1, 10.) self.blocks_complex_to_mag_squared_0 = blocks.complex_to_mag_squared(fftsize) self.blocks_complex_to_float_0 = blocks.complex_to_float(1) @@ -573,20 +574,21 @@ def updateButtonChecked(self, button_id): ################################################## self.connect((self.blocks_complex_to_float_0, 0), (self.qtgui_histogram_sink_x_0, 0)) self.connect((self.blocks_complex_to_float_0, 1), (self.qtgui_histogram_sink_x_0, 1)) - self.connect((self.blocks_complex_to_mag_squared_0, 0), (self.radio_astro_vmedian_0_0_0, 0)) + self.connect((self.blocks_complex_to_mag_squared_0, 0), (self.radio_astro_vmedian_0_0_0_0, 0)) + self.connect((self.blocks_float_to_int_0, 0), (self.blocks_int_to_float_0, 0)) + self.connect((self.blocks_int_to_float_0, 0), (self.qtgui_number_sink_0, 0)) self.connect((self.blocks_stream_to_vector_0_0, 0), (self.fft_vxx_0, 0)) self.connect((self.fft_vxx_0, 0), (self.blocks_complex_to_mag_squared_0, 0)) self.connect((self.osmosdr_source_0, 0), (self.blocks_complex_to_float_0, 0)) self.connect((self.osmosdr_source_0, 0), (self.blocks_stream_to_vector_0_0, 0)) - self.connect((self.radio_astro_ra_ascii_sink_0, 0), (self.qtgui_number_sink_0, 0)) + self.connect((self.radio_astro_ra_ascii_sink_0, 0), (self.blocks_float_to_int_0, 0)) self.connect((self.radio_astro_ra_integrate_1, 0), (self.qtgui_vector_sink_f_0_0, 0)) + self.connect((self.radio_astro_ra_integrate_1, 3), (self.qtgui_vector_sink_f_0_0, 3)) self.connect((self.radio_astro_ra_integrate_1, 4), (self.qtgui_vector_sink_f_0_0, 4)) self.connect((self.radio_astro_ra_integrate_1, 2), (self.qtgui_vector_sink_f_0_0, 2)) self.connect((self.radio_astro_ra_integrate_1, 1), (self.qtgui_vector_sink_f_0_0, 1)) - self.connect((self.radio_astro_ra_integrate_1, 3), (self.qtgui_vector_sink_f_0_0, 3)) self.connect((self.radio_astro_vmedian_0, 0), (self.radio_astro_vmedian_0_1, 0)) self.connect((self.radio_astro_vmedian_0_0, 0), (self.radio_astro_vmedian_0, 0)) - self.connect((self.radio_astro_vmedian_0_0_0, 0), (self.radio_astro_vmedian_0_0_0_0, 0)) self.connect((self.radio_astro_vmedian_0_0_0_0, 0), (self.radio_astro_vmedian_0_0, 0)) self.connect((self.radio_astro_vmedian_0_1, 0), (self.radio_astro_ra_ascii_sink_0, 0)) self.connect((self.radio_astro_vmedian_0_1, 0), (self.radio_astro_ra_integrate_1, 0)) @@ -800,7 +802,6 @@ def set_fftsize(self, fftsize): self.set_xsteps([self.Bandwidth*1.E-6/self.fftsize, -self.Bandwidth*3.E5/(self.H1*self.fftsize), 1]) self.radio_astro_vmedian_0.set_vlen(self.fftsize) self.radio_astro_vmedian_0_0.set_vlen(self.fftsize) - self.radio_astro_vmedian_0_0_0.set_vlen(self.fftsize) self.radio_astro_vmedian_0_0_0_0.set_vlen(self.fftsize) self.radio_astro_vmedian_0_1.set_vlen(self.fftsize)