An updated Monte Carlo calculation of the CNGS neutrino beam