Changes to format.h for Jet ID
small changes to run on data
Merge branch 'dev' of https://github.com/ntuhep/BprimeTobH into dev