Match ATLAS binning in Phi* plots

We now use the ATLAS binning in our histograms instead of trying to
match it later with rebinning.