.

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

@@ -442,7 +442,7 @@
           ul_nr_arfcn:  {{ cell.ul_nr_arfcn }},
           bandwidth:    {{ cell.bandwidth }},
 
-          subcarrier_spacing: {{ 30  if cell.rf_mode == 'tdd'  else 15 }},
+          subcarrier_spacing: {{ cell.subcarrier_spacing }},
           ssb_nr_arfcn:   {{ cell.ssb_nr_arfcn }},
           ssb_pos_bitmap: "{{ cell.ssb_pos_bitmap }}",
 

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

@@ -81,7 +81,7 @@
           ssb_nr_arfcn: {{ cell.ssb_nr_arfcn }},
           bandwidth:    {{ cell.bandwidth }},
 
-          subcarrier_spacing: {{ 30  if cell.rf_mode == 'tdd'  else 15 }},
+          subcarrier_spacing: {{ cell.subcarrier_spacing }},
         },
 {%-   endif %}
 {%- endfor %}

software/ors-amarisoft/k/ssb_nr_arfcn_test.py

@@ -11,6 +11,7 @@ def default_ssb_nr_arfcn(dl_nr_arfcn, scs_khz):
     if nr.get_frequency_by_gscn(gscn) > f:
         gscn -= 1
     scs = scs_khz * khz
+    # align fb to be multiple of scs
     while 1:
         fg = nr.get_frequency_by_gscn(gscn)
         if fg % scs < 1e-5*scs: # == 0 with tolerating fp

software/ors-amarisoft/slaplte.jinja2

@@ -221,6 +221,7 @@
 {%-         do _.setdefault('ul_earfcn',    J(jdefault_ul_earfcn(_.dl_earfcn))) %}
 {%-       elif xcell_type == 'nr' %}
 {%-         do _.setdefault('ul_nr_arfcn',  J(jdefault_ul_nr_arfcn(_.dl_nr_arfcn, _.nr_band)))  %}
+{%-         do _.setdefault('subcarrier_spacing', 30  if _.rf_mode == 'tdd'  else 15)  %}
 {%-         do _.setdefault('ssb_nr_arfcn', J(jdefault_ssb_nr_arfcn(_.dl_nr_arfcn)))  %}
 {%-       else  %}
 {%-         do bug('unreachable') %}