remove check for TPS and RAW before checking what waveform channels are...

remove check for TPS and RAW before checking what waveform channels are requested because in the condition above when it raise exception, it already check for TPS and RAW