Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add DeepMET into NanoAOD for UltraLegacy in 10_6_X (backport of 30291 and 30926) #31120

Merged
merged 9 commits into from Aug 26, 2020

Conversation

yongbinfeng
Copy link
Contributor

PR description:

Backport DeepMET NanoAOD integration into CMSSW_10_6_X, such that it could be included in UL Nano. More description of DeepMET can be found in the orignal PR. (#30291). Most of the changes in PhysicsTools/PatAlgos/plugins/RecoMETExtractor.cc come from the code-format checks. Also backport #30926 to fix the break condition.

For the ultra legacy (run2_miniAOD_devel) DeepMETs will not be computed on the fly, but to be extracted from MiniAOD. For other eras DeepMETs will be computed on the fly and saved to Nano.

PR validation:

Check with different eras and work as expected. Also passed the runTheMatrix.py without errors.

if this PR is a backport please specify the original PR and why you need to backport that PR:

Backport of #30291 and #30926

@steggema @intrepid42

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 11, 2020

A new Pull Request was created by @yongbinfeng (Yongbin Feng) for CMSSW_10_6_X.

It involves the following packages:

PhysicsTools/NanoAOD
PhysicsTools/PatAlgos
PhysicsTools/PatUtils
RecoMET/METPUSubtraction

@perrotta, @gouskos, @cmsbuild, @fgolf, @slava77, @jpata, @mariadalfonso, @santocch, @peruzzim can you please review it and eventually sign? Thanks.
@rappoccio, @gouskos, @hatakeyamak, @emilbols, @peruzzim, @seemasharmafnal, @mmarionncern, @ahinzmann, @smoortga, @jdolen, @ferencek, @jdamgov, @nhanvtran, @gkasieczka, @schoef, @andrzejnovak, @clelange, @riga, @JyothsnaKomaragiri, @mverzett, @gpetruc, @mariadalfonso this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@slava77
Copy link
Contributor

slava77 commented Aug 11, 2020

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 11, 2020

The tests are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+1
Tested at: 78461c1
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0e5a5a/8708/summary.html
CMSSW: CMSSW_10_6_X_2020-08-11-1100
SCRAM_ARCH: slc7_amd64_gcc700

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • ROOTFileChecks: Some differences in event products or their sizes found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 3214618
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3214283
  • DQMHistoTests: Total skipped: 334
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.758 KiB( 33 files compared)
  • DQMHistoSizes: changed ( 1325.7 ): 0.758 KiB Physics/NanoAODDQM
  • Checked 140 log files, 14 edm output root files, 34 DQM output files

@perrotta
Copy link
Contributor

perrotta commented Aug 12, 2020

backport of #30291
backport of #30926

@yongbinfeng
Copy link
Contributor Author

@yongbinfeng
there is a merge conflict in PhysicsTools/NanoAOD/python/met_cff.py now.
Please update this PR.

@slava77 I used the 'resolve conflicts' from this webpage and it seems to have synchronized with all the other updates and made the commit very heavy. (The diff is still clean though.) Is it fine doing this? Or should I do a rebase (or something else) instead? Thanks!

@slava77
Copy link
Contributor

slava77 commented Aug 24, 2020

@yongbinfeng
there is a merge conflict in PhysicsTools/NanoAOD/python/met_cff.py now.
Please update this PR.

@slava77 I used the 'resolve conflicts' from this webpage and it seems to have synchronized with all the other updates and made the commit very heavy. (The diff is still clean though.) Is it fine doing this? Or should I do a rebase (or something else) instead? Thanks!

which web page?
Did you follow the rebase-topic from http://cms-sw.github.io/tutorial-resolve-conflicts.html#the-above-is-all-great-stuff-but-i-need-a-quick-recipe ?

In the context of the PR the commit diff is rather simple 2703a46
So, this is an acceptable way.

@yongbinfeng
Copy link
Contributor Author

@yongbinfeng
there is a merge conflict in PhysicsTools/NanoAOD/python/met_cff.py now.
Please update this PR.

@slava77 I used the 'resolve conflicts' from this webpage and it seems to have synchronized with all the other updates and made the commit very heavy. (The diff is still clean though.) Is it fine doing this? Or should I do a rebase (or something else) instead? Thanks!

which web page?
Did you follow the rebase-topic from http://cms-sw.github.io/tutorial-resolve-conflicts.html#the-above-is-all-great-stuff-but-i-need-a-quick-recipe ?

Sorry I meant: if there are conflicts, at the bottom of this page there is an option 'resolve conflicts', offered by github to resolve the conflicts interactively. I should have checked the CMSSW resolve-conflicts instructions more carefully.

In the context of the PR the commit diff is rather simple 2703a46
So, this is an acceptable way.

Thanks for confirming this!

@cmsbuild
Copy link
Contributor

+1
Tested at: 2703a46
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0e5a5a/8884/summary.html
CMSSW: CMSSW_10_6_X_2020-08-24-1100
SCRAM_ARCH: slc7_amd64_gcc700

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • ROOTFileChecks: Some differences in event products or their sizes found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 3214614
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3214279
  • DQMHistoTests: Total skipped: 334
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.758 KiB( 33 files compared)
  • DQMHistoSizes: changed ( 1325.7 ): 0.758 KiB Physics/NanoAODDQM
  • Checked 140 log files, 14 edm output root files, 34 DQM output files

@mariadalfonso
Copy link
Contributor

+xpog
the deepMET is added for previous eras or recomputed when the run2_miniAOD_devel is active.

@ahinzmann
Copy link
Contributor

Doesn't run2_miniAOD_devel need to be renamed to run2_miniAOD_UL? See #31072.

@mariadalfonso
Copy link
Contributor

We decided to use uniformly the run2_miniAOD_devel and we will change later
#31065 (comment)

Decoupling the new mini and new nano give us some flexibility.

@slava77
Copy link
Contributor

slava77 commented Aug 25, 2020

+1

for #31120 2703a46

  • since the last reco signoff, this was updated in PhysicsTools/NanoAOD/python/met_cff.py to resolve a conflict in a context line (a somewhat trivial change, which is also not in the reco category)

@santocch
Copy link

+1

@cmsbuild
Copy link
Contributor

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

@qliphy
Copy link
Contributor

qliphy commented Aug 26, 2020

+1

@cmsbuild cmsbuild merged commit 65d478b into cms-sw:CMSSW_10_6_X Aug 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants