adapt PF for high pT jet substructure
Merged CMSSW_7_2_X from repository cms-sw
Merged PFsubstructure from repository ahinzmann
simplify merged neutral code
fix merged fraction
revert raw energy entry
Merge pull request #4668 from ahinzmann/PFsubstructure

Adapt PF algorithm for high pT jet substructure