Got to the point where I think I am calculating what I want to, but output and thinning still need to be modified so that they print the normalization quantities with inelastic.