Site-site pair correlation functions of water from 25 Celsius to 400 Celsius: revised analysis of new and old diffraction data