1 files changed, 7 insertions, 63 deletions
diff --git a/simulation/QAM_Fading/qam_fading_frequency_selectiv.grc b/simulation/QAM_Fading/qam_fading_frequency_selectiv.grc
index 109a74d..6ee63b3 100644
--- a/simulation/QAM_Fading/qam_fading_frequency_selectiv.grc
+++ b/simulation/QAM_Fading/qam_fading_frequency_selectiv.grc
@@ -502,32 +502,7 @@ blocks:
     bus_structure: null
     coordinate: [648, 316.0]
     rotation: 0
-    state: enabled
-- name: channels_selective_fading_model2_1
-  id: channels_selective_fading_model2
-  parameters:
-    K: '4.0'
-    LOS: 'False'
-    N: '8'
-    affinity: ''
-    alias: ''
-    comment: ''
-    delay_maxdev: (0.5,0.7,0.9)
-    delay_std: (1e-4,1e-4,1e-4)
-    delays: (1.0,1.9,2.7)
-    fDTs: 0.2/samp_rate
-    mags: (1,0.95,0.8)
-    maxoutbuf: '0'
-    minoutbuf: '0'
-    ntaps: '8'
-    seed: '0'
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [888, 276.0]
-    rotation: 0
-    state: disabled
+    state: bypassed
 - name: channels_selective_fading_model_0
   id: channels_selective_fading_model
   parameters:
@@ -537,43 +512,20 @@ blocks:
     affinity: ''
     alias: ''
     comment: ''
-    delays: (0,1.8)
-    fDTs: ((2*fc*1e9)/(3*10e8))/samp_rate
-    mags: (1,0.12)
+    delays: (0,0.05e-6/samp_rate,0.12e-6/samp_rate,0.2e-6/samp_rate,0.23e-6/samp_rate,0.5e-6/samp_rate,1.6e-6/samp_rate,2.3e-6/samp_rate,5e-6/samp_rate)
+    fDTs: 70/samp_rate
+    mags: (0.7943282347242815,0.7943282347242815,0.7943282347242815,1,1,1,0.5011872336272722,0.31622776601683794,0.19952623149688797)
     maxoutbuf: '0'
     minoutbuf: '0'
-    ntaps: '8'
-    seed: '21'
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [976, 404.0]
-    rotation: 0
-    state: enabled
-- name: channels_selective_fading_model_2
-  id: channels_selective_fading_model
-  parameters:
-    K: '4.0'
-    LOS: 'False'
-    N: '30'
-    affinity: ''
-    alias: ''
-    comment: ''
-    delays: (0.0,0.1,1.3)
-    fDTs: '0'
-    mags: (1,0.99,0.97)
-    maxoutbuf: '0'
-    minoutbuf: '0'
-    ntaps: '8'
+    ntaps: '9'
     seed: '0'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [928, 140.0]
+    coordinate: [960, 300.0]
     rotation: 0
-    state: disabled
+    state: enabled
 - name: digital_cma_equalizer_cc_0
   id: digital_cma_equalizer_cc
   parameters:
@@ -1532,21 +1484,13 @@ connections:
 - [blocks_unpack_k_bits_bb_0_0, '0', blocks_char_to_float_0_0, '0']
 - [blocks_unpack_k_bits_bb_0_1, '0', blocks_char_to_float_0_1, '0']
 - [blocks_vector_source_x_0, '0', digital_constellation_modulator_0, '0']
-- [channels_channel_model_0, '0', channels_selective_fading_model2_1, '0']
 - [channels_channel_model_0, '0', channels_selective_fading_model_0, '0']
-- [channels_channel_model_0, '0', channels_selective_fading_model_2, '0']
 - [channels_channel_model_0, '0', digital_pfb_clock_sync_xxx_0_0, '0']
 - [channels_channel_model_0, '0', qtgui_const_sink_x_0, '1']
 - [channels_channel_model_0, '0', qtgui_freq_sink_x_0, '1']
-- [channels_selective_fading_model2_1, '0', digital_pfb_clock_sync_xxx_0, '0']
-- [channels_selective_fading_model2_1, '0', qtgui_const_sink_x_0, '0']
-- [channels_selective_fading_model2_1, '0', qtgui_freq_sink_x_0, '0']
 - [channels_selective_fading_model_0, '0', digital_pfb_clock_sync_xxx_0, '0']
 - [channels_selective_fading_model_0, '0', qtgui_const_sink_x_0, '0']
 - [channels_selective_fading_model_0, '0', qtgui_freq_sink_x_0, '0']
-- [channels_selective_fading_model_2, '0', digital_pfb_clock_sync_xxx_0, '0']
-- [channels_selective_fading_model_2, '0', qtgui_const_sink_x_0, '0']
-- [channels_selective_fading_model_2, '0', qtgui_freq_sink_x_0, '0']
 - [digital_cma_equalizer_cc_0, '0', digital_costas_loop_cc_0, '0']
 - [digital_cma_equalizer_cc_0, '0', qtgui_const_sink_x_1, '0']
 - [digital_cma_equalizer_cc_0_0, '0', digital_costas_loop_cc_0_0, '0']