Tidy up centroiding/fibreId code

The current code in master has hard-coded the methods for centroiding and fibre identification; we should update this so that we can switch methods without having to change the code.