[12_6_X] Nano: fix and additions to collection matching, remove cross-cleaning

[swertz]

PR description:

Fill in a few gaps in the matching between collections in Nano, remove the object cleanmask branches.

PR validation:

Done in #40162

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:

Backport of #40162, relevant for a 12_6 nano

[swertz]

enable nano

[cmsbuild]

A new Pull Request was created by @swertz (Sbastien Wertz) for CMSSW_12_6_X.

It involves the following packages:

• PhysicsTools/NanoAOD (xpog)
• PhysicsTools/PatAlgos (xpog, reconstruction)

@cmsbuild, @mandrenguyen, @clacaputo, @swertz, @vlimant can you please review it and eventually sign? Thanks.
@AlexDeMoor, @rappoccio, @gouskos, @jdolen, @JyothsnaKomaragiri, @ahinzmann, @AnnikaStein, @schoef, @emilbols, @jdamgov, @mbluj, @nhanvtran, @gkasieczka, @hatakeyamak, @gpetruc, @azotz, @mariadalfonso, @demuller, @andrzejnovak, @seemasharmafnal, @mmarionncern this is something you requested to watch as well.
@perrotta, @dpiparo, @rappoccio you are the release manager for this.

cms-bot commands are listed here

• Backported from Nano: fix and additions to collection matching, remove cross-cleaning #40162

[swertz]

please test

[cmsbuild]

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-029d38/29447/summary.html
COMMIT: fa4d994
CMSSW: CMSSW_12_6_X_2022-12-03-1100/el8_amd64_gcc10
Additional Tests: NANO
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/40234/29447/install.sh to create a dev area with all the needed externals and cmssw changes.

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

• @swertz [12_6_X] Nano: restore Run2/3 consistency between electron/photon IDs; remove scale+smearing correction for Run3 #40224
• @cms-tsg-storm HLT menu development for 12_6_X (1/N) #40221

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-029d38/29447/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-029d38/29447/git-merge-result

Comparison Summary

Summary:

• No significant changes to the logs found
• ROOTFileChecks: Some differences in event products or their sizes found
• Reco comparison results: 326 differences found in the comparisons
• DQMHistoTests: Total files compared: 48
• DQMHistoTests: Total histograms compared: 3416500
• DQMHistoTests: Total failures: 45
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 3416433
• DQMHistoTests: Total skipped: 22
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: -72.97200000000001 KiB( 47 files compared)
• DQMHistoSizes: changed ( 11634.0,... ): -8.928 KiB Physics/NanoAODDQM
• DQMHistoSizes: changed ( 13234.0,... ): -5.237 KiB Physics/NanoAODDQM
• DQMHistoSizes: changed ( 7.3,... ): -0.001 KiB HLT/Filters
• Checked 206 log files, 158 edm output root files, 48 DQM output files
• TriggerResults: no differences found

NANO Comparison Summary

Summary:

• No significant changes to the logs found
• ROOTFileChecks: Some differences in event products or their sizes found
• Reco comparison results: 273 differences found in the comparisons
• DQMHistoTests: Total files compared: 15
• DQMHistoTests: Total histograms compared: 14958
• DQMHistoTests: Total failures: 88
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 14870
• DQMHistoTests: Total skipped: 0
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: -74.515 KiB( 14 files compared)
• DQMHistoSizes: changed ( 2500.311,... ): -2.299 KiB Physics/NanoAODDQM
• DQMHistoSizes: changed ( 2500.331,... ): -1.192 KiB Physics/NanoAODDQM
• DQMHistoSizes: changed ( 2500.401,... ): -8.928 KiB Physics/NanoAODDQM
• DQMHistoSizes: changed ( 2500.511,... ): -5.237 KiB Physics/NanoAODDQM
• Checked 31 log files, 14 edm output root files, 15 DQM output files

Nano size comparison Summary:

Sample	kb/ev	ref kb/ev	diff kb/ev	ev/s/thd	ref ev/s/thd	diff rate	mem/thd	ref mem/thd
2500.31	2.200	2.213	-0.012 ( -0.6% )	9.02	8.76	+2.9%	1.586	1.596
2500.311	2.322	2.334	-0.012 ( -0.5% )	8.65	8.32	+3.9%	1.951	1.961
2500.312	2.276	2.288	-0.012 ( -0.5% )	8.80	8.51	+3.4%	1.946	1.956
2500.33	1.089	1.103	-0.014 ( -1.3% )	20.70	18.74	+10.5%	1.700	1.703
2500.331	1.388	1.403	-0.015 ( -1.1% )	15.23	14.26	+6.8%	1.845	1.854
2500.332	1.319	1.336	-0.017 ( -1.3% )	16.71	15.77	+5.9%	1.800	1.793
2500.4	2.097	2.109	-0.012 ( -0.6% )	9.54	9.64	-1.1%	1.481	1.495
2500.401	2.146	2.136	0.010 ( +0.5% )	9.62	9.63	-0.2%	1.298	1.315
2500.5	1.668	1.680	-0.012 ( -0.7% )	14.62	14.88	-1.7%	1.202	1.218
2500.501	1.711	1.707	0.004 ( +0.2% )	14.53	14.86	-2.2%	1.206	1.236
2500.51	1.071	1.075	-0.003 ( -0.3% )	26.58	27.40	-3.0%	1.493	1.508
2500.511	1.120	1.107	0.013 ( +1.2% )	26.56	26.87	-1.2%	1.519	1.544
2500.6	2.006	2.018	-0.012 ( -0.6% )	12.00	12.23	-1.9%	1.258	1.272
2500.601	2.057	2.047	0.010 ( +0.5% )	12.00	12.09	-0.7%	1.262	1.297

[swertz]

+1

(for some reason, changes from #40224 are also visible in the comparisons...)

[mandrenguyen]

backport of #40162

[mandrenguyen]

+reconstruction

[swertz]

+reconstruction

@mandrenguyen it is strange, the reconstruction-pending label is still there 🤔

[cmsbuild]

This pull request is fully signed and it will be integrated in one of the next CMSSW_12_6_X IBs (tests are also fine) and once validation in the development release cycle CMSSW_13_0_X is complete. This pull request will now be reviewed by the release team before it's merged. @perrotta, @dpiparo, @rappoccio (and backports should be raised in the release meeting by the corresponding L2)

[swertz]

@cms-sw/orp-l2 kind reminder, anything preventing this to go in?

[rappoccio]

@cms-sw/orp-l2 kind reminder, anything preventing this to go in?

We wait until the master branch is successfully integrated before doing the backports, doing this now.

[rappoccio]

+1