Reunify p sim hit map

Tim's changes in PR 
but with on PSimHitMap class instead of two that differ by a few lines (and one that isn't used)