fix geometry overlap and HCAL2 ouput