.

software/ors-amarisoft/config/enb.jinja2.cfg

@@ -469,9 +469,9 @@
   },
 {%- endif %}
 
+{%  if do_nr %}
   // NR cells
   nr_cell_list: [
-{%- if do_nr  %}
 {%- for cell_ref, icell in icell_dict_nr|dictsort %}
 {%-   set cell = icell['_'] %}
 {%-   set ru_ref = J(jcell_ru_ref(icell, icell_dict)) %}
@@ -757,10 +757,8 @@
 
       },
 {%- endfor %}
-{%- endif %}
   ],
 
-{%- if do_nr  %}
   nr_cell_default: {
     ssb_period: 20,
 
@@ -792,7 +790,6 @@
     intra_freq_reselection: true,
     q_rx_lev_min: -70,
     q_qual_min: -20,
-
     sr_period: 40,
     dmrs_type_a_pos: 2,
     prach: {

software/ors-amarisoft/config/out/enb/iRU1_SDR1_fLTE2/enb.cfg

@@ -324,7 +324,5 @@
   ho_from_meas: true,
   },
 
-  // NR cells
-  nr_cell_list: [
-  ],
+
 }
\ No newline at end of file

software/ors-amarisoft/config/out/enb/iRU1_SDR_tLTE2_tNR/enb.cfg

@@ -364,6 +364,7 @@
   ho_from_meas: true,
   },
 
+
   // NR cells
   nr_cell_list: [
 
@@ -442,7 +443,6 @@
 
         // tune NR parameters for the cell
 
-
          tdd_ul_dl_config: {
            pattern1: {
              period: 5,
@@ -576,13 +576,13 @@
               },
             },
           ],
-
         },
 
         drb_config: "CELL__c-drb.cfg",
 
       },
   ],
+
   nr_cell_default: {
     ssb_period: 20,
 
@@ -604,7 +604,6 @@
     intra_freq_reselection: true,
     q_rx_lev_min: -70,
     q_qual_min: -20,
-
     sr_period: 40,
     dmrs_type_a_pos: 2,
     prach: {

software/ors-amarisoft/config/out/enb/iRU2_LOPCOMM_fLTE2/enb.cfg

@@ -331,7 +331,5 @@
   ho_from_meas: true,
   },
 
-  // NR cells
-  nr_cell_list: [
-  ],
+
 }
\ No newline at end of file

software/ors-amarisoft/config/out/enb/iRU2_LOPCOMM_fLTE_fNR/enb.cfg

@@ -236,6 +236,7 @@
   ho_from_meas: true,
   },
 
+
   // NR cells
   nr_cell_list: [
 
@@ -306,7 +307,6 @@
         // tune NR parameters for the cell
 
 
-
         prach: {
           ra_response_window: 10,
         },
@@ -426,13 +426,13 @@
               },
             },
           ],
-
         },
 
         drb_config: "CELL__b-drb.cfg",
 
       },
   ],
+
   nr_cell_default: {
     ssb_period: 20,
 
@@ -454,7 +454,6 @@
     intra_freq_reselection: true,
     q_rx_lev_min: -70,
     q_qual_min: -20,
-
     sr_period: 40,
     dmrs_type_a_pos: 2,
     prach: {

software/ors-amarisoft/config/out/enb/iRU2_SDR_tLTE_tNR/enb.cfg

@@ -233,6 +233,7 @@
   ho_from_meas: true,
   },
 
+
   // NR cells
   nr_cell_list: [
 
@@ -302,7 +303,6 @@
 
         // tune NR parameters for the cell
 
-
          tdd_ul_dl_config: {
            pattern1: {
              period: 5,
@@ -433,13 +433,13 @@
               },
             },
           ],
-
         },
 
         drb_config: "CELL__b-drb.cfg",
 
       },
   ],
+
   nr_cell_default: {
     ssb_period: 20,
 
@@ -461,7 +461,6 @@
     intra_freq_reselection: true,
     q_rx_lev_min: -70,
     q_qual_min: -20,
-
     sr_period: 40,
     dmrs_type_a_pos: 2,
     prach: {