SCUBA2: force gaussian fit if two components

Since the JCMT beam is approximated by two gaussians, and the point of
a two-component fit is to reproduce that the pipeline should assume
that a gaussian profile should always be used. The check for a
calibrator may be redundant but I'll leave it in for now for clarity.