Added support for dual_mode (for dual-polarization) removed two layers of
[debian/gnuradio] / gr-radio-astronomy / src / python / usrp_ra_receiver.py
index cdc5b6e1903aacd8617b176ba5af352c98d122ed..37422149ec9a6dca9a39d029998eaa517c3fb202 100755 (executable)
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
 
 from gnuradio import gr, gru
 from gnuradio import usrp
-import usrp_dbid
+from usrpm import usrp_dbid
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui, ra_fftsink, ra_stripchartsink, ra_waterfallsink, form, slider
+from gnuradio.wxgui import stdgui2, ra_fftsink, ra_stripchartsink, ra_waterfallsink, form, slider, waterfallsink
 from optparse import OptionParser
 import wx
 import sys
 import Numeric 
 import time
-import FFT
+import numpy.fft
 import ephem
 
-class continuum_calibration(gr.feval_dd):
-    def eval(self, x):
-        str = globals()["calibration_codelet"]
-        exec(str)
-        return(x)
-
-class app_flow_graph(stdgui.gui_flow_graph):
+class app_flow_graph(stdgui2.std_top_block):
     def __init__(self, frame, panel, vbox, argv):
-        stdgui.gui_flow_graph.__init__(self)
+        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
 
         self.frame = frame
         self.panel = panel
@@ -78,32 +72,89 @@ class app_flow_graph(stdgui.gui_flow_graph):
         parser.add_option("-M", "--fft_rate", type="eng_float", default=8.0, help="FFT Rate")
         parser.add_option("-A", "--calib_coeff", type="eng_float", default=1.0, help="Calibration coefficient")
         parser.add_option("-B", "--calib_offset", type="eng_float", default=0.0, help="Calibration coefficient")
-        parser.add_option("-Q", "--calib_eqn", default="x = x * 1.0", help="Calibration equation")
         parser.add_option("-W", "--waterfall", action="store_true", default=False, help="Use Waterfall FFT display")
         parser.add_option("-S", "--setimode", action="store_true", default=False, help="Enable SETI processing of spectral data")
-        parser.add_option("-T", "--setitimer", type="eng_float", default=15.0, help="Timer for computing doppler chirp for SETI analysis")
         parser.add_option("-K", "--setik", type="eng_float", default=1.5, help="K value for SETI analysis")
+        parser.add_option("-T", "--setibandwidth", type="eng_float", default=12500, help="Instantaneous SETI observing bandwidth--must be divisor of 250Khz")
+        parser.add_option("-Q", "--seti_range", type="eng_float", default=1.0e6, help="Total scan width, in Hz for SETI scans")
+        parser.add_option("-Z", "--dual_mode", action="store_true",
+            default=False, help="Dual-polarization mode")
+        parser.add_option("-I", "--interferometer", action="store_true", default=False, help="Interferometer mode")
         (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
+
+        #if (len(args) == 0):
+            #parser.print_help()
+            #sys.exit()
 
         self.show_debug_info = True
+
+        # Pick up waterfall option
         self.waterfall = options.waterfall
+
+        # SETI mode stuff
         self.setimode = options.setimode
         self.seticounter = 0
-        self.setitimer = int(options.setitimer)
         self.setik = options.setik
-        self.hitcounter = 0
-        self.CHIRP_LOWER = 15
-        self.CHIRP_UPPER = 50
+        self.seti_fft_bandwidth = int(options.setibandwidth)
+
+        # Calculate binwidth
+        binwidth = self.seti_fft_bandwidth / options.fft_size
 
+        # Use binwidth, and knowledge of likely chirp rates to set reasonable
+        #  values for SETI analysis code.   We assume that SETI signals will
+        #  chirp at somewhere between 0.10Hz/sec and 0.25Hz/sec.
+        #
+        # upper_limit is the "worst case"--that is, the case for which we have
+        #  to wait the longest to actually see any drift, due to the quantizing
+        #  on FFT bins.
+        upper_limit = binwidth / 0.10
+        self.setitimer = int(upper_limit * 2.00)
+        self.scanning = True
+
+        # Calculate the CHIRP values based on Hz/sec
+        self.CHIRP_LOWER = 0.10 * self.setitimer
+        self.CHIRP_UPPER = 0.25 * self.setitimer
+
+        # Reset hit counters to 0
+        self.hitcounter = 0
+        self.s1hitcounter = 0
+        self.s2hitcounter = 0
+        self.avgdelta = 0
+        # We scan through 2Mhz of bandwidth around the chosen center freq
+        self.seti_freq_range = options.seti_range
+        # Calculate lower edge
+        self.setifreq_lower = options.freq - (self.seti_freq_range/2)
+        self.setifreq_current = options.freq
+        # Calculate upper edge
+        self.setifreq_upper = options.freq + (self.seti_freq_range/2)
+
+        # Maximum "hits" in a line
+        self.nhits = 20
+
+        # Number of lines for analysis
+        self.nhitlines = 4
+
+        # We change center frequencies based on nhitlines and setitimer
+        self.setifreq_timer = self.setitimer * (self.nhitlines * 5)
+
+        # Create actual timer
+        self.seti_then = time.time()
+
+        # The hits recording array
+        self.hits_array = Numeric.zeros((self.nhits,self.nhitlines), Numeric.Float64)
+        self.hit_intensities = Numeric.zeros((self.nhits,self.nhitlines), Numeric.Float64)
         # Calibration coefficient and offset
         self.calib_coeff = options.calib_coeff
         self.calib_offset = options.calib_offset
+        if self.calib_offset < -750:
+            self.calib_offset = -750
+        if self.calib_offset > 750:
+            self.calib_offset = 750
 
-        self.calib_eqn = options.calib_eqn
-        globals()["calibration_codelet"] = self.calib_eqn
+        if self.calib_coeff < 1:
+            self.calib_coeff = 1
+        if self.calib_coeff > 100:
+            self.calib_coeff = 100
 
         self.integ = options.integ
         self.avg_alpha = options.avg
@@ -113,18 +164,43 @@ class app_flow_graph(stdgui.gui_flow_graph):
         # Set initial values for datalogging timed-output
         self.continuum_then = time.time()
         self.spectral_then = time.time()
+        
+        self.dual_mode = options.dual_mode
       
         # build the graph
 
-        self.u = usrp.source_c(decim_rate=options.decim)
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-        self.cardtype = self.u.daughterboard_id(0)
+        self.subdev = [(0, 0), (0,0)]
+        #
+        # If SETI mode, we always run at maximum USRP decimation
+        #
+        if (self.setimode):
+            options.decim = 256
+        if (self.dual_mode == False):
+            self.u = usrp.source_c(decim_rate=options.decim)
+            self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
+            # determine the daughterboard subdevice we're using
+            self.subdev[0] = usrp.selected_subdev(self.u, options.rx_subdev_spec)
+            self.subdev[1] = self.subdev[0]
+            self.cardtype = self.subdev[0].dbid()
+        else:
+               self.u=usrp.source_c(decim_rate=options.decim, nchan=2)
+               self.subdev[0] = usrp.selected_subdev(self.u, (0, 0))
+               self.subdev[1] = usrp.selected_subdev(self.u, (1, 0))
+               self.cardtype = self.subdev[0].dbid()
+               self.u.set_mux(0x32103210)
+        
+        
+        #
+        # Set 8-bit mode
+        #
+        width = 8
+        shift = 8
+        format = self.u.make_format(width, shift)
+        r = self.u.set_format(format)
+        
         # Set initial declination
         self.decln = options.decln
 
-        # determine the daughterboard subdevice we're using
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-
         input_rate = self.u.adc_freq() / self.u.decim_rate()
 
         #
@@ -140,39 +216,70 @@ class app_flow_graph(stdgui.gui_flow_graph):
         #
         self.fft_rate = options.fft_rate
 
-        self.fft_size = options.fft_size
+        self.fft_size = int(options.fft_size)
 
         # This buffer is used to remember the most-recent FFT display
         #   values.  Used later by self.write_spectral_data() to write
-        #   spectral data to datalogging files.
-        self.fft_outbuf = Numeric.zeros(options.fft_size, Numeric.Float64)
-        self.old_hits = Numeric.zeros(10, Numeric.Float64)
-        self.older_hits = Numeric.zeros(10, Numeric.Float64)
+        #   spectral data to datalogging files, and by the SETI analysis
+        #   function.
+        #
+        self.fft_outbuf = Numeric.zeros(self.fft_size, Numeric.Float64)
+
+        #
+        # If SETI mode, only look at seti_fft_bandwidth
+        #   at a time.
+        #
+        if (self.setimode):
+            self.fft_input_rate = self.seti_fft_bandwidth
+
+            #
+            # Build a decimating bandpass filter
+            #
+            self.fft_input_taps = gr.firdes.complex_band_pass (1.0,
+               input_rate,
+               -(int(self.fft_input_rate/2)), int(self.fft_input_rate/2), 200,
+               gr.firdes.WIN_HAMMING, 0)
+
+            #
+            # Compute required decimation factor
+            #
+            decimation = int(input_rate/self.fft_input_rate)
+            self.fft_bandpass = gr.fir_filter_ccc (decimation, 
+                self.fft_input_taps)
+        else:
+            self.fft_input_rate = input_rate
 
         # Set up FFT display
         if self.waterfall == False:
-           self.scope = ra_fftsink.ra_fft_sink_c (self, panel, 
-               fft_size=int(self.fft_size), sample_rate=input_rate,
+           self.scope = ra_fftsink.ra_fft_sink_c (panel, 
+               fft_size=int(self.fft_size), sample_rate=self.fft_input_rate,
                fft_rate=int(self.fft_rate), title="Spectral",  
                ofunc=self.fft_outfunc, xydfunc=self.xydfunc)
         else:
-            self.scope = ra_waterfallsink.ra_waterfallsink_c (self, panel,
-                fft_size=int(self.fft_size), sample_rate=input_rate,
-                fft_rate=int(self.fft_rate), title="Spectral", ofunc=self.fft_outfunc, xydfunc=self.xydfunc)
+            self.scope = ra_waterfallsink.waterfall_sink_c (panel,
+                fft_size=int(self.fft_size), sample_rate=self.fft_input_rate,
+                fft_rate=int(self.fft_rate), title="Spectral", ofunc=self.fft_outfunc, size=(1100, 600), xydfunc=self.xydfunc, ref_level=0, span=10)
 
         # Set up ephemeris data
         self.locality = ephem.Observer()
         self.locality.long = str(options.longitude)
         self.locality.lat = str(options.latitude)
+        # We make notes about Sunset/Sunrise in Continuum log files
+        self.sun = ephem.Sun()
+        self.sunstate = "??"
 
         # Set up stripchart display
+        tit = "Continuum"
+        if (self.dual_mode != False):
+               tit = "H+V Continuum"
         self.stripsize = int(options.stripsize)
-        self.chart = ra_stripchartsink.stripchart_sink_f (self, panel,
-            stripsize=self.stripsize,
-            title="Continuum",
-            xlabel="LMST Offset (Seconds)",
-            scaling=1.0, ylabel=options.ylabel,
-            divbase=options.divbase)
+        if self.setimode == False:
+            self.chart = ra_stripchartsink.stripchart_sink_f (panel,
+                stripsize=self.stripsize,
+                title=tit,
+                xlabel="LMST Offset (Seconds)",
+                scaling=1.0, ylabel=options.ylabel,
+                divbase=options.divbase)
 
         # Set center frequency
         self.centerfreq = options.freq
@@ -184,110 +291,118 @@ class app_flow_graph(stdgui.gui_flow_graph):
         else:
             self.observing = options.observing
 
+        # Remember our input bandwidth
         self.bw = input_rate
 
-        # We setup the first two integrators to produce a fixed integration
-        # Down to 1Hz, with output at 1 samples/sec
-        N = input_rate/5000
-
-        # Second stage runs on decimated output of first
-        M = (input_rate/N)
-
-        # Create taps for first integrator
-        t = range(0,N-1)
-        tapsN = []
-        for i in t:
-             tapsN.append(1.0/N)
-
-        # Create taps for second integrator
-        t = range(0,M-1)
-        tapsM = []
-        for i in t:
-            tapsM.append(1.0/M)
-
         #
-        # The 3rd integrator is variable, and user selectable at runtime
-        # This integrator doesn't decimate, but is used to set the
-        #  final integration time based on the constant 1Hz input samples
-        # The strip chart is fed at a constant 1Hz rate as a result
+        # 
+        # The strip chart is fed at a constant 1Hz rate
         #
 
         #
         # Call constructors for receive chains
         #
 
-        # The three integrators--two FIR filters, and an IIR final filter
-        self.integrator1 = gr.fir_filter_fff (N, tapsN)
-        self.integrator2 = gr.fir_filter_fff (M, tapsM)
-        self.integrator3 = gr.single_pole_iir_filter_ff(1.0)
+        if self.setimode == False:
+            # The IIR integration filter for post-detection
+            self.integrator = gr.single_pole_iir_filter_ff(1.0)
+            self.integrator.set_taps (1.0/self.bw)
 
-        # 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();
-
-        # Signal probe
-        self.probe = gr.probe_signal_f();
+            if (self.dual_mode == False):
+                # The detector
+               self.detector = gr.complex_to_mag_squared()
+    
+            # Signal probe
+            self.probe = gr.probe_signal_f()
+    
+            #
+            # Continuum calibration stuff
+            #
+            x = self.calib_coeff/100.0
+            self.cal_mult = gr.multiply_const_ff(self.calib_coeff/100.0)
+            self.cal_offs = gr.add_const_ff(self.calib_offset*(x*8000))
+            
+            #
+            # Mega decimator after IIR filter
+            #
+            self.keepn = gr.keep_one_in_n(gr.sizeof_float, self.bw)
 
         #
-        # Continuum calibration stuff
+        # Start connecting configured modules in the receive chain
         #
-        self.cal_mult = gr.multiply_const_ff(self.calib_coeff);
-        self.cal_offs = gr.add_const_ff(self.calib_offset);
-
-        #self.cal_eqn = continuum_calibration();
-
+        
+        
         #
-        # Start connecting configured modules in the receive chain
+        # Handle dual-polarization mode
         #
-        self.connect(self.u, self.scope)
-        self.connect(self.u, 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 adder output to two-stages of FIR integrator
-        #   followed by a single stage IIR integrator, and
-        #   the calibrator
-        self.connect(self.adder, self.integrator1, 
-           self.integrator2, self.integrator3, self.cal_mult, 
-           self.cal_offs, self.chart)
-
-        # Connect calibrator to probe
-        # SPECIAL NOTE:  I'm setting the ground work here
-        #   for completely changing the way local_calibrator
-        #   works, including removing some horrible kludges for
-        #   recording data.
-        # But for now, self.probe() will be used to display the
-        #  current instantaneous integrated detector value
-        self.connect(self.cal_offs, self.probe)
+        if (self.dual_mode == False):
+               self.head = self.u
+               self.shead = self.u
+               
+        else:
+               self.di = gr.deinterleave(gr.sizeof_gr_complex)
+               self.addchans = gr.add_cc ()
+               self.h_power = gr.complex_to_mag_squared()
+               self.v_power = gr.complex_to_mag_squared()
+               self.connect (self.u, self.di)
+               
+               #
+               # For spectral, adding the two channels works, assuming no gross
+               #   phase or amplitude error
+               self.connect ((self.di, 0), (self.addchans, 0))
+               self.connect ((self.di, 1), (self.addchans, 1))
+               
+               #
+               # Connect heads of spectral and total-power chains
+               #
+               self.head = self.di
+               self.shead = self.addchans
+               
+               #
+               # For dual-polarization mode, we compute the sum of the
+               #   powers on each channel, after they've been detected
+               #
+               self.detector = gr.add_ff()
+
+        # The scope--handle SETI mode
+        if (self.setimode == False):
+            self.connect(self.shead, self.scope)
+        else:
+            self.connect(self.shead, self.fft_bandpass, self.scope)
+
+        if (self.setimode == False):
+            if (self.dual_mode == False):
+                self.connect(self.head, self.detector, 
+                    self.integrator, self.keepn, self.cal_mult, self.cal_offs, self.chart)
+            else:
+               #
+               # In dual-polarization mode, we compute things a little differently
+               # In effect, we have two radiometer chains, terminating in an adder
+               #
+                self.connect((self.di, 0), self.h_power)
+                self.connect((self.di, 1), self.v_power)
+                self.connect(self.h_power, (self.detector, 0))
+                self.connect(self.v_power, (self.detector, 1))
+                self.connect(self.detector,
+                    self.integrator, self.keepn, self.cal_mult, self.cal_offs, self.chart)
+
+            #  current instantaneous integrated detector value
+            self.connect(self.cal_offs, self.probe)
 
         self._build_gui(vbox)
 
         # Make GUI agree with command-line
         self.integ = options.integ
-        self.myform['integration'].set_value(int(options.integ))
+        if self.setimode == False:
+            self.myform['integration'].set_value(int(options.integ))
+            self.myform['offset'].set_value(self.calib_offset)
+            self.myform['dcgain'].set_value(self.calib_coeff)
         self.myform['average'].set_value(int(options.avg))
 
-        # Make integrator agree with command line
-        self.set_integration(int(options.integ))
+
+        if self.setimode == False:
+            # Make integrator agree with command line
+            self.set_integration(int(options.integ))
 
         self.avg_alpha = options.avg
 
@@ -296,22 +411,22 @@ class app_flow_graph(stdgui.gui_flow_graph):
             self.scope.set_avg_alpha(float(1.0/options.avg))
             self.scope.set_average(True)
 
-        # Set division size
-        self.chart.set_y_per_div(options.division)
-
-        # Set reference(MAX) level
-        self.chart.set_ref_level(options.reflevel)
+        if self.setimode == False:
+            # Set division size
+            self.chart.set_y_per_div(options.division)
+            # Set reference(MAX) level
+            self.chart.set_ref_level(options.reflevel)
 
         # set initial values
 
         if options.gain is None:
             # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
+            g = self.subdev[0].gain_range()
             options.gain = float(g[0]+g[1])/2
 
         if options.freq is None:
             # if no freq was specified, use the mid-point
-            r = self.subdev.freq_range()
+            r = self.subdev[0].freq_range()
             options.freq = float(r[0]+r[1])/2
 
         # Set the initial gain control
@@ -326,16 +441,19 @@ class app_flow_graph(stdgui.gui_flow_graph):
 
         # RF hardware information
         self.myform['decim'].set_value(self.u.decim_rate())
-        self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
-        self.myform['dbname'].set_value(self.subdev.name())
+        self.myform['USB BW'].set_value(self.u.adc_freq() / self.u.decim_rate())
+        if (self.dual_mode == True):
+            self.myform['dbname'].set_value(self.subdev[0].name()+'/'+self.subdev[1].name())
+        else:
+               self.myform['dbname'].set_value(self.subdev[0].name())
 
         # Set analog baseband filtering, if DBS_RX
-        if self.cardtype == usrp_dbid.DBS_RX:
+        if self.cardtype in (usrp_dbid.DBS_RX, usrp_dbid.DBS_RX_REV_2_1):
             lbw = (self.u.adc_freq() / self.u.decim_rate()) / 2
             if lbw < 1.0e6:
                 lbw = 1.0e6
-            self.subdev.set_bw(lbw)
-
+            self.subdev[0].set_bw(lbw)
+            self.subdev[1].set_bw(lbw)
         # Start the timer for the LMST display and datalogging
         self.lmst_timer.Start(1000)
 
@@ -346,6 +464,17 @@ class app_flow_graph(stdgui.gui_flow_graph):
     def _build_gui(self, vbox):
 
         def _form_set_freq(kv):
+            # Adjust current SETI frequency, and limits
+            self.setifreq_lower = kv['freq'] - (self.seti_freq_range/2)
+            self.setifreq_current = kv['freq']
+            self.setifreq_upper = kv['freq'] + (self.seti_freq_range/2)
+
+            # Reset SETI analysis timer
+            self.seti_then = time.time()
+            # Zero-out hits array when changing frequency
+            self.hits_array[:,:] = 0.0
+            self.hit_intensities[:,:] = -60.0
+
             return self.set_freq(kv['freq'])
 
         def _form_set_decln(kv):
@@ -354,8 +483,9 @@ class app_flow_graph(stdgui.gui_flow_graph):
         # Position the FFT display
         vbox.Add(self.scope.win, 15, wx.EXPAND)
 
-        # Position the Total-power stripchart
-        vbox.Add(self.chart.win, 15, wx.EXPAND)
+        if self.setimode == False:
+            # Position the Total-power stripchart
+            vbox.Add(self.chart.win, 15, wx.EXPAND)
         
         # add control area at the bottom
         self.myform = myform = form.form()
@@ -372,42 +502,73 @@ class app_flow_graph(stdgui.gui_flow_graph):
             parent=self.panel, sizer=vbox1, label="Current LMST", weight=1)
         vbox1.Add((4,0), 0, 0)
 
-        myform['spec_data'] = form.static_text_field(
-            parent=self.panel, sizer=vbox1, label="Spectral Cursor", weight=1)
-        vbox1.Add((4,0), 0, 0)
+        if self.setimode == False:
+            myform['spec_data'] = form.static_text_field(
+                parent=self.panel, sizer=vbox1, label="Spectral Cursor", weight=1)
+            vbox1.Add((4,0), 0, 0)
 
         vbox2 = wx.BoxSizer(wx.VERTICAL)
-        g = self.subdev.gain_range()
+        if self.setimode == False:
+            vbox3 = wx.BoxSizer(wx.VERTICAL)
+        g = self.subdev[0].gain_range()
         myform['gain'] = form.slider_field(parent=self.panel, sizer=vbox2, label="RF Gain",
                                            weight=1,
                                            min=int(g[0]), max=int(g[1]),
                                            callback=self.set_gain)
 
         vbox2.Add((4,0), 0, 0)
+        if self.setimode == True:
+            max_savg = 100
+        else:
+            max_savg = 3000
         myform['average'] = form.slider_field(parent=self.panel, sizer=vbox2, 
-                    label="Spectral Averaging (FFT frames)", weight=1, min=1, max=2000, callback=self.set_averaging)
+                    label="Spectral Averaging (FFT frames)", weight=1, min=1, max=max_savg, callback=self.set_averaging)
+
+        # Set up scan control button when in SETI mode
+        if (self.setimode == True):
+               # SETI scanning control
+               buttonbox = wx.BoxSizer(wx.HORIZONTAL)
+               self.scan_control = form.button_with_callback(self.panel,
+                     label="Scan: On ",
+                     callback=self.toggle_scanning)
+       
+               buttonbox.Add(self.scan_control, 0, wx.CENTER)
+               vbox2.Add(buttonbox, 0, wx.CENTER)
 
         vbox2.Add((4,0), 0, 0)
 
-        myform['integration'] = form.slider_field(parent=self.panel, sizer=vbox2,
-               label="Continuum Integration Time (sec)", weight=1, min=1, max=180, callback=self.set_integration)
+        if self.setimode == False:
+            myform['integration'] = form.slider_field(parent=self.panel, sizer=vbox2,
+                   label="Continuum Integration Time (sec)", weight=1, min=1, max=180, callback=self.set_integration)
+
+            vbox2.Add((4,0), 0, 0)
 
-        vbox2.Add((4,0), 0, 0)
         myform['decln'] = form.float_field(
             parent=self.panel, sizer=vbox2, label="Current Declination", weight=1,
             callback=myform.check_input_and_call(_form_set_decln))
         vbox2.Add((4,0), 0, 0)
 
-        buttonbox = wx.BoxSizer(wx.HORIZONTAL)
-        vbox.Add(buttonbox, 0, wx.CENTER)
+        if self.setimode == False:
+            myform['offset'] = form.slider_field(parent=self.panel, sizer=vbox3,
+                label="Post-Detector Offset", weight=1, min=-750, max=750, 
+                callback=self.set_pd_offset)
+            vbox3.Add((2,0), 0, 0)
+            myform['dcgain'] = form.slider_field(parent=self.panel, sizer=vbox3,
+                label="Post-Detector Gain", weight=1, min=1, max=100, 
+                callback=self.set_pd_gain)
+            vbox3.Add((2,0), 0, 0)
         hbox.Add(vbox1, 0, 0)
-       hbox.Add(vbox2, wx.ALIGN_RIGHT, 0)
+        hbox.Add(vbox2, wx.ALIGN_RIGHT, 0)
+
+        if self.setimode == False:
+            hbox.Add(vbox3, wx.ALIGN_RIGHT, 0)
+
         vbox.Add(hbox, 0, wx.EXPAND)
 
         self._build_subpanel(vbox)
 
         self.lmst_timer = wx.PyTimer(self.lmst_timeout)
-        self.lmst_timeout()
+        #self.lmst_timeout()
 
 
     def _build_subpanel(self, vbox_arg):
@@ -432,8 +593,8 @@ class app_flow_graph(stdgui.gui_flow_graph):
             parent=panel, sizer=hbox, label="Decim")
 
         hbox.Add((5,0), 1)
-        myform['fs@usb'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Fs@USB")
+        myform['USB BW'] = form.static_float_field(
+            parent=panel, sizer=hbox, label="USB BW")
 
         hbox.Add((5,0), 1)
         myform['dbname'] = form.static_text_field(
@@ -468,7 +629,8 @@ class app_flow_graph(stdgui.gui_flow_graph):
         # Everything except BASIC_RX should support usrp.tune()
         #
         if not (self.cardtype == usrp_dbid.BASIC_RX):
-            r = usrp.tune(self.u, 0, self.subdev, target_freq)
+            r = usrp.tune(self.u, self.subdev[0]._which, self.subdev[0], target_freq)
+            r = usrp.tune(self.u, self.subdev[1]._which, self.subdev[1], target_freq)
         else:
             r = self.u.set_rx_freq(0, target_freq)
             f = self.u.rx_freq(0)
@@ -499,7 +661,8 @@ class app_flow_graph(stdgui.gui_flow_graph):
 
     def set_gain(self, gain):
         self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdev.set_gain(gain)
+        self.subdev[0].set_gain(gain)
+        self.subdev[1].set_gain(gain)
         self.gain = gain
 
     def set_averaging(self, avval):
@@ -509,7 +672,8 @@ class app_flow_graph(stdgui.gui_flow_graph):
         self.avg_alpha = avval
 
     def set_integration(self, integval):
-        self.integrator3.set_taps(1.0/integval)
+        if self.setimode == False:
+            self.integrator.set_taps(1.0/((integval)*(self.bw/2)))
         self.myform['integration'].set_value(integval)
         self.integ = integval
 
@@ -522,26 +686,46 @@ class app_flow_graph(stdgui.gui_flow_graph):
     #
     def lmst_timeout(self):
          self.locality.date = ephem.now()
-         x = self.probe.level()
+         if self.setimode == False:
+             x = self.probe.level()
          sidtime = self.locality.sidereal_time()
          # LMST
-         s = str(ephem.hours(sidtime))
+         s = str(ephem.hours(sidtime)) + " " + self.sunstate
          # Continuum detector value
-         sx = "%7.4f" % x
-         s = s + "\nDet: " + str(sx)
-         sx = "%2d" % self.hitcounter
-         sy = "%2d" % self.CHIRP_LOWER
-         s = s + "\nH: " + str(sx) + " Cl: " + str(sy)
+         if self.setimode == False:
+             sx = "%7.4f" % x
+             s = s + "\nDet: " + str(sx)
+         else:
+             sx = "%2d" % self.hitcounter
+             s1 = "%2d" % self.s1hitcounter
+             s2 = "%2d" % self.s2hitcounter
+             sa = "%4.2f" % self.avgdelta
+             sy = "%3.1f-%3.1f" % (self.CHIRP_LOWER, self.CHIRP_UPPER)
+             s = s + "\nHits: " + str(sx) + "\nS1:" + str(s1) + " S2:" + str(s2)
+             s = s + "\nAv D: " + str(sa) + "\nCh lim: " + str(sy)
+
          self.myform['lmst_high'].set_value(s)
 
          #
          # Write data out to recording files
          #
-         self.write_continuum_data(x,sidtime)
-         self.write_spectral_data(self.fft_outbuf,sidtime)
+         if self.setimode == False:
+             self.write_continuum_data(x,sidtime)
+             self.write_spectral_data(self.fft_outbuf,sidtime)
 
-         if self.setimode == True:
+         else:
              self.seti_analysis(self.fft_outbuf,sidtime)
+             now = time.time()
+             if ((self.scanning == True) and ((now - self.seti_then) > self.setifreq_timer)):
+                 self.seti_then = now
+                 self.setifreq_current = self.setifreq_current + self.fft_input_rate
+                 if (self.setifreq_current > self.setifreq_upper):
+                     self.setifreq_current = self.setifreq_lower
+                 self.set_freq(self.setifreq_current)
+                 # Make sure we zero-out the hits array when changing
+                 #   frequency.
+                 self.hits_array[:,:] = 0.0
+                 self.hit_intensities[:,:] = 0.0
 
     def fft_outfunc(self,data,l):
         self.fft_outbuf=data
@@ -572,11 +756,18 @@ class app_flow_graph(stdgui.gui_flow_graph):
         # If time to write full header info (saves storage this way)
         #
         if (now - self.continuum_then > 20):
+            self.sun.compute(self.locality)
+            enow = ephem.now()
+            sun_insky = "Down"
+            self.sunstate = "Dn"
+            if ((self.sun.rise_time < enow) and (enow < self.sun.set_time)):
+               sun_insky = "Up"
+               self.sunstate = "Up"
             self.continuum_then = now
         
             continuum_file.write(str(ephem.hours(sidtime))+" "+flt+" Dn="+str(inter)+",")
             continuum_file.write("Ti="+str(integ)+",Fc="+str(fc)+",Bw="+str(bw))
-            continuum_file.write(",Ga="+str(ga)+"\n")
+            continuum_file.write(",Ga="+str(ga)+",Sun="+str(sun_insky)+"\n")
         else:
             continuum_file.write(str(ephem.hours(sidtime))+" "+flt+"\n")
     
@@ -618,7 +809,11 @@ class app_flow_graph(stdgui.gui_flow_graph):
 
             # Write those fields
             spectral_file.write("data:"+str(ephem.hours(sidtime))+" Dn="+str(inter)+",Fc="+str(fc)+",Bw="+str(bw)+",Av="+str(av))
-            spectral_file.write(" "+str(r)+"\n")
+            spectral_file.write (" [ ")
+            for r in data:
+                spectral_file.write(" "+str(r))
+
+            spectral_file.write(" ]\n")
             spectral_file.close()
             return(data)
     
@@ -628,6 +823,7 @@ class app_flow_graph(stdgui.gui_flow_graph):
         l = len(fftbuf)
         x = 0
         hits = []
+        hit_intensities = []
         if self.seticounter < self.setitimer:
             self.seticounter = self.seticounter + 1
             return
@@ -653,10 +849,10 @@ class app_flow_graph(stdgui.gui_flow_graph):
         # Snarfle through the FFT output buffer again, looking for
         #    outlying data points
 
-        start_f = self.observing - (self.bw/2)
+        start_f = self.observing - (self.fft_input_rate/2)
         current_f = start_f
-        f_incr = self.bw / l
         l = len(fftbuf)
+        f_incr = self.fft_input_rate / l
         hit = -1
 
         # -nyquist to DC
@@ -667,6 +863,7 @@ class app_flow_graph(stdgui.gui_flow_graph):
             #
             if ((fftbuf[i] - avg) > (self.setik * sigma)):
                 hits.append(current_f)
+                hit_intensities.append(fftbuf[i])
             current_f = current_f + f_incr
 
         # DC to nyquist
@@ -677,59 +874,102 @@ class app_flow_graph(stdgui.gui_flow_graph):
             #
             if ((fftbuf[i] - avg) > (self.setik * sigma)):
                 hits.append(current_f)
+                hit_intensities.append(fftbuf[i])
             current_f = current_f + f_incr
 
+        # No hits
         if (len(hits) <= 0):
             return
 
-        if (len(hits) > len(self.old_hits)*2):
-            return
 
         #
+        # OK, so we have some hits in the FFT buffer
+        #   They'll have a rather substantial gauntlet to run before
+        #   being declared a real "hit"
         #
-        # Calculate chirp limits from first principles
-        #
-        #
-        earth_diam = 12500
-        earth_circ = earth_diam * 3.14159
-        surface_speed = earth_circ / 24
-        surface_speed = surface_speed / 3600
 
-        c1 = (surface_speed/2) / 299792.0
-        c2 = (surface_speed*5) / 299792.0
+        # Update stats
+        self.s1hitcounter = self.s1hitcounter + len(hits)
+
+        # Weed out buffers with an excessive number of
+        #   signals above Sigma
+        if (len(hits) > self.nhits):
+            return
 
-        self.CHIRP_LOWER = (c1 * self.observing) * self.setitimer
-        self.CHIRP_UPPER = (c2 * self.observing) * self.setitimer
 
+        # Weed out FFT buffers with apparent multiple narrowband signals
+        #   separated significantly in frequency.  This means that a
+        #   single signal spanning multiple bins is OK, but a buffer that
+        #   has multiple, apparently-separate, signals isn't OK.
         #
-        # Run through all three hit buffers, computing difference between
+        last = hits[0]
+        ns2 = 1
+        for i in range(1,len(hits)):
+            if ((hits[i] - last) > (f_incr*3.0)):
+                return
+            last = hits[i]
+            ns2 = ns2 + 1
+
+        self.s2hitcounter = self.s2hitcounter + ns2
+
+        #
+        # Run through all available hit buffers, computing difference between
         #   frequencies found there, if they're all within the chirp limits
         #   declare a good hit
         #
-        good_hit = 0
-        for i in range(0,min(len(hits),len(self.old_hits))):
-            f_diff = abs(self.old_hits[i] - hits[i])
-            f_diff2 = abs(self.older_hits[i] - self.old_hits[i])
-            # If frequency difference is within range, we have a hit
-            if (f_diff >= self.CHIRP_LOWER and f_diff <= self.CHIRP_UPPER):
-                if (f_diff2 >= self.CHIRP_LOWER and f_diff <= self.CHIRP_UPPER):
-                    good_hit = 1
-                    self.hitcounter = self.hitcounter + 1
-                    break
-
-        if (good_hit != 0):
-            self.write_hits(hits,sidtime)
-
-        # Save old hits
-        for i in range(0,len(self.older_hits)):
-            self.older_hits[i] = self.old_hits[i]
-            self.old_hits[i] = 0
-        for i in range(0,min(len(hits),len(self.old_hits))):
-            self.old_hits[i] = hits[i]
+        good_hit = False
+        f_ds = Numeric.zeros(self.nhitlines, Numeric.Float64)
+        avg_delta = 0
+        k = 0
+        for i in range(0,min(len(hits),len(self.hits_array[:,0]))):
+            f_ds[0] = abs(self.hits_array[i,0] - hits[i])
+            for j in range(1,len(f_ds)):
+               f_ds[j] = abs(self.hits_array[i,j] - self.hits_array[i,0])
+               avg_delta = avg_delta + f_ds[j]
+               k = k + 1
+
+            if (self.seti_isahit (f_ds)):
+                good_hit = True
+                self.hitcounter = self.hitcounter + 1
+                break
+
+        if (avg_delta/k < (self.seti_fft_bandwidth/2)):
+            self.avgdelta = avg_delta / k
+
+        # Save 'n shuffle hits
+        #  Old hit buffers percolate through the hit buffers
+        #  (there are self.nhitlines of these buffers)
+        #  and then drop off the end
+        #  A consequence is that while the nhitlines buffers are filling,
+        #  you can get some absurd values for self.avgdelta, because some
+        #  of the buffers are full of zeros
+        for i in range(self.nhitlines,1):
+            self.hits_array[:,i] = self.hits_array[:,i-1]
+            self.hit_intensities[:,i] = self.hit_intensities[:,i-1]
+
+        for i in range(0,len(hits)):
+            self.hits_array[i,0] = hits[i]
+            self.hit_intensities[i,0] = hit_intensities[i]
+
+        # Finally, write the hits/intensities buffer
+        if (good_hit):
+            self.write_hits(sidtime)
 
         return
 
-    def write_hits(self,hits,sidtime):
+    def seti_isahit(self,fdiffs):
+        truecount = 0
+
+        for i in range(0,len(fdiffs)):
+            if (fdiffs[i] >= self.CHIRP_LOWER and fdiffs[i] <= self.CHIRP_UPPER):
+                truecount = truecount + 1
+
+        if truecount == len(fdiffs):
+            return (True)
+        else:
+            return (False)
+
+    def write_hits(self,sidtime):
         # Create localtime structure for producing filename
         foo = time.localtime()
         pfx = self.prefix
@@ -738,11 +978,27 @@ class app_flow_graph(stdgui.gui_flow_graph):
     
         # Open the data file, appending
         hits_file = open (filenamestr+".seti","a")
-        hits_file.write(str(ephem.hours(sidtime))+" "+str(hits)+"\n")
+
+        # Write sidtime first
+        hits_file.write(str(ephem.hours(sidtime))+" "+str(self.decln)+" ")
+
+        #
+        # Then write the hits/hit intensities buffers with enough
+        #   "syntax" to allow parsing by external (not yet written!)
+        #   "stuff".
+        #
+        for i in range(0,self.nhitlines):
+            hits_file.write(" ")
+            for j in range(0,self.nhits):
+                hits_file.write(str(self.hits_array[j,i])+":")
+                hits_file.write(str(self.hit_intensities[j,i])+",")
+        hits_file.write("\n")
         hits_file.close()
         return
 
     def xydfunc(self,xyv):
+        if self.setimode == True:
+            return
         magn = int(Numeric.log10(self.observing))
         if (magn == 6 or magn == 7 or magn == 8):
             magn = 6
@@ -760,6 +1016,13 @@ class app_flow_graph(stdgui.gui_flow_graph):
         s2 = "\n%.3fkm/s" % vs
         self.myform['spec_data'].set_value(s+s2)
 
+    def xydfunc_waterfall(self,pos):
+        lower = self.observing - (self.seti_fft_bandwidth / 2)
+        upper = self.observing + (self.seti_fft_bandwidth / 2)
+        binwidth = self.seti_fft_bandwidth / 1024
+        s = "%.6fMHz" % ((lower + (pos.x*binwidth)) / 1.0e6)
+        self.myform['spec_data'].set_value(s)
+
     def toggle_cal(self):
         if (self.calstate == True):
           self.calstate = False
@@ -777,10 +1040,64 @@ class app_flow_graph(stdgui.gui_flow_graph):
         else:
           self.annotate_state = True
           self.annotation.SetLabel("Annotation: On")
-        
+    #
+    # Turn scanning on/off
+    # Called-back by "Recording" button
+    #
+    def toggle_scanning(self):
+        # Current scanning?  Flip state
+        if (self.scanning == True):
+          self.scanning = False
+          self.scan_control.SetLabel("Scan: Off")
+        # Not scanning
+        else:
+          self.scanning = True
+          self.scan_control.SetLabel("Scan: On ")
+
+    def set_pd_offset(self,offs):
+         self.myform['offset'].set_value(offs)
+         self.calib_offset=offs
+         x = self.calib_coeff / 100.0
+         self.cal_offs.set_k(offs*(x*8000))
+
+    def set_pd_gain(self,gain):
+         self.myform['dcgain'].set_value(gain)
+         self.cal_mult.set_k(gain*0.01)
+         self.calib_coeff = gain
+         x = gain/100.0
+         self.cal_offs.set_k(self.calib_offset*(x*8000))
+
+    def compute_notch_taps(self,notchlist):
+         NOTCH_TAPS = 256
+         tmptaps = Numeric.zeros(NOTCH_TAPS,Numeric.Complex64)
+         binwidth = self.bw / NOTCH_TAPS
+         for i in range(0,NOTCH_TAPS):
+             tmptaps[i] = complex(1.0,0.0)
+         for i in notchlist:
+             diff = i - self.observing
+             if i == 0:
+                 break
+             if (diff > 0):
+                 idx = diff / binwidth
+                 idx = int(idx)
+                 if (idx < 0 or idx > (NOTCH_TAPS/2)):
+                     break
+                 tmptaps[idx] = complex(0.0, 0.0)
+
+             if (diff < 0):
+                 idx = -diff / binwidth
+                 idx = (NOTCH_TAPS/2) - idx
+                 idx = int(idx+(NOTCH_TAPS/2))
+                 if (idx < 0 or idx > (NOTCH_TAPS)):
+                     break
+                 tmptaps[idx] = complex(0.0, 0.0)
+
+         self.notch_taps = numpy.fft.ifft(tmptaps)
 
 def main ():
-    app = stdgui.stdapp(app_flow_graph, "RADIO ASTRONOMY SPECTRAL/CONTINUUM RECEIVER: $Revision$", nstatus=1)
+    app = stdgui2.stdapp(app_flow_graph, "RADIO ASTRONOMY SPECTRAL/CONTINUUM RECEIVER: $Revision$", nstatus=1)
     app.MainLoop()
 
 if __name__ == '__main__':