Avoid a PTRS in a DMRS symbol

openair1/PHY/NR_REFSIG/ptrs_nr.c

@@ -134,7 +134,10 @@ void set_ptrs_symb_idx(uint16_t *ptrs_symbols,
       continue;
     }
 
-    *ptrs_symbols = *ptrs_symbols | (1<<(l_ref + i*L_ptrs));
+    if( !((ul_dmrs_symb_pos >> (l_ref + i*L_ptrs)) & 0x01) ) {
+      *ptrs_symbols = *ptrs_symbols | (1<<(l_ref + i*L_ptrs));
+    }
+
     i++;
   }
 }

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -867,7 +867,7 @@ int main(int argc, char **argv)
 
   uint8_t  length_dmrs         = pusch_len1;
   uint16_t l_prime_mask        = get_l_prime(nb_symb_sch, mapping_type, add_pos, length_dmrs, start_symbol, NR_MIB__dmrs_TypeA_Position_pos2);
-  uint16_t number_dmrs_symbols = get_dmrs_symbols_in_slot(l_prime_mask, nb_symb_sch);
+  uint16_t number_dmrs_symbols = get_dmrs_symbols_in_slot(l_prime_mask, start_symbol+nb_symb_sch);
   printf("num dmrs sym %d\n",number_dmrs_symbols);
   uint8_t  nb_re_dmrs          = (dmrs_config_type == pusch_dmrs_type1) ? 6 : 4;