Update for BPHNano to solve issues with different compilers
We open this PR to solve the issues discussed in https://github.com/cms-sw/cmssw/issues/48332 Despite the fact that this issue was not reported for the production release, we will backport these changes in the master release.
There are also few changes on the code to solve some minor issues based on the feedback we received from the BPH experts.
FYI: @drkovalskyi @gkaratha @vmariani
cms-bot internal usage
-code-checks
Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-48385/45279
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-48385/45279/code-format.patch
e.g.
curl -k https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-48385/45279/code-format.patch | patch -p1You can also runscram build code-formatto apply code format directly
+code-checks
Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-48385/45280
A new Pull Request was created by @gmelachr for master.
It involves the following packages:
- PhysicsTools/BPHNano (xpog)
- PhysicsTools/NanoAOD (xpog)
@cmsbuild, @ftorrresd, @hqucms can you please review it and eventually sign? Thanks. @gpetruc this is something you requested to watch as well. @antoniovilela, @mandrenguyen, @rappoccio, @sextonkennedy you are the release manager for this.
cms-bot commands are listed here
enable nano
please test
+1
Size: This PR adds an extra 52KB to repository
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-e4c0b7/46874/summary.html
COMMIT: b2fddef7c9f6dcfdb462ba2263ac4b6671bd742d
CMSSW: CMSSW_15_1_X_2025-06-23-1100/el8_amd64_gcc12
Additional Tests: NANO
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/48385/46874/install.sh to create a dev area with all the needed externals and cmssw changes.
Comparison Summary
Summary:
- You potentially removed 4 lines from the logs
- Reco comparison results: 9 differences found in the comparisons
- DQMHistoTests: Total files compared: 50
- DQMHistoTests: Total histograms compared: 4058157
- DQMHistoTests: Total failures: 27
- DQMHistoTests: Total nulls: 0
- DQMHistoTests: Total successes: 4058110
- DQMHistoTests: Total skipped: 20
- DQMHistoTests: Total Missing objects: 0
- DQMHistoSizes: Histogram memory added: 0.0 KiB( 49 files compared)
- Checked 215 log files, 184 edm output root files, 50 DQM output files
- TriggerResults: no differences found
NANO Comparison Summary
Summary:
- You potentially removed 25 lines from the logs
- ROOTFileChecks: Some differences in event products or their sizes found
- Reco comparison results: 0 differences found in the comparisons
- DQMHistoTests: Total files compared: 22
- DQMHistoTests: Total histograms compared: 89100
- DQMHistoTests: Total failures: 0
- DQMHistoTests: Total nulls: 0
- DQMHistoTests: Total successes: 89100
- DQMHistoTests: Total skipped: 0
- DQMHistoTests: Total Missing objects: 0
- DQMHistoSizes: Histogram memory added: 0.0 KiB( 21 files compared)
- Checked 134 log files, 80 edm output root files, 22 DQM output files
- TriggerResults: no differences found
Nano size comparison Summary:
| workflow | id | kb/ev | ref kb/ev | diff kb/ev | ev/s/thd | ref ev/s/thd | diff rate | mem/thd | ref mem/thd |
|---|---|---|---|---|---|---|---|---|---|
| NANOmc106Xul16v2 | 2500.001 | 3.118 | 3.118 | 0.000 ( +0.0% ) | 3.72 | 3.73 | -0.2% | 2.698 | 2.802 |
| NANOmc106Xul17v2 | 2500.002 | 3.177 | 3.177 | 0.000 ( +0.0% ) | 3.48 | 3.47 | +0.4% | 3.137 | 3.288 |
| NANOmc106Xul18v2 | 2500.003 | 3.128 | 3.128 | 0.000 ( +0.0% ) | 3.55 | 3.54 | +0.1% | 3.107 | 3.269 |
| NANOdata106Xul16v2 | 2500.011 | 1.560 | 1.560 | 0.000 ( +0.0% ) | 6.10 | 6.14 | -0.7% | 2.745 | 2.845 |
| NANOdata106Xul17v2 | 2500.012 | 1.948 | 1.948 | 0.000 ( +0.0% ) | 4.14 | 4.16 | -0.4% | 2.880 | 3.025 |
| NANOdata106Xul18v2 | 2500.013 | 1.914 | 1.914 | 0.000 ( +0.0% ) | 4.93 | 4.96 | -0.6% | 2.866 | 2.990 |
| NANOmcUL16APVreMINI | 2500.021 | 0.022 | 0.022 | 0.000 ( +0.0% ) | 1.67 | 1.72 | -2.8% | 2.691 | 2.967 |
| NANOmcUL16reMINI | 2500.022 | 0.022 | 0.022 | 0.000 ( +0.0% ) | 1.56 | 1.63 | -4.1% | 2.677 | 2.981 |
| NANOmcUL17reMINI | 2500.023 | 0.022 | 0.022 | 0.000 ( +0.0% ) | 1.47 | 1.55 | -5.1% | 2.661 | 2.690 |
| NANOmcUL18reMINI | 2500.024 | 0.022 | 0.022 | 0.000 ( +0.0% ) | 1.27 | 1.31 | -3.1% | 2.814 | 3.104 |
| NANOdataUL16APVreMINI | 2500.031 | 0.035 | 0.035 | 0.000 ( +0.0% ) | 1.22 | 1.32 | -7.3% | 2.724 | 2.919 |
| NANOdataUL16reMINI | 2500.032 | 0.036 | 0.036 | 0.000 ( +0.0% ) | 1.45 | 1.51 | -3.9% | 2.673 | 2.939 |
| NANOdataUL17reMINI | 2500.033 | 0.037 | 0.037 | 0.000 ( +0.0% ) | 1.20 | 1.29 | -6.9% | 2.765 | 2.942 |
| NANOdataUL18reMINI | 2500.034 | 0.036 | 0.036 | 0.000 ( +0.0% ) | 1.20 | 1.27 | -5.3% | 2.751 | 2.928 |
| NANOmc130X | 2500.101 | 3.220 | 3.220 | 0.000 ( +0.0% ) | 4.24 | 4.28 | -0.8% | 3.062 | 3.232 |
| NANOdata130Xrun3 | 2500.111 | 1.799 | 1.799 | 0.000 ( +0.0% ) | 6.26 | 6.38 | -1.9% | 2.708 | 2.817 |
| ScoutingNANOdata130Xrun3 | 2500.131 | 0.771 | 0.771 | 0.000 ( +0.0% ) | 31.54 | 33.24 | -5.1% | 1.655 | 1.692 |
| muPOGNANOmc140X | 2500.221 | 2.065 | 2.065 | 0.000 ( +0.0% ) | 5.20 | 5.48 | -5.0% | 2.353 | 2.366 |
| EGMNANOmc140X | 2500.222 | 3.876 | 3.876 | 0.000 ( +0.0% ) | 3.74 | 3.96 | -5.5% | 2.482 | 2.725 |
| BTVNANOmc140X | 2500.223 | 10.607 | 10.607 | 0.000 ( +0.0% ) | 2.38 | 2.50 | -5.0% | 2.617 | 2.946 |
| jmeNANOmc140X | 2500.224 | 6.666 | 6.666 | 0.000 ( +0.0% ) | 1.09 | 1.14 | -4.3% | 2.487 | 2.790 |
| lepTrackInfoNANOmc140X | 2500.226 | 3.570 | 3.570 | 0.000 ( +0.0% ) | 3.74 | 3.95 | -5.2% | 2.477 | 2.714 |
| ScoutingNANOmc140X | 2500.227 | 1.486 | 1.486 | 0.000 ( +0.0% ) | 14.85 | 15.40 | -3.6% | 1.970 | 2.034 |
| ScoutingNANOwithPromptmc140X | 2500.228 | 4.474 | 4.474 | 0.000 ( +0.0% ) | 3.37 | 3.34 | +0.9% | 2.855 | 2.978 |
| muPOGNANO140Xrun3 | 2500.231 | 1.469 | 1.469 | 0.000 ( +0.0% ) | 7.10 | 7.60 | -6.6% | 2.509 | 2.643 |
| EGMNANOdata140Xrun3 | 2500.232 | 2.623 | 2.623 | 0.000 ( +0.0% ) | 5.37 | 5.67 | -5.2% | 2.987 | 3.019 |
| BTVNANOdata140Xrun3 | 2500.233 | 5.612 | 5.612 | 0.000 ( +0.0% ) | 3.50 | 3.72 | -5.8% | 3.218 | 3.231 |
| jmeNANOdata140Xrun3 | 2500.234 | 3.976 | 3.976 | 0.000 ( +0.0% ) | 1.43 | 1.46 | -2.4% | 2.784 | 2.865 |
| lepTrackInfoNANOdata140Xrun3 | 2500.236 | 2.413 | 2.413 | 0.000 ( +0.0% ) | 5.49 | 5.79 | -5.2% | 3.004 | 3.010 |
| ScoutingNANOdata140Xrun3 | 2500.237 | 1.101 | 1.101 | 0.000 ( +0.0% ) | 29.02 | 29.69 | -2.3% | 1.550 | 1.680 |
| ScoutingNANOwithPromptdata140Xrun3 | 2500.238 | 2.783 | 2.783 | 0.000 ( +0.0% ) | 5.15 | 5.03 | +2.3% | 3.152 | 3.248 |
| l1DPGNANO140Xrun3 | 2500.241 | 9.404 | 9.404 | 0.000 ( +0.0% ) | 7.11 | 7.04 | +1.0% | 1.922 | 1.938 |
| muDPGNANO140Xrun3 | 2500.242 | 10.331 | 10.331 | 0.000 ( +0.0% ) | 1.68 | 1.65 | +1.7% | 1.737 | 1.734 |
| muDPGNANOBkg140Xrun3 | 2500.243 | 2.712 | 2.712 | 0.000 ( +0.0% ) | 16.27 | 15.27 | +6.6% | 1.068 | 1.068 |
| hcalDPGNANO140Xrun3 | 2500.244 | 486.016 | 486.016 | 0.000 ( +0.0% ) | 1.15 | 1.15 | +0.3% | 1.714 | 1.722 |
| hcalDPGCalibNANO140Xrun3 | 2500.245 | 826.413 | 826.413 | 0.000 ( +0.0% ) | 1.55 | 1.54 | +0.6% | 1.682 | 1.767 |
| hcalDPGMCNANO140Xrun3 | 2500.251 | 645.333 | 645.333 | 0.000 ( +0.0% ) | 1.69 | 1.67 | +1.4% | 1.807 | 1.803 |
| NANOmc2024reMINI | 2500.261 | 0.021 | 0.021 | 0.000 ( +0.0% ) | 1.51 | 1.44 | +4.5% | 2.947 | 3.155 |
| NANOdata2024reMINI | 2500.271 | 0.036 | 0.036 | 0.000 ( +0.0% ) | 1.36 | 1.34 | +1.7% | 2.888 | 2.926 |
| NANOmc150X | 2500.301 | 3.218 | 3.218 | 0.000 ( +0.0% ) | 18.19 | 17.55 | +3.7% | 2.768 | 2.774 |
| NANOdata150X | 2500.311 | 2.144 | 2.144 | 0.000 ( +0.0% ) | 35.70 | 33.95 | +5.2% | 2.466 | 2.496 |
| NANOdata150X | 2500.312 | 2.630 | 2.630 | 0.000 ( +0.0% ) | 23.32 | 22.22 | +5.0% | 2.581 | 2.585 |
| muPOGNANOmc150X | 2500.321 | 2.255 | 2.255 | 0.000 ( +0.0% ) | 15.61 | 14.99 | +4.1% | 2.648 | 2.649 |
| EGMNANOmc150X | 2500.322 | 4.110 | 4.110 | 0.000 ( +0.0% ) | 14.20 | 13.52 | +5.0% | 2.744 | 2.746 |
| BTVNANOmc150X | 2500.323 | 10.551 | 10.551 | 0.000 ( +0.0% ) | 4.84 | 4.75 | +1.9% | 2.971 | 2.971 |
| jmeNANOmc150X | 2500.324 | 6.760 | 6.760 | 0.000 ( +0.0% ) | 1.35 | 1.34 | +0.8% | 2.891 | 2.939 |
| jmeNANOrePuppimc150X | 2500.325 | 6.762 | 6.762 | 0.000 ( +0.0% ) | 1.27 | 1.25 | +1.7% | 3.199 | 3.192 |
| lepTrackInfoNANOmc150X | 2500.326 | 3.720 | 3.720 | 0.000 ( +0.0% ) | 14.82 | 14.72 | +0.7% | 2.684 | 2.748 |
| ScoutingNANOmc150X | 2500.327 | 1.562 | 1.562 | 0.000 ( +0.0% ) | 18.98 | 19.09 | -0.5% | 2.504 | 2.553 |
| ScoutingNANOwithPromptmc150X | 2500.328 | 4.773 | 4.773 | 0.000 ( +0.0% ) | 10.58 | 10.59 | -0.1% | 2.926 | 2.986 |
| BPHNANOmc150X | 2500.329 | 4.108 | 4.127 | -0.019 ( -0.5% ) | 16.89 | 16.97 | -0.5% | 2.713 | 2.829 |
| muPOGNANO150Xrun3 | 2500.331 | 1.125 | 1.125 | 0.000 ( +0.0% ) | 25.43 | 24.04 | +5.8% | 2.409 | 2.397 |
| EGMNANOdata150Xrun3 | 2500.332 | 2.985 | 2.985 | 0.000 ( +0.0% ) | 21.64 | 21.42 | +1.0% | 2.494 | 2.492 |
| BTVNANOdata150Xrun3 | 2500.333 | 7.971 | 7.971 | 0.000 ( +0.0% ) | 5.76 | 5.71 | +1.0% | 2.685 | 2.713 |
| jmeNANOdata150Xrun3 | 2500.334 | 4.349 | 4.349 | 0.000 ( +0.0% ) | 1.63 | 1.64 | -0.8% | 2.405 | 2.650 |
| jmeNANOrePuppidata150Xrun3 | 2500.335 | 4.332 | 4.332 | 0.000 ( +0.0% ) | 1.44 | 1.43 | +0.5% | 2.672 | 2.916 |
| lepTrackInfoNANOdata150Xrun3 | 2500.336 | 2.625 | 2.625 | 0.000 ( +0.0% ) | 23.80 | 24.26 | -1.9% | 2.230 | 2.481 |
| ScoutingNANOdata150Xrun3 | 2500.337 | 1.737 | 1.737 | 0.000 ( +0.0% ) | 30.87 | 30.95 | -0.3% | 1.692 | 1.702 |
| ScoutingNANOwithPromptdata150Xrun3 | 2500.338 | 2.601 | 2.601 | 0.000 ( +0.0% ) | 17.47 | 17.39 | +0.5% | 2.659 | 2.811 |
| BPHNANOdata150Xrun3 | 2500.339 | 2.604 | 2.632 | -0.028 ( -1.1% ) | 34.56 | 33.27 | +3.9% | 2.542 | 2.554 |
| TTbarMINIAOD10.6_UL18v2 | 2500.901 | 1.819 | 1.819 | 0.000 ( +0.0% ) | 29.78 | 29.54 | +0.8% | 1.938 | 1.941 |
| TTbarMINIAOD14.0 | 2500.902 | 1.665 | 1.665 | 0.000 ( +0.0% ) | 28.83 | 28.35 | +1.7% | 1.579 | 1.581 |
| DYToLL_M-50_13TeV_pythia8 | 2500.911 | 14.345 | 14.345 | 0.000 ( +0.0% ) | 7.90 | 8.11 | -2.5% | 1.099 | 1.097 |
| DYToll01234Jets_5f_LO_MLM_Madgraph_LHE_13TeV | 2500.912 | 0.171 | 0.240 | -0.069 ( -28.7% ) | 2.96 | 2.84 | +4.4% | 0.852 | 0.852 |
| TTbar_Pow_LHE_13TeV | 2500.913 | 0.110 | 0.110 | 0.000 ( +0.0% ) | 2.65 | 2.62 | +1.1% | 0.852 | 0.855 |
Hi. The try ... catch solutions seems fine, but it would be nice to have a more detailed PR Description of changes on the BPHNano content. Including them could demand actions on the operation side (new Era?). Will be discussed with ORM/ORP.
@ftorrresd, we will have a new era after special heavy ion runs. Previous releases are not going to be used for production or data reprocessing involving BPHNano.
+1
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. @rappoccio, @mandrenguyen, @sextonkennedy, @antoniovilela (and backports should be raised in the release meeting by the corresponding L2)
+1