added SimpleAnalysis for waveforms