[Commit-gnuradio] r8424 - gnuradio/trunk/gr-atsc/src/python

[cswiger]

Author: cswiger
Date: 2008-05-14 07:50:43 -0600 (Wed, 14 May 2008)
New Revision: 8424

Modified:
   gnuradio/trunk/gr-atsc/src/python/btl-fsd.py
   gnuradio/trunk/gr-atsc/src/python/fpll.py
   gnuradio/trunk/gr-atsc/src/python/interp_short.py
   gnuradio/trunk/gr-atsc/src/python/viterbi-out.py
   gnuradio/trunk/gr-atsc/src/python/xlate.py
Log:
Cleanup mistakes, print pids


Modified: gnuradio/trunk/gr-atsc/src/python/btl-fsd.py
===================================================================
--- gnuradio/trunk/gr-atsc/src/python/btl-fsd.py        2008-05-14 02:48:28 UTC 
(rev 8423)
+++ gnuradio/trunk/gr-atsc/src/python/btl-fsd.py        2008-05-14 13:50:43 UTC 
(rev 8424)
@@ -22,7 +22,10 @@
 
 from gnuradio import gr
 from gnuradio import atsc
+import os
 
+print os.getpid()
+
 tb = gr.top_block()
 
 btl = atsc.bit_timing_loop()
@@ -35,12 +38,8 @@
 inp = gr.file_source(gr.sizeof_float,"/tmp/atsc_pipe_3")
 
 tb.connect(inp,btl)
-tb.connect((btl,0),(fsc,0))
-tb.connect((btl,1),(fsc,1))
-tb.connect((fsc,0),(eq,0))
-tb.connect((fsc,1),(eq,1))
-tb.connect((eq,0),(fsd,0))
-tb.connect((eq,1),(fsd,1))
+tb.connect((btl,0),(fsc,0),(eq,0),(fsd,0))
+tb.connect((btl,1),(fsc,1),(eq,1),(fsd,1))
 tb.connect(fsd,out_data)
 
 tb.run()

Modified: gnuradio/trunk/gr-atsc/src/python/fpll.py
===================================================================
--- gnuradio/trunk/gr-atsc/src/python/fpll.py   2008-05-14 02:48:28 UTC (rev 
8423)
+++ gnuradio/trunk/gr-atsc/src/python/fpll.py   2008-05-14 13:50:43 UTC (rev 
8424)
@@ -21,10 +21,12 @@
 # 
 
 from gnuradio import gr, atsc
-import math
+import math, os
 
 def main():
 
+       print os.getpid()
+
        tb = gr.top_block()
 
         u = gr.file_source(gr.sizeof_float,"/tmp/atsc_pipe_2")

Modified: gnuradio/trunk/gr-atsc/src/python/interp_short.py
===================================================================
--- gnuradio/trunk/gr-atsc/src/python/interp_short.py   2008-05-14 02:48:28 UTC 
(rev 8423)
+++ gnuradio/trunk/gr-atsc/src/python/interp_short.py   2008-05-14 13:50:43 UTC 
(rev 8424)
@@ -34,10 +34,12 @@
 # then at 0 with edges at -3.2MHz and 3.2MHz.
 
 from gnuradio import gr
-import sys
+import sys, os
 
 def graph (args):
 
+    print os.getpid()
+
     nargs = len (args)
     if nargs == 1:
        infile = args[0]
@@ -45,7 +47,7 @@
        sys.stderr.write('usage: interp.py input_file\n')
        sys.exit (1)
 
-    tb = tb.top_block ()
+    tb = gr.top_block ()
 
     srcf = gr.file_source (gr.sizeof_short,infile)
     s2ss = gr.stream_to_streams(gr.sizeof_short,2)
@@ -60,12 +62,9 @@
     file = gr.file_sink(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
 
     tb.connect( srcf, s2ss )
-    tb.connect( (s2ss, 0), s2f1)
-    tb.connect( (s2ss, 1), s2f2)
-    tb.connect( s2f1, (src0,0) )
-    tb.connect( s2f2, (src0,1) )
+    tb.connect( (s2ss, 0), s2f1, (src0,0) )
+    tb.connect( (s2ss, 1), s2f2, (src0,1) )
     tb.connect( src0, lp, file)
-    tb.connect( interlv, lp, file )
 
     tb.start()
     raw_input ('Head End: Press Enter to stop')

Modified: gnuradio/trunk/gr-atsc/src/python/viterbi-out.py
===================================================================
--- gnuradio/trunk/gr-atsc/src/python/viterbi-out.py    2008-05-14 02:48:28 UTC 
(rev 8423)
+++ gnuradio/trunk/gr-atsc/src/python/viterbi-out.py    2008-05-14 13:50:43 UTC 
(rev 8424)
@@ -21,10 +21,12 @@
 # 
 
 from gnuradio import gr, atsc
-import sys
+import sys, os
 
 def main(args):
 
+       print os.getpid()
+
        nargs = len (args)
        if nargs == 1:
           outfile = args[0]

Modified: gnuradio/trunk/gr-atsc/src/python/xlate.py
===================================================================
--- gnuradio/trunk/gr-atsc/src/python/xlate.py  2008-05-14 02:48:28 UTC (rev 
8423)
+++ gnuradio/trunk/gr-atsc/src/python/xlate.py  2008-05-14 13:50:43 UTC (rev 
8424)
@@ -32,8 +32,10 @@
 # Input complex -3.2 to 3.2Mhz, output float 2.55 to 8.95Mhz.
 
 from gnuradio import gr
+import os
 
 def graph ():
+    print os.getpid()
     sampling_freq = 19200000
 
     tb = gr.top_block ()