Update jet calibrations, fix associated issues
The previous jet calibrations we were using were out date and not very well consolidated. Updated the delta R = 0.4 calibrations to reflect the recommendations here:
https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/ApplyJetCalibration2016
These didn't work in release 21.0.14, so we also updated to 21.0.19. This, in turn, broke the jetfitter branches because the combnn accessors have been removed from the xAOD interface.
In summary:
- updated jet calibrations (part of issue #4 (closed))
- updated setup scripts to use 21.0.19
- removed COMBNN branches from the outputs