fixed conflicts
Comments are removed.
Delete PileupJetIdProducer.h~
Comments are removed part2.
Merged CMSSW_7_0_X from repository cms-sw
add in rootio commands to properly map old SC naming to new, point pat producers to new gedCollections
getByLabel -> getByToken for ElectronAnalyzer
getByLabel -> getByToken for ElectronGeneralAnalyzer
point PAT at the new GED collections; this completely breaks the PAT tests unless you point them at pre11 relvals by hand, in which case they work
getByLabel -> getByToken for ElectronTagProbeAnalyzer
fix conflicts with mikes changes
Merged refs/pull/1885/head from repository cms-sw
update pat tests to run on pre11
switch to getByToken and add rho correction
remove cut on wrongly computed energy for transient mustache photons
remove transient mustache photons from AOD
make preshower energy consistent everywhere
fix bug in filling pf cluster value map
add (and enable) match by reference for pf supercluster import in PFBlockAlgo and appropriately exploit this in PFEGammaAlgo (improves simplicity and robustness)
remove useless line