Copied over @wmtford's pixel digitiser changes to the Phase2 digitiser