To address CalPhoton isolation bug (https://cp3.irmp.ucl.ac.be/projects/delphes/ticket/362#comment:7), changed the way that Calorimeter deals with CalPhotons (per comment 8)