From f86c6e0462f8208106d41e4be02b59c66ce50e5a Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Tue, 6 Nov 2012 18:36:47 -0500
Subject: analog: removing gr-analog as a required dependency when not actually
 necessary.

Examples that use gr-analog test for it first.
---
 gr-trellis/src/examples/python/test_cpm.py                   | 7 ++++++-
 gr-trellis/src/examples/python/test_pccc_turbo1.py           | 6 +++++-
 gr-trellis/src/examples/python/test_sccc_hard.py             | 7 ++++++-
 gr-trellis/src/examples/python/test_sccc_soft.py             | 8 +++++---
 gr-trellis/src/examples/python/test_sccc_turbo.py            | 7 +++++--
 gr-trellis/src/examples/python/test_sccc_turbo1.py           | 6 +++++-
 gr-trellis/src/examples/python/test_sccc_turbo2.py           | 6 +++++-
 gr-trellis/src/examples/python/test_tcm.py                   | 7 ++++++-
 gr-trellis/src/examples/python/test_tcm_bit.py               | 6 +++++-
 gr-trellis/src/examples/python/test_tcm_combined.py          | 6 +++++-
 gr-trellis/src/examples/python/test_tcm_parallel.py          | 6 +++++-
 gr-trellis/src/examples/python/test_turbo_equalization.py    | 6 +++++-
 gr-trellis/src/examples/python/test_turbo_equalization1.py   | 7 ++++++-
 gr-trellis/src/examples/python/test_turbo_equalization2.py   | 7 ++++++-
 gr-trellis/src/examples/python/test_viterbi_equalization.py  | 7 ++++++-
 gr-trellis/src/examples/python/test_viterbi_equalization1.py | 7 ++++++-
 16 files changed, 87 insertions(+), 19 deletions(-)

(limited to 'gr-trellis/src/examples/python')

diff --git a/gr-trellis/src/examples/python/test_cpm.py b/gr-trellis/src/examples/python/test_cpm.py
index ce55f52682..6b9b9a4f52 100755
--- a/gr-trellis/src/examples/python/test_cpm.py
+++ b/gr-trellis/src/examples/python/test_cpm.py
@@ -9,13 +9,18 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital, filter
-from gnuradio import analog
 from grc_gnuradio import blks2 as grc_blks2
 import math
 import numpy
 import fsm_utils
 from gnuradio import trellis
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 try:
 	import scipy.stats
 except ImportError:
diff --git a/gr-trellis/src/examples/python/test_pccc_turbo1.py b/gr-trellis/src/examples/python/test_pccc_turbo1.py
index 1ddd01876f..bbcce106fb 100755
--- a/gr-trellis/src/examples/python/test_pccc_turbo1.py
+++ b/gr-trellis/src/examples/python/test_pccc_turbo1.py
@@ -2,13 +2,17 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
 import random
 import fsm_utils
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
 
 def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,Es,N0,IT,seed):
     tb = gr.top_block ()
diff --git a/gr-trellis/src/examples/python/test_sccc_hard.py b/gr-trellis/src/examples/python/test_sccc_hard.py
index f55485550b..b75a07b8b0 100755
--- a/gr-trellis/src/examples/python/test_sccc_hard.py
+++ b/gr-trellis/src/examples/python/test_sccc_hard.py
@@ -2,13 +2,18 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
 import random
 import fsm_utils
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
     tb = gr.top_block ()
 
diff --git a/gr-trellis/src/examples/python/test_sccc_soft.py b/gr-trellis/src/examples/python/test_sccc_soft.py
index 72a7098b37..0b10c07bbc 100755
--- a/gr-trellis/src/examples/python/test_sccc_soft.py
+++ b/gr-trellis/src/examples/python/test_sccc_soft.py
@@ -2,15 +2,17 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
 import random
 import fsm_utils
 
-
-
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
 
 def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
     tb = gr.top_block ()
diff --git a/gr-trellis/src/examples/python/test_sccc_turbo.py b/gr-trellis/src/examples/python/test_sccc_turbo.py
index 90155860bc..979dfeca59 100755
--- a/gr-trellis/src/examples/python/test_sccc_turbo.py
+++ b/gr-trellis/src/examples/python/test_sccc_turbo.py
@@ -2,14 +2,17 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
 import random
 import fsm_utils
 
-
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
 
 def make_rx(tb,fo,fi,dimensionality,constellation,K,interleaver,IT,Es,N0,type):
     metrics_in = trellis.metrics_f(fi.O(),dimensionality,constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for innner Viterbi
diff --git a/gr-trellis/src/examples/python/test_sccc_turbo1.py b/gr-trellis/src/examples/python/test_sccc_turbo1.py
index cae853b9bf..60188e4d3b 100755
--- a/gr-trellis/src/examples/python/test_sccc_turbo1.py
+++ b/gr-trellis/src/examples/python/test_sccc_turbo1.py
@@ -2,13 +2,17 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
 import random
 import fsm_utils
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
 
 def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,Es,N0,IT,seed):
     tb = gr.top_block ()
diff --git a/gr-trellis/src/examples/python/test_sccc_turbo2.py b/gr-trellis/src/examples/python/test_sccc_turbo2.py
index c9303f788b..e9f4841e3e 100755
--- a/gr-trellis/src/examples/python/test_sccc_turbo2.py
+++ b/gr-trellis/src/examples/python/test_sccc_turbo2.py
@@ -2,13 +2,17 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
 import random
 import fsm_utils
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
 
 def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,Es,N0,IT,seed):
     tb = gr.top_block ()
diff --git a/gr-trellis/src/examples/python/test_tcm.py b/gr-trellis/src/examples/python/test_tcm.py
index 0d1c657beb..fced315260 100755
--- a/gr-trellis/src/examples/python/test_tcm.py
+++ b/gr-trellis/src/examples/python/test_tcm.py
@@ -2,7 +2,6 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
@@ -11,6 +10,12 @@ import fsm_utils
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
     tb = gr.top_block ()
 
diff --git a/gr-trellis/src/examples/python/test_tcm_bit.py b/gr-trellis/src/examples/python/test_tcm_bit.py
index 7147902380..873d58684b 100755
--- a/gr-trellis/src/examples/python/test_tcm_bit.py
+++ b/gr-trellis/src/examples/python/test_tcm_bit.py
@@ -2,7 +2,6 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
@@ -11,6 +10,11 @@ import fsm_utils
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
 
 def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
     tb = gr.top_block ()
diff --git a/gr-trellis/src/examples/python/test_tcm_combined.py b/gr-trellis/src/examples/python/test_tcm_combined.py
index 6630f0c11b..8bea1ac86a 100755
--- a/gr-trellis/src/examples/python/test_tcm_combined.py
+++ b/gr-trellis/src/examples/python/test_tcm_combined.py
@@ -2,7 +2,6 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
@@ -10,6 +9,11 @@ import fsm_utils
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
 
 def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
     tb = gr.top_block ()
diff --git a/gr-trellis/src/examples/python/test_tcm_parallel.py b/gr-trellis/src/examples/python/test_tcm_parallel.py
index 7e42cff51b..1767cc730f 100755
--- a/gr-trellis/src/examples/python/test_tcm_parallel.py
+++ b/gr-trellis/src/examples/python/test_tcm_parallel.py
@@ -2,7 +2,6 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
@@ -10,6 +9,11 @@ import fsm_utils
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
 
 def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed,P):
     tb = gr.top_block ()
diff --git a/gr-trellis/src/examples/python/test_turbo_equalization.py b/gr-trellis/src/examples/python/test_turbo_equalization.py
index 854344c30a..baddd7cb50 100755
--- a/gr-trellis/src/examples/python/test_turbo_equalization.py
+++ b/gr-trellis/src/examples/python/test_turbo_equalization.py
@@ -2,12 +2,16 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
 import fsm_utils
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
 
 def make_rx(tb,fo,fi,dimensionality,tot_constellation,K,interleaver,IT,Es,N0,type):
     metrics_in = trellis.metrics_f(fi.O(),dimensionality,tot_constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for innner SISO
diff --git a/gr-trellis/src/examples/python/test_turbo_equalization1.py b/gr-trellis/src/examples/python/test_turbo_equalization1.py
index cbca2c8410..dfe1a2d82e 100755
--- a/gr-trellis/src/examples/python/test_turbo_equalization1.py
+++ b/gr-trellis/src/examples/python/test_turbo_equalization1.py
@@ -2,13 +2,18 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital, filter
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
 import random
 import fsm_utils
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 def make_rx(tb,fo,fi,dimensionality,tot_constellation,K,interleaver,IT,Es,N0,type):
     metrics_in = trellis.metrics_f(fi.O(),dimensionality,tot_constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for innner SISO
     scale = gr.multiply_const_ff(1.0/N0)
diff --git a/gr-trellis/src/examples/python/test_turbo_equalization2.py b/gr-trellis/src/examples/python/test_turbo_equalization2.py
index 52f33da498..fb0a899eba 100755
--- a/gr-trellis/src/examples/python/test_turbo_equalization2.py
+++ b/gr-trellis/src/examples/python/test_turbo_equalization2.py
@@ -2,13 +2,18 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital, filter
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
 import random
 import fsm_utils
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 def make_rx(tb,fo,fi,dimensionality,tot_constellation,K,interleaver,IT,Es,N0,type):
     scale = gr.multiply_const_ff(math.sqrt(1.0/N0))
     gnd = gr.vector_source_f([0],True);
diff --git a/gr-trellis/src/examples/python/test_viterbi_equalization.py b/gr-trellis/src/examples/python/test_viterbi_equalization.py
index c80f36a54b..91dc7e36da 100755
--- a/gr-trellis/src/examples/python/test_viterbi_equalization.py
+++ b/gr-trellis/src/examples/python/test_viterbi_equalization.py
@@ -2,12 +2,17 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
 import fsm_utils
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 def run_test (f,Kb,bitspersymbol,K,dimensionality,tot_constellation,N0,seed):
     tb = gr.top_block ()
 
diff --git a/gr-trellis/src/examples/python/test_viterbi_equalization1.py b/gr-trellis/src/examples/python/test_viterbi_equalization1.py
index 16c130a78c..4421e370a4 100755
--- a/gr-trellis/src/examples/python/test_viterbi_equalization1.py
+++ b/gr-trellis/src/examples/python/test_viterbi_equalization1.py
@@ -2,13 +2,18 @@
 
 from gnuradio import gr
 from gnuradio import trellis, digital, filter
-from gnuradio import analog
 from gnuradio import eng_notation
 import math
 import sys
 import random
 import fsm_utils
 
+try:
+    from gnuradio import analog
+except ImportError:
+    sys.stderr.write("Error: Program requires gr-analog.\n")
+    sys.exit(1)
+
 def run_test (f,Kb,bitspersymbol,K,channel,modulation,dimensionality,tot_constellation,N0,seed):
     tb = gr.top_block ()
     L = len(channel)
-- 
cgit v1.2.3