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