NoiseAna modifications --David Caratelli