From 611f7e45e7a793f2489d76670a61493327838e3e Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Sat, 10 Nov 2012 15:43:21 -0500
Subject: analog: fixing up GRC and other examples to use gr-analog for sig and
 noise sources.

---
 .../src/examples/grc/interference_cancellation.grc | 1288 ++++++++++----------
 1 file changed, 662 insertions(+), 626 deletions(-)

(limited to 'gr-trellis/src/examples/grc/interference_cancellation.grc')

diff --git a/gr-trellis/src/examples/grc/interference_cancellation.grc b/gr-trellis/src/examples/grc/interference_cancellation.grc
index 7674b4bf16..129ee87905 100644
--- a/gr-trellis/src/examples/grc/interference_cancellation.grc
+++ b/gr-trellis/src/examples/grc/interference_cancellation.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Wed Aug 31 17:40:25 2011</timestamp>
+  <timestamp>Sat Nov 10 15:39:57 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -43,6 +43,10 @@
       <key>run</key>
       <value>True</value>
     </param>
+    <param>
+      <key>max_nouts</key>
+      <value>0</value>
+    </param>
     <param>
       <key>realtime_scheduling</key>
       <value></value>
@@ -228,37 +232,6 @@
       <value>0</value>
     </param>
   </block>
-  <block>
-    <key>gr_multiply_const_vxx</key>
-    <param>
-      <key>id</key>
-      <value>gr_multiply_const_vxx_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>const</key>
-      <value>alpha**0.5</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(988, 196)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
   <block>
     <key>random_source_x</key>
     <param>
@@ -299,69 +272,30 @@
     </param>
   </block>
   <block>
-    <key>gr_chunks_to_symbols_xx</key>
+    <key>gr_sub_xx</key>
     <param>
       <key>id</key>
-      <value>gr_chunks_to_symbols_xx_1</value>
+      <value>gr_sub_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>in_type</key>
+      <key>type</key>
       <value>short</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>symbol_table</key>
-      <value>1,1j,-1j,-1</value>
-    </param>
-    <param>
-      <key>dimension</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>num_ports</key>
+      <key>vlen</key>
       <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(660, 311)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_multiply_const_vxx</key>
-    <param>
-      <key>id</key>
-      <value>gr_multiply_const_vxx_1</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>const</key>
-      <value>(1-alpha)**0.5</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>num_inputs</key>
+      <value>2</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(994, 319)</value>
+      <value>(536, 529)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -369,10 +303,10 @@
     </param>
   </block>
   <block>
-    <key>gr_add_xx</key>
+    <key>gr_multiply_xx</key>
     <param>
       <key>id</key>
-      <value>gr_add_xx_0</value>
+      <value>gr_multiply_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -380,7 +314,7 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>short</value>
     </param>
     <param>
       <key>num_inputs</key>
@@ -392,7 +326,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1224, 244)</value>
+      <value>(771, 525)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -400,34 +334,26 @@
     </param>
   </block>
   <block>
-    <key>gr_noise_source_x</key>
+    <key>gr_short_to_float</key>
     <param>
       <key>id</key>
-      <value>gr_noise_source_x_0</value>
+      <value>gr_short_to_float_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>noise_type</key>
-      <value>gr.GR_GAUSSIAN</value>
-    </param>
-    <param>
-      <key>amp</key>
-      <value>noisevar</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>seed</key>
-      <value>42</value>
+      <key>scale</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1146, 369)</value>
+      <value>(994, 545)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -438,7 +364,7 @@
     <key>gr_sub_xx</key>
     <param>
       <key>id</key>
-      <value>gr_sub_xx_0</value>
+      <value>gr_sub_xx_3</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -458,7 +384,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(536, 529)</value>
+      <value>(535, 792)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -469,7 +395,7 @@
     <key>gr_multiply_xx</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_xx_0</value>
+      <value>gr_multiply_xx_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -489,7 +415,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(771, 525)</value>
+      <value>(785, 779)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -500,15 +426,23 @@
     <key>gr_short_to_float</key>
     <param>
       <key>id</key>
-      <value>gr_short_to_float_0</value>
+      <value>gr_short_to_float_2</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>scale</key>
+      <value>1</value>
+    </param>
     <param>
       <key>_coordinate</key>
-      <value>(994, 545)</value>
+      <value>(1005, 798)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -519,7 +453,7 @@
     <key>gr_sub_xx</key>
     <param>
       <key>id</key>
-      <value>gr_sub_xx_3</value>
+      <value>gr_sub_xx_2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -527,7 +461,7 @@
     </param>
     <param>
       <key>type</key>
-      <value>short</value>
+      <value>complex</value>
     </param>
     <param>
       <key>vlen</key>
@@ -539,7 +473,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(535, 792)</value>
+      <value>(944, 978)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -547,10 +481,10 @@
     </param>
   </block>
   <block>
-    <key>gr_multiply_xx</key>
+    <key>gr_sub_xx</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_xx_1</value>
+      <value>gr_sub_xx_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -560,36 +494,17 @@
       <key>type</key>
       <value>short</value>
     </param>
-    <param>
-      <key>num_inputs</key>
-      <value>2</value>
-    </param>
     <param>
       <key>vlen</key>
       <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(785, 779)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_short_to_float</key>
-    <param>
-      <key>id</key>
-      <value>gr_short_to_float_2</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>num_inputs</key>
+      <value>2</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1005, 798)</value>
+      <value>(540, 1141)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -597,38 +512,30 @@
     </param>
   </block>
   <block>
-    <key>gr_chunks_to_symbols_xx</key>
+    <key>gr_multiply_xx</key>
     <param>
       <key>id</key>
-      <value>gr_chunks_to_symbols_xx_2</value>
+      <value>gr_multiply_xx_2</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>in_type</key>
+      <key>type</key>
       <value>short</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>symbol_table</key>
-      <value>1,1j,-1j,-1</value>
-    </param>
-    <param>
-      <key>dimension</key>
-      <value>1</value>
+      <key>num_inputs</key>
+      <value>2</value>
     </param>
     <param>
-      <key>num_ports</key>
+      <key>vlen</key>
       <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(405, 998)</value>
+      <value>(796, 1136)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -636,30 +543,26 @@
     </param>
   </block>
   <block>
-    <key>gr_multiply_const_vxx</key>
+    <key>gr_short_to_float</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_const_vxx_2</value>
+      <value>gr_short_to_float_1</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>const</key>
-      <value>alpha**0.5</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>scale</key>
       <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(710, 1008)</value>
+      <value>(1009, 1156)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -670,7 +573,7 @@
     <key>gr_sub_xx</key>
     <param>
       <key>id</key>
-      <value>gr_sub_xx_2</value>
+      <value>gr_sub_xx_2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -690,7 +593,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(944, 978)</value>
+      <value>(975, 1342)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -701,7 +604,7 @@
     <key>gr_sub_xx</key>
     <param>
       <key>id</key>
-      <value>gr_sub_xx_1</value>
+      <value>gr_sub_xx_1_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -721,7 +624,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(540, 1141)</value>
+      <value>(559, 1536)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -732,7 +635,7 @@
     <key>gr_multiply_xx</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_xx_2</value>
+      <value>gr_multiply_xx_2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -752,7 +655,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(796, 1136)</value>
+      <value>(771, 1530)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -763,15 +666,23 @@
     <key>gr_short_to_float</key>
     <param>
       <key>id</key>
-      <value>gr_short_to_float_1</value>
+      <value>gr_short_to_float_1_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>scale</key>
+      <value>1</value>
+    </param>
     <param>
       <key>_coordinate</key>
-      <value>(1009, 1156)</value>
+      <value>(1010, 1551)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -779,38 +690,54 @@
     </param>
   </block>
   <block>
-    <key>gr_chunks_to_symbols_xx</key>
+    <key>trellis_viterbi_combined_xx</key>
     <param>
       <key>id</key>
-      <value>gr_chunks_to_symbols_xx_2_0</value>
+      <value>trellis_viterbi_combined_xx_1</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>in_type</key>
-      <value>short</value>
+      <key>type</key>
+      <value>c</value>
     </param>
     <param>
       <key>out_type</key>
-      <value>complex</value>
+      <value>s</value>
     </param>
     <param>
-      <key>symbol_table</key>
-      <value>1,1j,-1j,-1</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
     <param>
-      <key>dimension</key>
-      <value>1</value>
+      <key>block_size</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>num_ports</key>
+      <key>init_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>dim</key>
       <value>1</value>
     </param>
+    <param>
+      <key>table</key>
+      <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value>
+    </param>
+    <param>
+      <key>metric_type</key>
+      <value>digital.TRELLIS_EUCLIDEAN</value>
+    </param>
     <param>
       <key>_coordinate</key>
-      <value>(420, 1368)</value>
+      <value>(79, 501)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -818,10 +745,10 @@
     </param>
   </block>
   <block>
-    <key>gr_multiply_const_vxx</key>
+    <key>trellis_viterbi_combined_xx</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_const_vxx_2_0</value>
+      <value>trellis_viterbi_combined_xx_2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -829,19 +756,43 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>c</value>
     </param>
     <param>
-      <key>const</key>
-      <value>(1-alpha)**0.5</value>
+      <key>out_type</key>
+      <value>s</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+    </param>
+    <param>
+      <key>block_size</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>init_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>dim</key>
       <value>1</value>
     </param>
+    <param>
+      <key>table</key>
+      <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value>
+    </param>
+    <param>
+      <key>metric_type</key>
+      <value>digital.TRELLIS_EUCLIDEAN</value>
+    </param>
     <param>
       <key>_coordinate</key>
-      <value>(733, 1374)</value>
+      <value>(82, 766)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -849,10 +800,10 @@
     </param>
   </block>
   <block>
-    <key>gr_sub_xx</key>
+    <key>trellis_viterbi_combined_xx</key>
     <param>
       <key>id</key>
-      <value>gr_sub_xx_2_0</value>
+      <value>trellis_viterbi_combined_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -860,19 +811,43 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>c</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>out_type</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+    </param>
+    <param>
+      <key>block_size</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>init_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>dim</key>
       <value>1</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>2</value>
+      <key>table</key>
+      <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value>
+    </param>
+    <param>
+      <key>metric_type</key>
+      <value>digital.TRELLIS_EUCLIDEAN</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(975, 1342)</value>
+      <value>(83, 1111)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -880,10 +855,10 @@
     </param>
   </block>
   <block>
-    <key>gr_sub_xx</key>
+    <key>trellis_viterbi_combined_xx</key>
     <param>
       <key>id</key>
-      <value>gr_sub_xx_1_0</value>
+      <value>trellis_viterbi_combined_xx_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -891,19 +866,43 @@
     </param>
     <param>
       <key>type</key>
-      <value>short</value>
+      <value>c</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>out_type</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+    </param>
+    <param>
+      <key>block_size</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>init_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>dim</key>
       <value>1</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>2</value>
+      <key>table</key>
+      <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value>
+    </param>
+    <param>
+      <key>metric_type</key>
+      <value>digital.TRELLIS_EUCLIDEAN</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(559, 1536)</value>
+      <value>(75, 1495)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -911,10 +910,10 @@
     </param>
   </block>
   <block>
-    <key>gr_multiply_xx</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_xx_2_0</value>
+      <value>wxgui_scopesink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -922,19 +921,63 @@
     </param>
     <param>
       <key>type</key>
-      <value>short</value>
+      <value>complex</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>2</value>
+      <key>title</key>
+      <value>Scope Plot</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>samp_rate</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>v_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>v_offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>t_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ac_couple</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>xy_mode</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
       <value>1</value>
     </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
+    </param>
     <param>
       <key>_coordinate</key>
-      <value>(771, 1530)</value>
+      <value>(1533, 149)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -942,18 +985,22 @@
     </param>
   </block>
   <block>
-    <key>gr_short_to_float</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>gr_short_to_float_1_0</value>
+      <value>prefix</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
+    <param>
+      <key>value</key>
+      <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value>
+    </param>
     <param>
       <key>_coordinate</key>
-      <value>(1010, 1551)</value>
+      <value>(871, 14)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -964,7 +1011,7 @@
     <key>trellis_encoder_xx</key>
     <param>
       <key>id</key>
-      <value>trellis_encoder_xx_1</value>
+      <value>trellis_encoder_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -984,7 +1031,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(336, 311)</value>
+      <value>(340, 187)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -992,54 +1039,109 @@
     </param>
   </block>
   <block>
-    <key>trellis_viterbi_combined_xx</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>trellis_viterbi_combined_xx_1</value>
+      <value>R</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>c</value>
+      <key>value</key>
+      <value>100e3</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>s</value>
+      <key>_coordinate</key>
+      <value>(748, 12)</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>wxgui_numbersink2</key>
     <param>
-      <key>block_size</key>
-      <value>1000</value>
+      <key>id</key>
+      <value>wxgui_numbersink2_0</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>-1</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>final_state</key>
-      <value>-1</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>dim</key>
+      <key>title</key>
+      <value>BER 1 (raw)</value>
+    </param>
+    <param>
+      <key>units</key>
+      <value>BER</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>min_value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max_value</key>
       <value>1</value>
     </param>
     <param>
-      <key>table</key>
-      <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value>
+      <key>factor</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>metric_type</key>
-      <value>trellis.TRELLIS_EUCLIDEAN</value>
+      <key>decimal_places</key>
+      <value>6</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>number_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0.001</value>
+    </param>
+    <param>
+      <key>show_gauge</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>0,0,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(79, 501)</value>
+      <value>(1267, 410)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1047,10 +1149,10 @@
     </param>
   </block>
   <block>
-    <key>trellis_viterbi_combined_xx</key>
+    <key>wxgui_numbersink2</key>
     <param>
       <key>id</key>
-      <value>trellis_viterbi_combined_xx_2</value>
+      <value>wxgui_numbersink2_2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1058,74 +1160,75 @@
     </param>
     <param>
       <key>type</key>
-      <value>c</value>
+      <value>float</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>s</value>
+      <key>title</key>
+      <value>BER 2 (raw)</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>units</key>
+      <value>BER</value>
     </param>
     <param>
-      <key>block_size</key>
-      <value>1000</value>
+      <key>samp_rate</key>
+      <value>R</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>-1</value>
+      <key>min_value</key>
+      <value>0</value>
     </param>
     <param>
-      <key>final_state</key>
-      <value>-1</value>
+      <key>max_value</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>dim</key>
-      <value>1</value>
+      <key>factor</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>table</key>
-      <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value>
+      <key>decimal_places</key>
+      <value>6</value>
     </param>
     <param>
-      <key>metric_type</key>
-      <value>trellis.TRELLIS_EUCLIDEAN</value>
+      <key>ref_level</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(82, 766)</value>
+      <key>number_rate</key>
+      <value>15</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>peak_hold</key>
+      <value>False</value>
     </param>
-  </block>
-  <block>
-    <key>trellis_encoder_xx</key>
     <param>
-      <key>id</key>
-      <value>trellis_encoder_xx_2</value>
+      <key>average</key>
+      <value>True</value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>avg_alpha</key>
+      <value>0.001</value>
+    </param>
+    <param>
+      <key>show_gauge</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>ss</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>grid_pos</key>
+      <value>0,1,1,1</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>0</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(89, 998)</value>
+      <value>(1260, 659)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1133,10 +1236,10 @@
     </param>
   </block>
   <block>
-    <key>trellis_viterbi_combined_xx</key>
+    <key>wxgui_numbersink2</key>
     <param>
       <key>id</key>
-      <value>trellis_viterbi_combined_xx_0</value>
+      <value>wxgui_numbersink2_3</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1144,43 +1247,75 @@
     </param>
     <param>
       <key>type</key>
-      <value>c</value>
+      <value>float</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>s</value>
+      <key>title</key>
+      <value>BER 2 (after cancelling user 1)</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>units</key>
+      <value>BER</value>
     </param>
     <param>
-      <key>block_size</key>
-      <value>1000</value>
+      <key>samp_rate</key>
+      <value>R</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>-1</value>
+      <key>min_value</key>
+      <value>0</value>
     </param>
     <param>
-      <key>final_state</key>
-      <value>-1</value>
+      <key>max_value</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>dim</key>
-      <value>1</value>
+      <key>factor</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>table</key>
-      <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value>
+      <key>decimal_places</key>
+      <value>6</value>
     </param>
     <param>
-      <key>metric_type</key>
-      <value>trellis.TRELLIS_EUCLIDEAN</value>
+      <key>ref_level</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>number_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0.001</value>
+    </param>
+    <param>
+      <key>show_gauge</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1,1,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(83, 1111)</value>
+      <value>(1262, 1020)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1188,10 +1323,10 @@
     </param>
   </block>
   <block>
-    <key>trellis_encoder_xx</key>
+    <key>wxgui_numbersink2</key>
     <param>
       <key>id</key>
-      <value>trellis_encoder_xx_2_0</value>
+      <value>wxgui_numbersink2_3_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1199,74 +1334,75 @@
     </param>
     <param>
       <key>type</key>
-      <value>ss</value>
+      <value>float</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>title</key>
+      <value>BER 1 (after cancelling user 2)</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>0</value>
+      <key>units</key>
+      <value>BER</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(105, 1367)</value>
+      <key>samp_rate</key>
+      <value>R</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>min_value</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>trellis_viterbi_combined_xx</key>
     <param>
-      <key>id</key>
-      <value>trellis_viterbi_combined_xx_0_0</value>
+      <key>max_value</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>factor</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>decimal_places</key>
+      <value>6</value>
     </param>
     <param>
-      <key>type</key>
-      <value>c</value>
+      <key>ref_level</key>
+      <value>0</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>s</value>
+      <key>number_rate</key>
+      <value>15</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>peak_hold</key>
+      <value>False</value>
     </param>
     <param>
-      <key>block_size</key>
-      <value>1000</value>
+      <key>average</key>
+      <value>True</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>-1</value>
+      <key>avg_alpha</key>
+      <value>0.001</value>
     </param>
     <param>
-      <key>final_state</key>
-      <value>-1</value>
+      <key>show_gauge</key>
+      <value>True</value>
     </param>
     <param>
-      <key>dim</key>
-      <value>1</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
-      <key>table</key>
-      <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value>
+      <key>grid_pos</key>
+      <value>1,0,1,1</value>
     </param>
     <param>
-      <key>metric_type</key>
-      <value>trellis.TRELLIS_EUCLIDEAN</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(75, 1495)</value>
+      <value>(1269, 1417)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1305,10 +1441,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>gr_add_xx</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0</value>
+      <value>gr_add_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1318,61 +1454,17 @@
       <key>type</key>
       <value>complex</value>
     </param>
-    <param>
-      <key>title</key>
-      <value>Scope Plot</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>R</value>
-    </param>
-    <param>
-      <key>v_scale</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>v_offset</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>t_scale</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ac_couple</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>xy_mode</key>
-      <value>True</value>
-    </param>
     <param>
       <key>num_inputs</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>win_size</key>
-      <value></value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>trig_mode</key>
-      <value>gr.gr_TRIG_MODE_AUTO</value>
+      <value>2</value>
     </param>
     <param>
-      <key>y_axis_label</key>
-      <value>Counts</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1533, 149)</value>
+      <value>(1224, 245)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1380,22 +1472,34 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>analog_noise_source_x</key>
     <param>
       <key>id</key>
-      <value>prefix</value>
+      <value>analog_noise_source_x_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>noise_type</key>
+      <value>analog.GR_GAUSSIAN</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>noisevar</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>-42</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(871, 14)</value>
+      <value>(1178, 321)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1403,10 +1507,10 @@
     </param>
   </block>
   <block>
-    <key>trellis_encoder_xx</key>
+    <key>gr_throttle</key>
     <param>
       <key>id</key>
-      <value>trellis_encoder_xx_0</value>
+      <value>gr_throttle_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1414,19 +1518,19 @@
     </param>
     <param>
       <key>type</key>
-      <value>ss</value>
+      <value>short</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>samples_per_second</key>
+      <value>R</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>0</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(340, 187)</value>
+      <value>(579, 143)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1434,10 +1538,10 @@
     </param>
   </block>
   <block>
-    <key>gr_throttle</key>
+    <key>gr_multiply_const_vxx</key>
     <param>
       <key>id</key>
-      <value>gr_throttle_0</value>
+      <value>gr_multiply_const_vxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1445,11 +1549,11 @@
     </param>
     <param>
       <key>type</key>
-      <value>short</value>
+      <value>complex</value>
     </param>
     <param>
-      <key>samples_per_second</key>
-      <value>R</value>
+      <key>const</key>
+      <value>alpha**0.5</value>
     </param>
     <param>
       <key>vlen</key>
@@ -1457,7 +1561,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(534, 149)</value>
+      <value>(988, 196)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1465,10 +1569,10 @@
     </param>
   </block>
   <block>
-    <key>gr_chunks_to_symbols_xx</key>
+    <key>digital_chunks_to_symbols_xx</key>
     <param>
       <key>id</key>
-      <value>gr_chunks_to_symbols_xx_0</value>
+      <value>digital_chunks_to_symbols_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1496,7 +1600,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(682, 186)</value>
+      <value>(703, 211)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1504,22 +1608,30 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>gr_multiply_const_vxx</key>
     <param>
       <key>id</key>
-      <value>R</value>
+      <value>gr_multiply_const_vxx_1</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>100e3</value>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>const</key>
+      <value>(1-alpha)**0.5</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(748, 12)</value>
+      <value>(994, 319)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1527,10 +1639,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_numbersink2</key>
+    <key>trellis_encoder_xx</key>
     <param>
       <key>id</key>
-      <value>wxgui_numbersink2_0</value>
+      <value>trellis_encoder_xx_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1538,75 +1650,19 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>BER 1 (raw)</value>
-    </param>
-    <param>
-      <key>units</key>
-      <value>BER</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>R</value>
-    </param>
-    <param>
-      <key>min_value</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max_value</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>factor</key>
-      <value>1.0</value>
+      <value>ss</value>
     </param>
     <param>
-      <key>decimal_places</key>
-      <value>6</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
     <param>
-      <key>ref_level</key>
+      <key>init_state</key>
       <value>0</value>
     </param>
-    <param>
-      <key>number_rate</key>
-      <value>15</value>
-    </param>
-    <param>
-      <key>peak_hold</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>average</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>avg_alpha</key>
-      <value>0.001</value>
-    </param>
-    <param>
-      <key>show_gauge</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>win_size</key>
-      <value></value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value>0,0,1,1</value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
     <param>
       <key>_coordinate</key>
-      <value>(1267, 410)</value>
+      <value>(336, 311)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1614,86 +1670,77 @@
     </param>
   </block>
   <block>
-    <key>wxgui_numbersink2</key>
+    <key>digital_chunks_to_symbols_xx</key>
     <param>
       <key>id</key>
-      <value>wxgui_numbersink2_2</value>
+      <value>digital_chunks_to_symbols_xx_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>BER 2 (raw)</value>
-    </param>
-    <param>
-      <key>units</key>
-      <value>BER</value>
+      <key>in_type</key>
+      <value>short</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>R</value>
+      <key>out_type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>min_value</key>
-      <value>0</value>
+      <key>symbol_table</key>
+      <value>1,1j,-1j,-1</value>
     </param>
     <param>
-      <key>max_value</key>
-      <value>1.0</value>
+      <key>dimension</key>
+      <value>1</value>
     </param>
     <param>
-      <key>factor</key>
-      <value>1.0</value>
+      <key>num_ports</key>
+      <value>1</value>
     </param>
     <param>
-      <key>decimal_places</key>
-      <value>6</value>
+      <key>_coordinate</key>
+      <value>(703, 311)</value>
     </param>
     <param>
-      <key>ref_level</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>digital_chunks_to_symbols_xx</key>
     <param>
-      <key>number_rate</key>
-      <value>15</value>
-    </param>
-    <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>id</key>
+      <value>digital_chunks_to_symbols_xx_0_0_0</value>
     </param>
     <param>
-      <key>average</key>
+      <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0.001</value>
+      <key>in_type</key>
+      <value>short</value>
     </param>
     <param>
-      <key>show_gauge</key>
-      <value>True</value>
+      <key>out_type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>symbol_table</key>
+      <value>1,1j,-1j,-1</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>0,1,1,1</value>
+      <key>dimension</key>
+      <value>1</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>num_ports</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1260, 659)</value>
+      <value>(418, 1000)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1701,10 +1748,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_numbersink2</key>
+    <key>gr_multiply_const_vxx</key>
     <param>
       <key>id</key>
-      <value>wxgui_numbersink2_3</value>
+      <value>gr_multiply_const_vxx_2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1712,75 +1759,81 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>complex</value>
     </param>
     <param>
-      <key>title</key>
-      <value>BER 2 (after cancelling user 1)</value>
+      <key>const</key>
+      <value>alpha**0.5</value>
     </param>
     <param>
-      <key>units</key>
-      <value>BER</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>R</value>
+      <key>_coordinate</key>
+      <value>(710, 1008)</value>
     </param>
     <param>
-      <key>min_value</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>trellis_encoder_xx</key>
     <param>
-      <key>max_value</key>
-      <value>1.0</value>
+      <key>id</key>
+      <value>trellis_encoder_xx_2</value>
     </param>
     <param>
-      <key>factor</key>
-      <value>1.0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>decimal_places</key>
-      <value>6</value>
+      <key>type</key>
+      <value>ss</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>0</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
     <param>
-      <key>number_rate</key>
-      <value>15</value>
+      <key>init_state</key>
+      <value>0</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>_coordinate</key>
+      <value>(89, 1000)</value>
     </param>
     <param>
-      <key>average</key>
-      <value>True</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>gr_multiply_const_vxx</key>
     <param>
-      <key>avg_alpha</key>
-      <value>0.001</value>
+      <key>id</key>
+      <value>gr_multiply_const_vxx_2_0</value>
     </param>
     <param>
-      <key>show_gauge</key>
+      <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>1,1,1,1</value>
+      <key>const</key>
+      <value>(1-alpha)**0.5</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1262, 1020)</value>
+      <value>(733, 1374)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1788,10 +1841,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_numbersink2</key>
+    <key>trellis_encoder_xx</key>
     <param>
       <key>id</key>
-      <value>wxgui_numbersink2_3_0</value>
+      <value>trellis_encoder_xx_2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1799,75 +1852,58 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>BER 1 (after cancelling user 2)</value>
-    </param>
-    <param>
-      <key>units</key>
-      <value>BER</value>
+      <value>ss</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>R</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
     <param>
-      <key>min_value</key>
+      <key>init_state</key>
       <value>0</value>
     </param>
     <param>
-      <key>max_value</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>factor</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>decimal_places</key>
-      <value>6</value>
+      <key>_coordinate</key>
+      <value>(103, 1366)</value>
     </param>
     <param>
-      <key>ref_level</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>digital_chunks_to_symbols_xx</key>
     <param>
-      <key>number_rate</key>
-      <value>15</value>
-    </param>
-    <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>id</key>
+      <value>digital_chunks_to_symbols_xx_0_0_1</value>
     </param>
     <param>
-      <key>average</key>
+      <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0.001</value>
+      <key>in_type</key>
+      <value>short</value>
     </param>
     <param>
-      <key>show_gauge</key>
-      <value>True</value>
+      <key>out_type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>symbol_table</key>
+      <value>1,1j,-1j,-1</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>1,0,1,1</value>
+      <key>dimension</key>
+      <value>1</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>num_ports</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1269, 1417)</value>
+      <value>(420, 1366)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1880,18 +1916,6 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <source_block_id>trellis_encoder_xx_1</source_block_id>
-    <sink_block_id>gr_chunks_to_symbols_xx_1</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_chunks_to_symbols_xx_0</source_block_id>
-    <sink_block_id>gr_multiply_const_vxx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>gr_multiply_const_vxx_0</source_block_id>
     <sink_block_id>gr_add_xx_0</sink_block_id>
@@ -1904,18 +1928,6 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <source_block_id>gr_noise_source_x_0</source_block_id>
-    <sink_block_id>gr_add_xx_1</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>1</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_chunks_to_symbols_xx_1</source_block_id>
-    <sink_block_id>gr_multiply_const_vxx_1</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>gr_multiply_const_vxx_1</source_block_id>
     <sink_block_id>gr_add_xx_0</sink_block_id>
@@ -2012,18 +2024,6 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <source_block_id>trellis_encoder_xx_2</source_block_id>
-    <sink_block_id>gr_chunks_to_symbols_xx_2</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_chunks_to_symbols_xx_2</source_block_id>
-    <sink_block_id>gr_multiply_const_vxx_2</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>gr_multiply_const_vxx_2</source_block_id>
     <sink_block_id>gr_sub_xx_2</sink_block_id>
@@ -2084,18 +2084,6 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <source_block_id>trellis_encoder_xx_2_0</source_block_id>
-    <sink_block_id>gr_chunks_to_symbols_xx_2_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_chunks_to_symbols_xx_2_0</source_block_id>
-    <sink_block_id>gr_multiply_const_vxx_2_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>trellis_viterbi_combined_xx_2</source_block_id>
     <sink_block_id>trellis_encoder_xx_2_0</sink_block_id>
@@ -2168,9 +2156,57 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>analog_noise_source_x_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
   <connection>
     <source_block_id>gr_throttle_0</source_block_id>
-    <sink_block_id>gr_chunks_to_symbols_xx_0</sink_block_id>
+    <sink_block_id>digital_chunks_to_symbols_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
+    <sink_block_id>gr_multiply_const_vxx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_chunks_to_symbols_xx_0_0</source_block_id>
+    <sink_block_id>gr_multiply_const_vxx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_encoder_xx_1</source_block_id>
+    <sink_block_id>digital_chunks_to_symbols_xx_0_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_encoder_xx_2</source_block_id>
+    <sink_block_id>digital_chunks_to_symbols_xx_0_0_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_chunks_to_symbols_xx_0_0_0</source_block_id>
+    <sink_block_id>gr_multiply_const_vxx_2</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_encoder_xx_2_0</source_block_id>
+    <sink_block_id>digital_chunks_to_symbols_xx_0_0_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_chunks_to_symbols_xx_0_0_1</source_block_id>
+    <sink_block_id>gr_multiply_const_vxx_2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-- 
cgit v1.2.3