Salvikalpa Samadhi (or Savikalpa Samadhi) is when thoughts can still come, but there is no identification with them. They arise and disappear while you remain as the witness. You could also call this state of Samadhi an advanced state of "Witness Consciousness."