added geometry xml with overlap fixes and fixed r, but no other fixes

edited it to included rshift fixes for both electromagnetic and hadronic plates