SetGoniometer small changes. Refs #6793