Merged mini-sub2 from repository arizzi
only take from RecoPFJets what we really want to run