Merged pf_shashlik-lindsey from repository shervin86
fixed required geometry for EE or EK
ZeroSuppressed EK digis