Rewrote efficiency calculation code to match the definition.
(more loose, effectively, since earlier only the highest pt candidate was considered, which may pick up 'volunteers')