Include FSR for electrons (in addition to muons) #36323

vpicco · 2021-12-01T16:41:51Z

PR description:

As discussed in the XPOG meeting on Nov, 10, this PR adds:

FSR for electrons as well as for muons. A single collection of FsrPhotons is stored, with indexes "muonIdx" and "electronIdx" to the closest muon or electron. Either of the indexes is always -1. Note that (as it was before) more than one photon can in principle be matched to the same lepton, so that "masking" of different photons or "stealing" by other leptons can be addressed at analysis level if needed.
Electrons now have fsrPhotonIdx, like it was for muons.
FSR are collected down to the minimum lepton pT, and with no gap in the overlap region (was: pt_mu>20 and eta_gamma outside [1.4, 1.6])

PR validation:

Tested running on a RelVal sample and compared with the previous muon-only implementation.

Notes

Not sure of how PhysicsTools/NanoAOD/python/nanoDQM_cfi.py should be updated. Tried running prepareDQM.py, with no success. @mariadalfonso can you please advise on this?

@namapane pls follow

cmsbuild · 2021-12-01T16:53:21Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36323/27062

This PR adds an extra 36KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File PhysicsTools/NanoAOD/python/nano_cff.py modified in PR(s): Refactoring gen weight storage in EDM + Nano integration #32167, [PPS][NanoAOD] Generator-level proton information #36080

cmsbuild · 2021-12-01T16:53:47Z

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

It involves the following packages:

CommonTools/RecoUtils (analysis)
PhysicsTools/NanoAOD (xpog)

@cmsbuild, @santocch, @mariadalfonso, @gouskos, @fgolf can you please review it and eventually sign? Thanks.
@gpetruc, @swertz this is something you requested to watch as well.
@perrotta, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

mariadalfonso · 2021-12-01T18:29:13Z

please test

cmsbuild · 2021-12-01T21:33:21Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a45494/20912/summary.html
COMMIT: 0e42c26
CMSSW: CMSSW_12_2_X_2021-12-01-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/36323/20912/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

No significant changes to the logs found
Reco comparison results: 26 differences found in the comparisons
DQMHistoTests: Total files compared: 41
DQMHistoTests: Total histograms compared: 3041955
DQMHistoTests: Total failures: 41
DQMHistoTests: Total nulls: 1
DQMHistoTests: Total successes: 3041891
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: -0.004 KiB( 40 files compared)
DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
Checked 175 log files, 37 edm output root files, 41 DQM output files
TriggerResults: no differences found

cmsbuild · 2021-12-02T14:47:46Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36323/27084

This PR adds an extra 16KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File PhysicsTools/NanoAOD/python/nano_cff.py modified in PR(s): Refactoring gen weight storage in EDM + Nano integration #32167, [PPS][NanoAOD] Generator-level proton information #36080

Code check has found code style and quality issues which could be resolved by applying following patch(s)

code-format:
https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36323/27084/code-format.patch
e.g. curl -k https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36323/27084/code-format.patch | patch -p1
You can also run scram build code-format to apply code format directly

cmsbuild · 2021-12-02T14:57:49Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36323/27087

This PR adds an extra 36KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File PhysicsTools/NanoAOD/python/nano_cff.py modified in PR(s): Refactoring gen weight storage in EDM + Nano integration #32167, [PPS][NanoAOD] Generator-level proton information #36080

cmsbuild · 2022-01-10T14:05:09Z

Pull request #36323 was updated. @cmsbuild, @santocch, @mariadalfonso, @gouskos, @fgolf can you please check and sign again.

perrotta · 2022-01-10T14:47:27Z

CommonTools/RecoUtils/plugins/LeptonFSRProducer.cc

+      double dR = deltaR(muon->eta(), muon->phi(), pc->eta(), pc->phi());
+      if (dR < dRMin && dR > 0.0001 && dR / pc->pt() / pc->pt() < drEtCut) {


Event though also this one could get optimized without loosing readability, e.g..:

Suggested change

double dR = deltaR(muon->eta(), muon->phi(), pc->eta(), pc->phi());

if (dR < dRMin && dR > 0.0001 && dR / pc->pt() / pc->pt() < drEtCut) {

double dR = deltaR2(muon->eta(), muon->phi(), pc->eta(), pc->phi());

if (dR < dRMin * dRMin && dR > 0.0001 * 0.0001) {

dR = std::sqrt(dR);

if (dR < drEtCut * pc->pt() * pc->pt()) {

etc...

Yes but this looks like a very tiny optimization, given that the number of candidates for FSR is small and the sqrt is done anyhow for those passing the dR cut (unless we also change the drEtCut). To me it seems to bring more confusion than speedup... but if you insist...

Yes but this looks like a very tiny optimization, given that the number of candidates for FSR is small and the sqrt is done anyhow for those passing the dR cut (unless we also change the drEtCut). To me it seems to bring more confusion than speedup... but if you insist...

No, for this one I don't insist...

cmsbuild · 2022-01-10T15:46:48Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36323/27702

This PR adds an extra 36KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File PhysicsTools/NanoAOD/python/nano_cff.py modified in PR(s): [PPS][NanoAOD] Generator-level proton information #36080, Refactoring gen weight storage in EDM + Nano integration #32167

cmsbuild · 2022-01-10T15:47:07Z

Pull request #36323 was updated. @cmsbuild, @santocch, @mariadalfonso, @gouskos, @fgolf can you please check and sign again.

perrotta · 2022-01-10T15:52:20Z

please test

cmsbuild · 2022-01-11T02:15:55Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a45494/21600/summary.html
COMMIT: 8546b67
CMSSW: CMSSW_12_3_X_2022-01-10-1100/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/36323/21600/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

No significant changes to the logs found
Reco comparison results: 28 differences found in the comparisons
DQMHistoTests: Total files compared: 43
DQMHistoTests: Total histograms compared: 3461659
DQMHistoTests: Total failures: 59
DQMHistoTests: Total nulls: 1
DQMHistoTests: Total successes: 3461577
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: -0.004 KiB( 42 files compared)
DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
Checked 181 log files, 42 edm output root files, 43 DQM output files
TriggerResults: no differences found

perrotta · 2022-01-11T11:30:43Z

@cms-sw/xpog-l2 last updates were mostly code cleaning, and I think you can confirm your previous signature: please conferm it anyhow with your "+1", if so

mariadalfonso · 2022-01-11T18:36:00Z

+xpog

quality code update since last signoff #36323 (comment)

perrotta · 2022-01-11T18:40:57Z

+1

perrotta · 2022-01-11T18:42:12Z

merge
(bypassing analysis signature)

santocch · 2022-01-18T08:24:23Z

+1

cmsbuild · 2022-01-18T08:24:40Z

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.

Include FSR for electrons (in addition to muons)

0e42c26

cmsbuild added this to the CMSSW_12_2_X milestone Dec 1, 2021

cmsbuild added analysis-pending code-checks-pending orp-pending pending-signatures tests-pending xpog-pending labels Dec 1, 2021

cmsbuild added code-checks-approved and removed code-checks-pending labels Dec 1, 2021

cmsbuild added tests-started and removed tests-pending labels Dec 1, 2021

cmsbuild added tests-approved code-checks-pending tests-pending and removed tests-started tests-approved code-checks-approved labels Dec 1, 2021

cmsbuild added code-checks-rejected and removed code-checks-pending labels Dec 2, 2021

ensure that either fsrPhoton_muonIdx OR fsrPhoton_electronIdx are set

732cdf9

vpicco force-pushed the NANO_FSRForEle branch from afe7b95 to 732cdf9 Compare December 2, 2021 14:51

cmsbuild added code-checks-pending and removed code-checks-rejected labels Dec 2, 2021

perrotta reviewed Jan 10, 2022

View reviewed changes

More reviews from @perrotta

8546b67

cmsbuild added code-checks-pending and removed code-checks-approved labels Jan 10, 2022

cmsbuild added code-checks-approved and removed code-checks-pending labels Jan 10, 2022

cmsbuild added tests-started and removed tests-pending labels Jan 10, 2022

cmsbuild added tests-approved and removed tests-started labels Jan 11, 2022

cmsbuild added xpog-approved and removed xpog-pending labels Jan 11, 2022

cmsbuild added orp-approved and removed orp-pending labels Jan 11, 2022

cmsbuild merged commit 0c56c1e into cms-sw:master Jan 11, 2022

cmsbuild added analysis-approved fully-signed and removed analysis-pending pending-signatures labels Jan 18, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Include FSR for electrons (in addition to muons) #36323

Include FSR for electrons (in addition to muons) #36323

vpicco commented Dec 1, 2021

cmsbuild commented Dec 1, 2021

cmsbuild commented Dec 1, 2021

mariadalfonso commented Dec 1, 2021

cmsbuild commented Dec 1, 2021

cmsbuild commented Dec 2, 2021

cmsbuild commented Dec 2, 2021

cmsbuild commented Jan 10, 2022

perrotta Jan 10, 2022

namapane Jan 10, 2022

perrotta Jan 10, 2022

cmsbuild commented Jan 10, 2022

cmsbuild commented Jan 10, 2022

perrotta commented Jan 10, 2022

cmsbuild commented Jan 11, 2022

perrotta commented Jan 11, 2022

mariadalfonso commented Jan 11, 2022

perrotta commented Jan 11, 2022

perrotta commented Jan 11, 2022

santocch commented Jan 18, 2022

cmsbuild commented Jan 18, 2022

		double dR = deltaR(muon->eta(), muon->phi(), pc->eta(), pc->phi());
		if (dR < dRMin && dR > 0.0001 && dR / pc->pt() / pc->pt() < drEtCut) {

-      double dR = deltaR(muon->eta(), muon->phi(), pc->eta(), pc->phi());
-      if (dR < dRMin && dR > 0.0001 && dR / pc->pt() / pc->pt() < drEtCut) {
+      double dR = deltaR2(muon->eta(), muon->phi(), pc->eta(), pc->phi());
+      if (dR < dRMin * dRMin && dR > 0.0001 * 0.0001) {
+          dR = std::sqrt(dR);
+          if (dR < drEtCut * pc->pt() * pc->pt()) {

Include FSR for electrons (in addition to muons) #36323

Include FSR for electrons (in addition to muons) #36323

Conversation

vpicco commented Dec 1, 2021

PR description:

PR validation:

Notes

cmsbuild commented Dec 1, 2021

cmsbuild commented Dec 1, 2021

mariadalfonso commented Dec 1, 2021

cmsbuild commented Dec 1, 2021

Comparison Summary

cmsbuild commented Dec 2, 2021

cmsbuild commented Dec 2, 2021

cmsbuild commented Jan 10, 2022

perrotta Jan 10, 2022

Choose a reason for hiding this comment

namapane Jan 10, 2022

Choose a reason for hiding this comment

perrotta Jan 10, 2022

Choose a reason for hiding this comment

cmsbuild commented Jan 10, 2022

cmsbuild commented Jan 10, 2022

perrotta commented Jan 10, 2022

cmsbuild commented Jan 11, 2022

Comparison Summary

perrotta commented Jan 11, 2022

mariadalfonso commented Jan 11, 2022

perrotta commented Jan 11, 2022

perrotta commented Jan 11, 2022

santocch commented Jan 18, 2022

cmsbuild commented Jan 18, 2022