queue-calibs: remove DR1 stuff; tidy; fix search radius; short-cut --touching with definitely-touching
queue-calibs: remove DR1 stuff; tidy; fix search radius; short-cut --touching with definitely-touching

legacysurvey/legacypipe,legacysurvey/legacypipe