More improvements to Crystal EGamma Trigger

To align code with latest trigger proposal plots.