Adapting MVAVariableHelper to new E/gamma UL format and removal of MultiToken

[guitargeek]

PR description:

As the Egamma MVA infrastructure does not need to compute object specific variables anymore that are not stored in the objects themselves (thanks to #26486), the MVAVariableHelper is now an overly complicated piece of code which should be adapted.

I also suggest to remove the MultiToken class I introduced last year, as it's not really used much anymore after all the changes in the last months. It was also used in the ElectronIDValueMapProducer, which can now be removed that all the variables are in the object. I also think I made a mistake introducing the MultiToken to begin with. The consumes should be better configured with Python... That makes the MVAValueMapProducer also a bit simpler to use as it's not ambiguous anymore how it can be configured.

Other changes:

• adapted Electron MVA FWLite python code and test (thanks to the appropriate relvals being available now)
• merge header and source of some plugins in Electron-PhotonIdentification
• put all the plugin template definitions in Electron-PhotonIdentification into plugins.cc file

PR validation:

CMSSW compiles and local matrix tests pass.

if this PR is a backport please specify the original PR:

Maybe the FWLite part should get backported to 10_6_X.

[cmsbuild]

The code-checks are being triggered in jenkins.

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-26814/9829

• This PR adds an extra 40KB to repository

[cmsbuild]

A new Pull Request was created by @guitargeek (Jonas Rembser) for master.

It involves the following packages:

PhysicsTools/NanoAOD
RecoEgamma/EgammaTools
RecoEgamma/ElectronIdentification
RecoEgamma/PhotonIdentification

@perrotta, @cmsbuild, @fgolf, @slava77, @santocch, @peruzzim can you please review it and eventually sign? Thanks.
@gpetruc, @jainshilpi, @Sam-Harper, @varuns23, @lgray this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

[slava77]

@cmsbuild please test

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/285/console Started: 2019/05/17 00:32

[cmsbuild]

-1

Tested at: 7dc69da

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-7b607b/285/summary.html

I found follow errors while testing this PR

Failed tests: Build

• Build:

I found compilation error when building:

>> Compiling edm plugin /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_0_X_2019-05-16-1100/src/RecoEgamma/PhotonIdentification/plugins/VersionedPhotonIdProducer.cc 
>> Compiling edm plugin /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_0_X_2019-05-16-1100/src/RecoEgamma/PhotonIdentification/plugins/PhotonIDSimpleAnalyzer.cc 
>> Compiling edm plugin /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_0_X_2019-05-16-1100/src/RecoEgamma/PhotonIdentification/plugins/PhotonMVANtuplizer.cc 
>> Compiling edm plugin /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_0_X_2019-05-16-1100/src/RecoEgamma/PhotonIdentification/plugins/PhotonIDValueMapProducer.cc 
In file included from /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_0_X_2019-05-16-1100/src/RecoEgamma/PhotonIdentification/plugins/PhotonIDValueMapProducer.cc:16:0:
/build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_0_X_2019-05-16-1100/poison/RecoEgamma/EgammaTools/interface/MultiToken.h:1:2: error: #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
 #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
  ^~~~~
>> Compiling edm plugin /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_0_X_2019-05-16-1100/src/RecoEgamma/PhotonIdentification/plugins/PhotonMVAEstimator.cc 
>> Compiling edm plugin /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_0_X_2019-05-16-1100/src/RecoEgamma/PhotonIdentification/plugins/SealModules.cc 
>> Compiling edm plugin /build/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_0_X_2019-05-16-1100/src/RecoEgamma/PhotonIdentification/plugins/PhotonMVAValueMapProducer.cc 


[cmsbuild]

Comparison not run due to Build errors (RelVals and Igprof tests were also skipped)

[guitargeek]

Oh, sorry, I must have messed up my build environment somehow and I didn't notice that actually nothing works now... I'll come back to that later.

[cmsbuild]

+1
Tested at: e6519fe
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-7b607b/756/summary.html

[cmsbuild]

Comparison job queued.

[cmsbuild]

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-7b607b/756/summary.html

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 4 differences found in the comparisons
• DQMHistoTests: Total files compared: 33
• DQMHistoTests: Total histograms compared: 3210222
• DQMHistoTests: Total failures: 2
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 3209886
• DQMHistoTests: Total skipped: 334
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 32 files compared)
• Checked 137 log files, 14 edm output root files, 33 DQM output files

[perrotta]

+1

• Cleaning and simplification of the MVA infrastructure implemented as anticipated in the PR description
• Jenkins tests pass, with no changes in output, as expected

[santocch]

+1

[slava77]

@peruzzim @fgolf
xpog signature is needed here (now waiting for 7 days).
Please check and sign or comment.

[peruzzim]

+xpog
changes in NanoAOD are just to adapt to new calling interface of EGM modules

[cmsbuild]

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

[fabiocos]

+1

@guitargeek I understand that this development is not primarily meant for backport for UL, but it is more oriented to the future

[guitargeek]

Yes, except for the tiny part of this PR which fixes the electron ID in FWLike after it was broken in 10_6_X with #26486 this is all for the future. Also for the tiny FWLite part that might be worth to backport: I guess if nobody complains we are good here.