fix geometry for PAT
Merge pull request #4839 from cms-analysis-tools/from-CMSSW_6_2_0_SLHC16-fixGeometryForPAT

fix geometry for PAT