Fix skipping of LuminosityBlock with firstLuminosityBlockForEachRun #29525

Dr15Jones · 2020-04-20T20:13:45Z

PR description:

CMSSW_11_1_0_pre6 showed that the tests for Run dependent MC had failed. This adds tests which exhibit the problem and provides changes which allow those tests to pass.

PR validation:

The code compiles and the new (and extended) tests all pass.

Previously the Lumi iterator was copied before used to check to see if the Lumis in a Run were skipped. We now avoid the copy as we may need to peekAtNextLumi and when doing so we need to have skipped any necessary Lumis up to that point.

cmsbuild · 2020-04-20T20:14:08Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-04-20T20:20:32Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29525/14791

This PR adds an extra 40KB to repository

cmsbuild · 2020-04-20T20:20:59Z

A new Pull Request was created by @Dr15Jones (Chris Jones) for master.

It involves the following packages:

FWCore/Modules
FWCore/Sources
IOPool/Input

@makortel, @smuzaffar, @cmsbuild, @Dr15Jones can you please review it and eventually sign? Thanks.
@makortel, @wddgit this is something you requested to watch as well.
@silviodonato, @dpiparo you are the release manager for this.

cms-bot commands are listed here

Dr15Jones · 2020-04-20T20:21:25Z

please test

cmsbuild · 2020-04-20T20:21:44Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/5794/console Started: 2020/04/20 22:44

cmsbuild · 2020-04-20T21:57:08Z

+1
Tested at: 738abd4
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a9a550/5794/summary.html
CMSSW: CMSSW_11_1_X_2020-04-20-1100
SCRAM_ARCH: slc7_amd64_gcc820

cmsbuild · 2020-04-20T21:57:11Z

Comparison job queued.

IOPool/Input/src/RootFile.cc

IOPool/Input/test/firstLuminosityBlockForEachRun_skipLumis2_Test_cfg.py

cmsbuild · 2020-04-20T23:24:23Z

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

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 0 differences found in the comparisons
DQMHistoTests: Total files compared: 34
DQMHistoTests: Total histograms compared: 2696435
DQMHistoTests: Total failures: 1
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2696115
DQMHistoTests: Total skipped: 319
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
Checked 147 log files, 16 edm output root files, 34 DQM output files

cmsbuild · 2020-04-20T23:46:22Z

The code-checks are being triggered in jenkins.

…st_cfg.py remove unnecessary import Co-Authored-By: Matti Kortelainen <matti.kortelainen@cern.ch>

cmsbuild · 2020-04-20T23:46:41Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-04-20T23:52:31Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29525/14795

This PR adds an extra 44KB to repository

Dr15Jones · 2020-04-20T23:52:41Z

please test

cmsbuild · 2020-04-20T23:52:58Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/5798/console Started: 2020/04/21 03:49

cmsbuild · 2020-04-20T23:52:59Z

Pull request #29525 was updated. @makortel, @smuzaffar, @cmsbuild, @Dr15Jones can you please check and sign again.

cmsbuild · 2020-04-21T03:03:03Z

+1
Tested at: 5a722f0
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a9a550/5798/summary.html
CMSSW: CMSSW_11_1_X_2020-04-20-1100
SCRAM_ARCH: slc7_amd64_gcc820

cmsbuild · 2020-04-21T03:03:05Z

Comparison job queued.

cmsbuild · 2020-04-21T05:22:11Z

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

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 4 differences found in the comparisons
DQMHistoTests: Total files compared: 34
DQMHistoTests: Total histograms compared: 2696435
DQMHistoTests: Total failures: 2
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2696114
DQMHistoTests: Total skipped: 319
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
Checked 147 log files, 16 edm output root files, 34 DQM output files

makortel · 2020-04-21T12:50:09Z

+1

cmsbuild · 2020-04-21T12:50:37Z

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. @silviodonato, @dpiparo (and backports should be raised in the release meeting by the corresponding L2)

silviodonato · 2020-04-21T17:16:58Z

+1

Dr15Jones added 5 commits April 20, 2020 14:46

Also check Run and LuminosityBlock transitions

a425254

Use EventIDChecker to test that transition IDs are correct

aa52b26

Added more tests for firstLuminosityBlockForEachRun

71bd5dd

Use of firstLumi is a type of Lumi skipping

d74d1f7

cmsbuild added this to the CMSSW_11_1_X milestone Apr 20, 2020

cmsbuild added code-checks-pending comparison-pending core-pending orp-pending pending-signatures tests-pending labels Apr 20, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Apr 20, 2020

cmsbuild added tests-started and removed tests-pending labels Apr 20, 2020

Dr15Jones mentioned this pull request Apr 20, 2020

Strange output when firstLuminosityBlockForEachRun is used for Run-Dependent MC #29472

Closed

cmsbuild added tests-approved and removed tests-started labels Apr 20, 2020

makortel reviewed Apr 20, 2020

View reviewed changes

IOPool/Input/src/RootFile.cc Outdated Show resolved Hide resolved

IOPool/Input/test/firstLuminosityBlockForEachRun_skipLumis2_Test_cfg.py Outdated Show resolved Hide resolved

cmsbuild added comparison-available and removed comparison-pending labels Apr 20, 2020

cmsbuild added the tests-pending label Apr 20, 2020

Update IOPool/Input/test/firstLuminosityBlockForEachRun_skipLumis2_Te…

5a722f0

…st_cfg.py remove unnecessary import Co-Authored-By: Matti Kortelainen <matti.kortelainen@cern.ch>

cmsbuild added code-checks-approved and removed code-checks-pending labels Apr 20, 2020

cmsbuild added tests-started and removed tests-pending labels Apr 20, 2020

cmsbuild added tests-approved and removed tests-started labels Apr 21, 2020

cmsbuild added comparison-available and removed comparison-pending labels Apr 21, 2020

cmsbuild added core-approved fully-signed and removed core-pending pending-signatures labels Apr 21, 2020

cmsbuild added orp-approved and removed orp-pending labels Apr 21, 2020

cmsbuild merged commit c1dc062 into cms-sw:master Apr 21, 2020

Dr15Jones deleted the fixSkippingLumisWithRunPerLumi branch June 8, 2020 13:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix skipping of LuminosityBlock with firstLuminosityBlockForEachRun #29525

Fix skipping of LuminosityBlock with firstLuminosityBlockForEachRun #29525

Dr15Jones commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

Dr15Jones commented Apr 20, 2020

cmsbuild commented Apr 20, 2020 •

edited

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

Dr15Jones commented Apr 20, 2020

cmsbuild commented Apr 20, 2020 •

edited

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 21, 2020

cmsbuild commented Apr 21, 2020

cmsbuild commented Apr 21, 2020

makortel commented Apr 21, 2020

cmsbuild commented Apr 21, 2020

silviodonato commented Apr 21, 2020

Fix skipping of LuminosityBlock with firstLuminosityBlockForEachRun #29525

Fix skipping of LuminosityBlock with firstLuminosityBlockForEachRun #29525

Conversation

Dr15Jones commented Apr 20, 2020

PR description:

PR validation:

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

Dr15Jones commented Apr 20, 2020

cmsbuild commented Apr 20, 2020 • edited

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 20, 2020

Dr15Jones commented Apr 20, 2020

cmsbuild commented Apr 20, 2020 • edited

cmsbuild commented Apr 20, 2020

cmsbuild commented Apr 21, 2020

cmsbuild commented Apr 21, 2020

cmsbuild commented Apr 21, 2020

makortel commented Apr 21, 2020

cmsbuild commented Apr 21, 2020

silviodonato commented Apr 21, 2020

cmsbuild commented Apr 20, 2020 •

edited

cmsbuild commented Apr 20, 2020 •

edited