diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c index ad92ae6c34..1615fc86f3 100644 --- a/openair1/PHY/INIT/nr_init.c +++ b/openair1/PHY/INIT/nr_init.c @@ -228,7 +228,6 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB) PHY_MEASUREMENTS_gNB *meas = &gNB->measurements; free_and_zero(meas->n0_subband_power); - free_and_zero(meas->n0_subband_power_dB); for (int id = 0; id < gNB->max_nb_srs; id++) { for(int i=0; imeasurements.n0_subband_power, - frame_parms->nb_antennas_rx, - frame_parms->N_RB_UL, - false); - allocCast2D(n0_subband_power_dB, - unsigned int, - gNB->measurements.n0_subband_power_dB, + measurements->n0_subband_power, frame_parms->nb_antennas_rx, frame_parms->N_RB_UL, false); @@ -193,17 +187,15 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB, int slot, int first_symb, int num_sy for (int rb = 0 ; rbN_RB_UL;rb++) { int32_t n0_subband_tot_perPRB=0; if (nb_symb[rb] > 0) { - for (int aarx=0;aarxnb_antennas_rx;aarx++) { + for (int aarx = 0; aarx < frame_parms->nb_antennas_rx; aarx++) { tmp_n0_subband[aarx][rb] /= nb_symb[rb]; // apply exponential moving average to smooth noise measurements n0_subband_power[aarx][rb] = 0.9 * n0_subband_power[aarx][rb] + 0.1 * tmp_n0_subband[aarx][rb]; - n0_subband_power_dB[aarx][rb] = dB_fixed(n0_subband_power[aarx][rb]); n0_subband_tot_perPRB += n0_subband_power[aarx][rb]; n0_subband_tot_perANT[aarx] += n0_subband_power[aarx][rb]; } - n0_subband_tot_perPRB/=frame_parms->nb_antennas_rx; + n0_subband_tot_perPRB /= frame_parms->nb_antennas_rx; measurements->n0_subband_power_tot_dB[rb] = dB_fixed(n0_subband_tot_perPRB); - measurements->n0_subband_power_tot_dBm[rb] = measurements->n0_subband_power_tot_dB[rb] - gNB->rx_total_gain_dB - dB_fixed(frame_parms->N_RB_UL); LOG_D(NR_PHY,"n0_subband_power_tot_dB[%d] => %d, over %d symbols\n",rb,measurements->n0_subband_power_tot_dB[rb],nb_symb[rb]); n0_subband_tot += n0_subband_tot_perPRB; nb_rb++; diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h index 46ba246dbe..62860283d9 100644 --- a/openair1/PHY/defs_gNB.h +++ b/openair1/PHY/defs_gNB.h @@ -340,16 +340,12 @@ typedef struct { unsigned int n0_power_tot_dB; //! estimated avg noise power per RB per RX ant (lin) fourDimArray_t *n0_subband_power; - //! estimated avg noise power per RB per RX ant (dB) - fourDimArray_t *n0_subband_power_dB; //! estimated avg subband noise power (dB) unsigned int n0_subband_power_avg_dB; //! estimated avg subband noise power per antenna (dB) unsigned int n0_subband_power_avg_perANT_dB[MAX_ANT]; //! estimated avg noise power per RB (dB) int n0_subband_power_tot_dB[275]; - //! estimated avg noise power per RB (dBm) - int n0_subband_power_tot_dBm[275]; /// PRACH background noise level int prach_I0; } PHY_MEASUREMENTS_gNB;