fixed bug in SumBTags counter and fixed TopFitCalc to run on electron channel

in EventCalc::GetSumBTags()
* the only change is for the "overlap_with_topjet" boolean
* other differences are just due to formatting (this is cleaner by comparing the two commits of the present pull request one at the time)