Merge of new PLT Geometry

Hi Roberval,

I made the required changes to fix the overlap and had to change my pixel addresses.  Note that in this branch, the [cms:TrackLumiZ1] variable is set to 171.41cm (for me to get simhits), but you might want to change it back to its normal value (I can do this also if needed).