[Commit-gnuradio] r10180 - gnuradio/trunk/gr-radio-astronomy/src/python

[mleech]

Author: mleech
Date: 2008-12-29 21:58:11 -0700 (Mon, 29 Dec 2008)
New Revision: 10180

Modified:
   gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py
Log:
Fixed handling of out-of-range NOTCH specifications



Modified: gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py    
2008-12-30 04:35:08 UTC (rev 10179)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py    
2008-12-30 04:58:11 UTC (rev 10180)
@@ -362,13 +362,13 @@
                #
                
                if (self.dual_mode == True):
-                       self.setup_dual (self.setimode,self.use_notches)
+                       self.setup_dual (self.setimode)
                        
                if (self.interferometer == True):
-                       
self.setup_interferometer(self.setimode,self.use_notches)
+                       self.setup_interferometer(self.setimode)
                                
                if (self.normal_mode == True):
-                       self.setup_normal(self.setimode,self.use_notches)
+                       self.setup_normal(self.setimode)
                        
                if (self.setimode == True):
                        self.setup_seti()
@@ -1127,6 +1127,8 @@
                         diff = i - self.observing
                         if int(i) == 0:
                                 break
+                        if (i < (self.observing - self.bw/2) or i > 
(self.observing + self.bw/2)):
+                                continue
                         if (diff > 0):
                                 idx = diff / binwidth
                                 idx = round(idx)
@@ -1241,7 +1243,7 @@
        #
        # Setup dual-channel (two antenna, usual orthogonal polarity probes in 
the same waveguide)
        #
-       def setup_dual(self, setimode,notches):
+       def setup_dual(self, setimode):
                
                self.setup_radiometer_common(2)