Now does inclusive jets, still a bug for variable bin size, likely in matrix
Some updates
merged with Yen-jie's changes