Adopt SimHit Validation code for Upgrade

SimHit Validation code