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

Cleanup of RecoLuminosity/LumiDB #27289

Merged
merged 14 commits into from Jun 25, 2019
Merged

Conversation

plujan
Copy link
Contributor

@plujan plujan commented Jun 20, 2019

PR description:

Most of the files in RecoLuminosity/LumiDB are obsolete -- they were scripts for working with the Run 1 lumi DB, which no longer exists and has been superseded by brilcalc. In this PR:

  • the scripts in plotdata/ are removed, since these are now maintained independently by the lumi POG (https://github.com/CMS-LUMI-POG/PublicPlots)
  • all of the unused scripts (which is nearly all of them) are removed
  • split the constants used in lumiQueryAPI.py into their own file so those can be saved
  • estimatePileup_makeJSON_2015.py has been extensively rewritten, since there was a lot of dead or otherwise not useful code, and renamed to makePileupJSON.py, since it's not 2015 any more!)
  • pileupCalc.py has been slightly modified (mostly just giving more helpful informational and warning messages, and more sensible defaults for Run 2)
  • the other few items are kept unchanged

PR validation:

I've run through the normal process of generating a pileup histogram (brilcalc -> makePileupJSON.py -> pileupCalc.py) and verified that the resulting histogram is exactly the same. Also checked to make sure that nothing outside RecoLuminosity/LumiDB depends on any of these modules.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-27289/10500

  • This PR adds an extra 28KB to repository

  • Found files with invalid states:

    • RecoLuminosity/LumiDB/python/pileupParser.py:
    • RecoLuminosity/LumiDB/python/selectionParser.py:
    • RecoLuminosity/LumiDB/python/csvLumibyLSParser.py:

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @plujan (Paul Lujan) for master.

It involves the following packages:

RecoLuminosity/LumiDB

@ggovi, @cmsbuild can you please review it and eventually sign? Thanks.
@mmusich this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@slava77
Copy link
Contributor

slava77 commented Jun 20, 2019

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 20, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/1079/console Started: 2019/06/20 16:28

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-27289/10561

  • This PR adds an extra 28KB to repository

  • Found files with invalid states:

    • RecoLuminosity/LumiDB/python/pileupParser.py:
    • RecoLuminosity/LumiDB/python/selectionParser.py:
    • RecoLuminosity/LumiDB/python/csvLumibyLSParser.py:

@cmsbuild
Copy link
Contributor

Pull request #27289 was updated. @ggovi, @cmsbuild can you please check and sign again.

@plujan
Copy link
Contributor Author

plujan commented Jun 24, 2019

sorry for the late push -- I realized there was another feature I should add, can you retest?

@fabiocos
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 24, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/1129/console Started: 2019/06/24 14:02

@cmsbuild
Copy link
Contributor

@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-646938/1129/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 33
  • DQMHistoTests: Total histograms compared: 3254598
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3254263
  • DQMHistoTests: Total skipped: 334
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 32 files compared)
  • Checked 137 log files, 14 edm output root files, 33 DQM output files

@ggovi
Copy link
Contributor

ggovi commented Jun 25, 2019

+1

@cmsbuild
Copy link
Contributor

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

@fabiocos
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 01b3cc9 into cms-sw:master Jun 25, 2019
@plujan plujan deleted the RecoLuminosityCleanup branch July 9, 2019 12:07
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

5 participants