From 0b47f2b4bc48583f997ac212958b7a87d0f46633 Mon Sep 17 00:00:00 2001 From: cswiger Date: Wed, 14 May 2008 13:50:43 +0000 Subject: [PATCH] Cleanup mistakes, print pids git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8424 221aa14e-8319-0410-a670-987f0aec2ac5 --- gr-atsc/src/python/btl-fsd.py | 11 +++++------ gr-atsc/src/python/fpll.py | 4 +++- gr-atsc/src/python/interp_short.py | 13 ++++++------- gr-atsc/src/python/viterbi-out.py | 4 +++- gr-atsc/src/python/xlate.py | 2 ++ 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/gr-atsc/src/python/btl-fsd.py b/gr-atsc/src/python/btl-fsd.py index 6de1007d..37f3f980 100755 --- a/gr-atsc/src/python/btl-fsd.py +++ b/gr-atsc/src/python/btl-fsd.py @@ -22,6 +22,9 @@ from gnuradio import gr from gnuradio import atsc +import os + +print os.getpid() tb = gr.top_block() @@ -35,12 +38,8 @@ out_data = gr.file_sink(atsc.sizeof_atsc_soft_data_segment,"/tmp/atsc_pipe_5") 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() diff --git a/gr-atsc/src/python/fpll.py b/gr-atsc/src/python/fpll.py index 672fba83..24bc7277 100755 --- a/gr-atsc/src/python/fpll.py +++ b/gr-atsc/src/python/fpll.py @@ -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") diff --git a/gr-atsc/src/python/interp_short.py b/gr-atsc/src/python/interp_short.py index d6b2ca12..11b169b2 100755 --- a/gr-atsc/src/python/interp_short.py +++ b/gr-atsc/src/python/interp_short.py @@ -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 @@ def graph (args): 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 @@ def graph (args): 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') diff --git a/gr-atsc/src/python/viterbi-out.py b/gr-atsc/src/python/viterbi-out.py index 283ed1b2..eedbaa5d 100755 --- a/gr-atsc/src/python/viterbi-out.py +++ b/gr-atsc/src/python/viterbi-out.py @@ -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] diff --git a/gr-atsc/src/python/xlate.py b/gr-atsc/src/python/xlate.py index e1c8685a..e37af9a2 100755 --- a/gr-atsc/src/python/xlate.py +++ b/gr-atsc/src/python/xlate.py @@ -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 () -- 2.30.2