Marginalisation affecting waveform plots

If you marginalise over phase, then the waveform plot will fail because it currently requires samples for phase. This needs to be fixed.