NanoAODv6, config fixes for UL

[peruzzim]

PR description:

This PR fixes issues described in #28158, using modifiers that are loaded by Run2_201? eras to identify configuration changes that are linked to the year, and not to the MINIAOD input version for NANOAOD production.

It only changes the NANOAOD content when running on UL samples, doing nothing for 80X, 94X and 102X Run-2 samples.

PR validation:

Validated as usual within the nanoAOD integration setup, for both Run-2 and UL available samples.

[cmsbuild]

The code-checks are being triggered in jenkins.

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28196/12299

• This PR adds an extra 52KB to repository

• There are other open Pull requests which might conflict with changes you have proposed:

  • File Configuration/Eras/python/Era_Run2_2018_cff.py modified in PR(s): Select the unpacker to be run (between SCAL and MetaData) via Era modifier #27676
  • File PhysicsTools/NanoAOD/python/jets_cff.py modified in PR(s): Adding a fine-tuned version of the 'betastar' kind of variables. #26767, AOD changes from JME #28077
  • File PhysicsTools/NanoAOD/python/nano_cff.py modified in PR(s): ONNXRuntime-based implementation of DeepJet, DeepAK8 and DeepDoubleX #28112
  • File PhysicsTools/NanoAOD/python/taus_updatedMVAIds_cff.py modified in PR(s): Subject main tau ID payloads to global tag control #28063

[cmsbuild]

A new Pull Request was created by @peruzzim for master.

It involves the following packages:

Configuration/Eras
PhysicsTools/NanoAOD

@kpedro88, @peruzzim, @cmsbuild, @franzoni, @fgolf, @santocch, @fabiocos, @davidlange6 can you please review it and eventually sign? Thanks.
@makortel, @gpetruc, @Martin-Grunewald 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

[peruzzim]

please test workflow 1325.6,1325.7,1325.8,1329.1,136.7722,136.7952,136.8521

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/3006/console Started: 2019/10/17 12:17

[cmsbuild]

+1
Tested at: 974479b
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-71e169/3006/summary.html

[cmsbuild]

Comparison job queued.

[cmsbuild]

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-71e169/3006/summary.html

Comparison Summary:

• No significant changes to the logs found
• ROOTFileChecks: Some differences in event products or their sizes found
• Reco comparison results: 4 differences found in the comparisons
• DQMHistoTests: Total files compared: 34
• DQMHistoTests: Total histograms compared: 2961064
• DQMHistoTests: Total failures: 2
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2960721
• DQMHistoTests: Total skipped: 341
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
• Checked 147 log files, 16 edm output root files, 34 DQM output files

[peruzzim]

A clarification on this PR: this also includes the proper treatment of the choice of the HLT process name during NANOAOD:

• by default, HLT
• what is given at the cmsDriver.py option --hltProcess, if the option is given:

  cmssw/Configuration/Applications/python/ConfigBuilder.py

  Line 1691 in 5f1cd41

  self._options.customise_commands = self._options.customise_commands + "process.unpackedPatTrigger.triggerResults= cms.InputTag( 'TriggerResults::"+self._options.hltProcess+"' )\n"

[peruzzim]

+xpog

as expected, workflow 10824.0 shows difference due to the proper configuration

[fabiocos]

@peruzzim @chayanit @pgunnell @srimanob to be clear about #28196 (comment) : this is the structure in place without need for further developments, anyway to be used suitable NANOAODreHLT steps need to be defined in PyRelVal relval_steps.py as done already for RECO sequences

[fabiocos]

+operations

the update to Configuration/Eras looks coherent with the purpose of the PR

[fabiocos]

+1

[fabiocos]

merge

[santocch]

+1

[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 be automatically merged.