Correctly calculate the likelihood when including the normalization term with a subset of bins

Correctly calculate the likelihood when including the normalization term with a subset of bins #820