latest version, used for our first really nice data. Also includes SNR and shotnoise calculations