.

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

@@ -304,7 +304,7 @@
   gnb_id_bits: {{ cfg('gnb_id_bits') }},
   en_dc_support: true,
 
-  // LTE cells
+  // LTE cells    XXX ru['xxx'] -> ru.xxx
   cell_list: [
 {%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
 {%-   set cell = icell['_']                   %}
@@ -790,29 +790,29 @@
       nzp_csi_rs_resource: [
         {
           csi_rs_id: 0,
-#if N_ANTENNA_DL == 1
+{%- if ru.n_antenna_dl == 1     %}
           n_ports: 1,
           frequency_domain_allocation: "row2",
           bitmap: "100000000000",
           cdm_type: "no_cdm",
-#elif N_ANTENNA_DL == 2
+{%- elif ru.n_antenna_dl == 2   %}
           n_ports: 2,
           frequency_domain_allocation: "other",
           bitmap: "100000",
           cdm_type: "fd_cdm2",
-#elif N_ANTENNA_DL == 4
+{%- elif ru.n_antenna_dl == 4   %}
           n_ports: 4,
           frequency_domain_allocation: "row4",
           bitmap: "100",
           cdm_type: "fd_cdm2",
-#elif N_ANTENNA_DL == 8
+{%- elif ru.n_antenna_dl == 8   %}
           n_ports: 8,
           frequency_domain_allocation: "other",
           bitmap: "110011",
           cdm_type: "fd_cdm2",
-#else
-#error unsupported number of DL antennas
-#endif
+{%- else  %}
+{%-  do error(icell, "unsupported number of DL antennas")   %}
+{%- endif %}
           density: 1,
           first_symb: 4,
           rb_start: 0,