Add back dR matching, but keep flavourtool for additional studies, add bool hasGenJet,...