Fireworks Run 2 Geometry

* Update Reco and Sim geometries for Run 2