SCUBA2: reorder logic for determining whether to proceed

If the data are already calibrated, then the primitive should never
proceed with calibration, so join the if blocks into one so that they
become exclusive.