re-adding urgent bug fix to eFEX egamma numbering

reintroducing the bug fixes made in !44165 (merged) that were accidentally removed by !44347 (merged) when the code was split into a separate class.