Fix plot of wavepackets in 2D contour mode
New way of plotting wavepacket parameters
Port over trapezoidal quadrature rules from old code