merged top_reco branch

* validated Roman branch which includes TopFitCalc for new chi2 calculation