2D fit in mass and IP chi^2.

This now works, but is very messy as it’s an attempt to get the framework to the stage where the output looks like the unbinned 2010 result.
This means lots of 2010-specific hacks and hardcoded values.