A laser probe measurement of cavitation bubble dynamics improved by shock wave detection and compared to shadow photography