Updates to pull geometry repository tag.
Modifies existing macros for the generation of a Tof and PSD geometry.