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

Clean/rename FromMultiCl HGCal egamma collections #34439

Merged

Conversation

SohamBhattacharya
Copy link
Contributor

This PR is made in collaboration with @hatakeyamak , and is related to the cleaning discussed in [1].
Tagging @beaudett and @archiron , who are looking at the e-gamma Validation/DQM.
The PR will clean the *FromMultiCl HGCal egamma sequences as they've have switched to TICL based reconstruction, and there's no need to run the sim-cluster based sequences for HGCal electrons and photons. So for example:

  1. particleFlowClusterHGCalFromMultiCl will no longer exist as particleFlowClusterHGCal is TICL based.
    The sim-cluster based particleFlowClusterHGCal is still kept (now called particleFlowClusterHGCalFromSimCl, and packed into _phase2_hgcal_simPFTask [2]), if it's required by other modules.

  2. At RECO: ecalDrivenGsfElectronsFromMultiCl/photonsFromMultiCl --> ecalDrivenGsfElectronsHGC/photonsHGC.
    The new collections now contain only HGCal electrons and photons due to [3, 4] (earlier they used to contain the barrel too).
    The plot shows the eta distributions of ecalDrivenGsfElectronsHGC (blue) and ecalDrivenGsfElectronsFromMultiCl (red).
    hgcal_ele_eta_1

  3. At MINIAOD: slimmedElectronsFromMultiCl/slimmedPhotonsFromMultiCl --> slimmedElectronsHGC/slimmedPhotonsHGC. These collections should remain the same, as it's just a renaming.
    The plot shows the eta distributions of slimmedElectronsHGC (blue) and slimmedElectronsFromMultiCl (red).
    slimmedElectronsHGC_eta

[1] cms-sw/cmssw#32475 (comment)
[2] https://github.com/SohamBhattacharya/cmssw/blob/clean_FromMultiCl_12_0_0_pre3/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py#L76
[3] https://github.com/SohamBhattacharya/cmssw/blob/clean_FromMultiCl_12_0_0_pre3/RecoEgamma/EgammaElectronProducers/python/ecalDrivenGsfElectronCoresHGC_cff.py#L6
[4] https://github.com/SohamBhattacharya/cmssw/blob/clean_FromMultiCl_12_0_0_pre3/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py#L20

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34439/23866

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

  • .gitignore (core)
  • DQMOffline/EGamma (dqm)
  • PhysicsTools/PatAlgos (reconstruction)
  • RecoEcal/Configuration (reconstruction)
  • RecoEcal/EgammaClusterProducers (reconstruction)
  • RecoEgamma/Configuration (reconstruction)
  • RecoEgamma/EgammaElectronProducers (reconstruction)
  • RecoEgamma/EgammaPhotonProducers (reconstruction)
  • RecoEgamma/EgammaTools (reconstruction)
  • RecoLocalCalo/Configuration (reconstruction)
  • RecoParticleFlow/Configuration (reconstruction)
  • RecoParticleFlow/PFClusterProducer (reconstruction)
  • RecoParticleFlow/PFSimProducer (reconstruction)
  • RecoParticleFlow/PFTracking (reconstruction)
  • RecoTauTag/RecoTau (reconstruction)
  • TrackingTools/Configuration (reconstruction)
  • TrackingTools/GsfTracking (reconstruction)
  • Validation/HGCalValidation (dqm)
  • Validation/RecoEgamma (dqm)

@perrotta, @smuzaffar, @andrius-k, @Dr15Jones, @kmaeshima, @ErnestaP, @ahmad3213, @cmsbuild, @makortel, @jfernan2, @slava77, @jpata, @rvenditti can you please review it and eventually sign? Thanks.
@emilbols, @gouskos, @felicepantaleo, @jainshilpi, @hatakeyamak, @rappoccio, @argiro, @bsunanda, @pfs, @thomreis, @mbluj, @ahinzmann, @varuns23, @seemasharmafnal, @mmarionncern, @sethzenz, @jdolen, @makortel, @JanFSchulte, @lgray, @apsallid, @simonepigazzini, @rociovilar, @vandreev11, @Sam-Harper, @cbernet, @GiacomoSguazzoni, @rovere, @VinInn, @cseez, @bellan, @nhanvtran, @gkasieczka, @schoef, @ebrondol, @mtosi, @dgulhan, @clelange, @jdamgov, @rchatter, @swozniewski, @JyothsnaKomaragiri, @sobhatta, @lecriste, @afiqaize, @gpetruc, @mariadalfonso, @mmusich, @andrzejnovak, @ram1123 this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy, @perrotta you are the release manager for this.

cms-bot commands are listed here

@perrotta
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0e3b41/16694/summary.html
COMMIT: cc9bb11
CMSSW: CMSSW_12_0_X_2021-07-11-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34439/16694/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
  • ROOTFileChecks: Some differences in event products or their sizes found
  • Reco comparison results: 2194 differences found in the comparisons
  • DQMHistoTests: Total files compared: 38
  • DQMHistoTests: Total histograms compared: 2787742
  • DQMHistoTests: Total failures: 4054
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2783687
  • DQMHistoTests: Total skipped: 0
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.004 KiB( 37 files compared)
  • DQMHistoSizes: changed ( 312.0 ): 0.004 KiB MessageLogger/Warnings
  • Checked 160 log files, 37 edm output root files, 38 DQM output files
  • TriggerResults: no differences found

@jfernan2
Copy link
Contributor

@SohamBhattacharya I understand the seen changes are in synch with the PR description, but if you can confirm please:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/baseLineComparisons/CMSSW_12_0_X_2021-07-11-2300+0e3b41/44003/dqm-histo-comparison-summary.html
Thanks!

.gitignore Outdated
@@ -5,3 +5,5 @@ __init__.py
#*#
*~
*.pb
*.root
*replace.py
Copy link
Contributor

@makortel makortel Jul 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove these changes (also from the commit history). Addition of *.root could be discussed, but it would be better done as a separate PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@makortel These changes were unintended -- I will remove them. Sorry for the noise.

@SohamBhattacharya
Copy link
Contributor Author

@SohamBhattacharya I understand the seen changes are in synch with the PR description, but if you can confirm please:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/baseLineComparisons/CMSSW_12_0_X_2021-07-11-2300+0e3b41/44003/dqm-histo-comparison-summary.html
Thanks!

@jfernan2 I went through the change log, and the changes are related to the *FromMultiCl, particleFlowClusterHGCal, and particleFlowSuperClusterHGCal collections, which is expected.

@slava77
Copy link
Contributor

slava77 commented Aug 9, 2021

+reconstruction

for #34439 a361668

  • updates since the last reco signoff were in DQMOffline/EGamma

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 9, 2021

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0e3b41/17649/summary.html
COMMIT: a361668
CMSSW: CMSSW_12_1_X_2021-08-09-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34439/17649/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

  • 11602.011602.0_SingleElectronPt35+2021+SingleElectronPt35_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA/step2_SingleElectronPt35+2021+SingleElectronPt35_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA.log
  • 11601.011601.0_SingleElectronPt10+2021+SingleElectronPt10_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA/step2_SingleElectronPt10+2021+SingleElectronPt10_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA.log
  • 11603.011603.0_SingleElectronPt1000+2021+SingleElectronPt1000_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA/step2_SingleElectronPt1000+2021+SingleElectronPt1000_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA.log
Expand to see more relval errors ...

Comparison Summary

Summary:

  • No significant changes to the logs found
  • ROOTFileChecks: Some differences in event products or their sizes found
  • Reco comparison results: 2365 differences found in the comparisons
  • DQMHistoTests: Total files compared: 39
  • DQMHistoTests: Total histograms compared: 2997858
  • DQMHistoTests: Total failures: 2317
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2995519
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -16.048 KiB( 38 files compared)
  • DQMHistoSizes: changed ( 23234.0,... ): -2704.699 KiB Egamma/stdPhotonAnalyzerHGCalFromMultiCl
  • DQMHistoSizes: changed ( 23234.0,... ): 2701.219 KiB Egamma/stdPhotonAnalyzerHGCal
  • DQMHistoSizes: changed ( 23234.0,... ): -0.531 KiB Egamma/Electrons
  • Checked 165 log files, 37 edm output root files, 39 DQM output files
  • TriggerResults: no differences found

@srimanob
Copy link
Contributor

@cmsbuild please test

Give it another try on relvals input test

@srimanob
Copy link
Contributor

+Upgrade

As the PR title, this PR is to clean and rename HGCal EGamma collections. Change in collection name in DQM is expected.

@cmsbuild
Copy link
Contributor

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0e3b41/17656/summary.html
COMMIT: a361668
CMSSW: CMSSW_12_1_X_2021-08-09-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34439/17656/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

  • 11601.011601.0_SingleElectronPt10+2021+SingleElectronPt10_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA/step2_SingleElectronPt10+2021+SingleElectronPt10_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA.log
  • 11602.011602.0_SingleElectronPt35+2021+SingleElectronPt35_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA/step2_SingleElectronPt35+2021+SingleElectronPt35_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA.log
  • 11604.011604.0_SingleGammaPt10+2021+SingleGammaPt10_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA/step2_SingleGammaPt10+2021+SingleGammaPt10_pythia8_GenSimINPUT+Digi+Reco+HARVEST+ALCA.log
Expand to see more relval errors ...

Comparison Summary

Summary:

  • No significant changes to the logs found
  • ROOTFileChecks: Some differences in event products or their sizes found
  • Reco comparison results: 2373 differences found in the comparisons
  • DQMHistoTests: Total files compared: 39
  • DQMHistoTests: Total histograms compared: 2997858
  • DQMHistoTests: Total failures: 2328
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2995507
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -16.052 KiB( 38 files compared)
  • DQMHistoSizes: changed ( 23234.0,... ): -2704.699 KiB Egamma/stdPhotonAnalyzerHGCalFromMultiCl
  • DQMHistoSizes: changed ( 23234.0,... ): 2701.219 KiB Egamma/stdPhotonAnalyzerHGCal
  • DQMHistoSizes: changed ( 23234.0,... ): -0.531 KiB Egamma/Electrons
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 165 log files, 37 edm output root files, 39 DQM output files
  • TriggerResults: no differences found

@jfernan2
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (but tests are reportedly failing). This pull request will now be reviewed by the release team before it's merged. @perrotta, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

@perrotta
Copy link
Contributor

+1

  • All comments received during the review have been addressed, results are in agreement with the expectations

@perrotta
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit 8f85f65 into cms-sw:master Aug 10, 2021
SissonJ pushed a commit to SissonJ/cmssw that referenced this pull request Aug 23, 2021
SissonJ pushed a commit to SissonJ/cmssw that referenced this pull request Aug 23, 2021
SissonJ pushed a commit to SissonJ/cmssw that referenced this pull request Aug 23, 2021
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

10 participants