[Commit-gnuradio] r4201 - gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2

[trondeau]

Author: trondeau
Date: 2006-12-26 20:59:24 -0700 (Tue, 26 Dec 2006)
New Revision: 4201

Modified:
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
Log:
fixed logging capabilities

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
     2006-12-27 03:58:10 UTC (rev 4200)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
     2006-12-27 03:59:24 UTC (rev 4201)
@@ -168,16 +168,17 @@
 
     def _setup_logging(self):
         print "Modulation logging turned on."
-        self.connect("bytes2chunks", 0,
-                         gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"), 
0)
-        self.connect("symbol_mapper", 0,
-                         gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"), 0)
-        self.connect("diffenc", 0,
-                         gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"), 0)
-        self.connect("chunks2symbols", 0,
-                         gr.file_sink(gr.sizeof_gr_complex, 
"tx_chunks2symbols.dat"), 0)
-        self.connect("rrc_filter", 0,
-                         gr.file_sink(gr.sizeof_gr_complex, 
"tx_rrc_filter.dat"), 0)
+        self.define_component("bytes2chunks_dat", gr.file_sink(gr.sizeof_char, 
"tx_bytes2chunks.dat"))
+        self.define_component("symbol_mapper_dat", 
gr.file_sink(gr.sizeof_char, "tx_symbol_mapper.dat"))
+        self.define_component("diffenc_dat", gr.file_sink(gr.sizeof_char, 
"tx_diffenc.dat"))
+        self.define_component("chunks2symbols_dat", 
gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
+        self.define_component("rrc_filter_dat", 
gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
+
+        self.connect("bytes2chunks", 0, "bytes2chunks_dat", 0)
+        self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
+        self.connect("diffenc", 0, "diffenc_dat", 0)
+        self.connect("chunks2symbols", 0, "chunks2symbols_dat", 0)
+        self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
               
 
 # /////////////////////////////////////////////////////////////////////////////
@@ -294,12 +295,6 @@
         # unpack the k bit vector into a stream of bits
         self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
 
-        if verbose:
-            self._print_verbage()
-
-        if log:
-            self._setup_logging()
-
         # Define components
         self.define_component("pre_scaler", self.pre_scaler)
         self.define_component("agc", self.agc)
@@ -328,6 +323,12 @@
         self.connect("symbol_mapper", 0, "unpack", 0)
         self.connect("unpack", 0, "self", 0)
 
+        if verbose:
+            self._print_verbage()
+
+        if log:
+            self._setup_logging()
+
     def samples_per_symbol(self):
         return self._samples_per_symbol
 
@@ -349,29 +350,43 @@
 
     def _setup_logging(self):
         print "Demodulation logging turned on."
-        self.connect("pre_scaler", 0,
-                     gr.file_sink(gr.sizeof_gr_complex, "prescaler.dat"))
-        self.connect("agc", 0,
-                     gr.file_sink(gr.sizeof_gr_complex, "agc.dat"))
+        self.define_component("prescaler_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_prescaler.dat"))
+        self.define_component("agc_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
+        self.define_component("rrc_filter_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_rrc_filter.dat"))
+        self.define_component("clock_recovery_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_clock_recovery.dat"))
+        self.define_component("clock_recovery_error_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_clock_recovery_error.dat"))
+        self.define_component("diffdec_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_diffdec.dat"))
+        self.define_component("slicer_dat",
+                              gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
+        self.define_component("symbol_mapper_dat",
+                              gr.file_sink(gr.sizeof_char, 
"rx_symbol_mapper.dat"))
+        self.define_component("unpack_dat",
+                              gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
+
+        self.connect("pre_scaler", 0, "prescaler_dat", 0)
+        self.connect("agc", 0, "agc_dat", 0)
         if self._costas_alpha is not None:
-            self.connect("costas_loop", 0,
-                         gr.file_sink(gr.sizeof_gr_complex, "costas_loop.dat"))
-            self.connect("costas_loop", 1,
-                         gr.file_sink(gr.sizeof_gr_complex, 
"costas_error.dat"))
-        self.connect("rrc_filter", 0,
-                     gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat"))
-        self.connect("clock_recovery", 0,
-                     gr.file_sink(gr.sizeof_gr_complex, "clock_recovery.dat"))
-        self.connect("clock_recovery", 1,
-                     gr.file_sink(gr.sizeof_gr_complex, 
"clock_recovery_error.dat"))
-        self.connect("diffdec", 0,
-                     gr.file_sink(gr.sizeof_gr_complex, "diffdec.dat"))        
-        self.connect("slicer", 0,
-                     gr.file_sink(gr.sizeof_char, "slicer.dat"))
-        self.connect("symbol_mapper", 0,
-                     gr.file_sink(gr.sizeof_char, "symbol_mapper.dat"))
-        self.connect("unpack", 0,
-                     gr.file_sink(gr.sizeof_char, "unpack.dat"))
+            self.define_component("costas_loop_dat",
+                                  gr.file_sink(gr.sizeof_gr_complex, 
"costas_loop.dat"))
+            self.define_component("costas_loop_error_dat",
+                                  gr.file_sink(gr.sizeof_gr_complex, 
"costas_loop_error.dat"))
+
+            self.connect("costas_loop", 0, "costas_loop_dat", 0)
+            self.connect("costas_loop", 1, "costas_loop_error_dat", 0)
+
+        self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
+        self.connect("clock_recovery", 0, "clock_recovery_dat", 0)
+        self.connect("clock_recovery", 1, "clock_recovery_error_dat", 0)
+        self.connect("diffdec", 0, "diffdec_dat", 0)
+        self.connect("slicer", 0, "slicer_dat", 0)
+        self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
+        self.connect("unpack", 0, "unpack_dat", 0)
         
     def add_options(parser):
         """