Merge 1897

[ktf]

This should be exactly like 1897, but now mergiable. There seems to be white space issues which are creating troubles.

[cmsbuild]

A new Pull Request was created by @ktf (Giulio Eulisse) for CMSSW_7_0_X.

Merge 1897

It involves the following packages:

CommonTools/ParticleFlow
DQMOffline/Alignment
JetMETCorrections/Configuration
JetMETCorrections/Modules
PhysicsTools/PatAlgos
RecoEgamma/EgammaHLTProducers
RecoJets/Configuration
RecoJets/JetProducers
Validation/RecoJets

@perrotta, @cmsbuild, @thspeer, @danduggan, @fwyzard, @rovere, @Martin-Grunewald, @anton-a, @nclopezo, @deguio, @slava77, @vadler, @eliasron can you please review it and eventually sign? Thanks.
@TaiSakuma this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@ktf you are the release manager for this.

[vadler]

+1
(tested #1897 , no AT code changes here)

[ktf]

Ok. @slava77 is right. I picked up the wrong side of history. This (updated) should have all the right choices, as suggested by @vadler and confirmed by @slava77.

[slava77]

Giulio, if you checked the contents are the same as #1897 , then feel free to bypass

[ktf]

I'm checking this right now.

[cmsbuild]

Pull request #1908 was updated. @perrotta, @cmsbuild, @thspeer, @danduggan, @fwyzard, @rovere, @Martin-Grunewald, @anton-a, @nclopezo, @deguio, @slava77, @vadler, @eliasron can you please check and sign again.

[cmsbuild]

Pull request #1908 was updated. @perrotta, @cmsbuild, @thspeer, @danduggan, @fwyzard, @rovere, @Martin-Grunewald, @anton-a, @nclopezo, @deguio, @slava77, @vadler, @eliasron can you please check and sign again.

[vadler]

+1

[cmsbuild]

Pull request #1908 was updated. @perrotta, @cmsbuild, @thspeer, @danduggan, @fwyzard, @rovere, @Martin-Grunewald, @anton-a, @nclopezo, @deguio, @slava77, @vadler, @eliasron can you please check and sign again.

[vadler]

+1

[ktf]

Ok. This one has the correct merge, as done by @Slava:

Conflicting bits are resolved to:

useRho = cms.bool(True),
rho = cms.InputTag('fixedGridRhoFastjetAllCalo'),

and

fixedGridRhoFastjetCentralChargedPileUp+
fixedGridRhoFastjetCentralNeutral+

which is what slava has in:

https://github.com/slava77/cmssw/blob/5a70016b3e310d262309211092e896f552954eca/PhysicsTools/PatAlgos/python/recoLayer0/jetCorrFactors_cfi.py

and

https://github.com/slava77/cmssw/blob/5a70016b3e310d262309211092e896f552954eca/RecoJets/Configuration/python/RecoJets_cff.py

[slava77]

merging of merges is easily turning into a mess.
starting from 1804+1848+1863 in the order fitting the current state of the head may be much easier

[ktf]

Indeed, sorry. This mess is completely my fault when approving 1848.
Hopufully I managed to to everything as you did. Sorry again.