changes in CalculateSelection/ bug fix

Note: this might cause problems for people using the function CalculateSelection in TopFitCalc, but in the current version there is a bug anyway, so I guess nobody else is using it