Dear Daniel,
please have a look at the updated and simplified user source routine: source_newgen.f.
This will allow to set different angular divergence and the circular (annular) shape in the x and y directions easily.
For the annular sampling please note point 1 from Region of particle cannot be determined in extreme position - #3 by horvathd
Cheers,
David