Updates to how the Geometry is used

Especially it calles the TTree less often, and allows for boundary
checks.