Rich - Use average detectable photon yield algorithm

Relies on Rec!2024 (merged)

Will require ref. log updates.

Based off of !437 (merged) so will see diffs there here as well until that is eventually merged..