I have also placed the empty rotator mount  before the camera before the calibration to avoid any issue of interfering with the setup later. The HWP can later be mounted directly.