decouple EventContent_cff load from general purpose use of Merge.py

[slava77]

This should resolve #22933
The immediate problem is for Configuration/DataProcessing/python/Scenario.py, which defines the T0 config driver for production workflows:

• the Merge.py is needed for file merging functionality of the Scenario.py
• the EventContent_cff has to be also loaded for RECO or similar workflows and is normally supposed to be loaded only after the cms.Process object with a relevant era is created (done in the ConfigBuilder.py)
• In the current state the EventContent_cff is loaded in Merge.py for RECO and similar workflows before cms.Process object is defined. This is a bug.

This fix simply restricts loading of the EventContent_cff in the Merge.py only in merging context for NANO AOD purposes.

Tests:
python $CMSSW_BASE/src/Configuration/DataProcessing/test/RunMerge.py --input-files file:a.root --output-file file:b.root --mergeNANO
and then config dump to see that the result is as expected. The RunMerge is also made aware of mergeNANO.

python $CMSSW_BASE/src/Configuration/DataProcessing/test/RunPromptReco.py --scenario ppEra_Run2_2017_pp_on_XeXe --reco --aod --miniaod --dqmio --global-tag 92X_dataRun2_Express_v7 --lfn=file:raw.root
and then dump to see that _hiCentrality name actually shows up in the keep statements

[cmsbuild]

The code-checks are being triggered in jenkins.

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-22938/4324

[cmsbuild]

A new Pull Request was created by @slava77 (Slava Krutelyov) for master.

It involves the following packages:

Configuration/DataProcessing

@cmsbuild, @franzoni, @fabiocos, @davidlange6 can you please review it and eventually sign? Thanks.
@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

[slava77]

@cmsbuild please test

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/27447/console Started: 2018/04/11 22:37

[cmsbuild]

+1
Tested at: a462629
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-22938/27447/summary.html

[cmsbuild]

Comparison job queued.

[cmsbuild]

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

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 0 differences found in the comparisons
• DQMHistoTests: Total files compared: 29
• DQMHistoTests: Total histograms compared: 2505375
• DQMHistoTests: Total failures: 1
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2505198
• DQMHistoTests: Total skipped: 176
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 1.06 KiB( 23 files compared)
• Checked 119 log files, 9 edm output root files, 29 DQM output files

[fabiocos]

@slava77 indeed repeating the test of #22933 with this fix, the CTPPS and GEM event contents, that are added through modifiers, are now present in the regular outputCommands where they are expected to be.

[slava77]

@fabiocos
thank you for checking on your side.
I guess we are good to go with this and #22937

[fabiocos]

@slava77 yes, the Express configuration produced now is identical to the one with the version obtained removing the update to Merge.py that caused the problem. I do not see other possible validations without putting this code in production.

[fabiocos]

+operations

[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