Make non-QC variables the (only) default
Add partonId matching and hasGenJet to miniAOD-based plugin, fix fromPV() > 1