new resolution calcultaion
changes to fall back when shape histogram is not available
Merge remote-tracking branch 'origin/zp_to_emu' into zp_to_emu