Revert "undid changes to TrackerInteractionGeometry.cc that I did not mean to commit; fixed merge problem in FSIM_upgtracker_cfg.py"

This reverts commit 975d3e63b0c8edbc5c0fa83fb0c47e3e15dd27c1.
Revert "made changes to allow for the Phase2TkBE5DPixel10D geometry to be used in fastsim"

This reverts commit bb47e174c2a20ae49c31e1935eaf6c4d9adbfa55, reversing
changes made to e9657809b56ff8fdf34889df5528cf4d843daf4b.