Added override to support generic ROI shape handling
Fixed ROI class hierarchy so a sector is a specialisation of a ring