updated parameters for water (recablibrated and retested) and camera (2d yshift and xshift)