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

Updating Puppiproducer to include fillDescriptions v2 #28020

Merged
merged 17 commits into from Oct 5, 2019

Conversation

alefisico
Copy link
Contributor

PR description:

To test PUPPI at HLT for Run3/PhaseII, PuppiProducer has to be updated with the fillDescription function to be recognized in condfb. This PR introduces this function in that producer. This change should be completely transparent to the PUPPI algorithm itself, or any other part of CMSSW.

PR validation:

Run runTheMatrix.py -l limited -i all --ibeos, and all the test passed. Here is the output of it:
https://cernbox.cern.ch/index.php/s/tzHW6iQMrXSmKY4

This is the master branch of this PR #28016

@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-28020/11930

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

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@perrotta
Copy link
Contributor

This is going to interfere with @ahinzmann 's #27929: one has to decide who needs to go first

@alefisico
Copy link
Contributor Author

for sure #27929 is more important than this PR. This can go after that

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28020/11931

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @alefisico (Alejandro Gomez Espinosa) for master.

It involves the following packages:

CommonTools/PileupAlgos

@perrotta, @cmsbuild, @santocch, @slava77 can you please review it and eventually sign? Thanks.
@rappoccio, @ahinzmann, @riga, @jdolen, @gkasieczka, @clelange 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

desc.add<bool>("useExp", false);
desc.add<double>("MinPuppiWeight", .01);

edm::ParameterSetDescription puppialgos;
Copy link
Contributor

Choose a reason for hiding this comment

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

All PuppiAlgo related PSet's should get defined inside the PuppiAlgo class, not here in the caller

@ahinzmann
Copy link
Contributor

#27929 is just a nice to have and needs further development as it degrades CPU performance, so #28020 should go first.

puppialgos.add<double>("rmsScaleFactor", 1.0);

edm::ParameterSetDescription algos;
std::vector<double> etaMin;
Copy link
Contributor

Choose a reason for hiding this comment

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

Defining uninitialized vectors is useless. You could just define a single dummy vector, e.g.

std::vector<double> dummy_vdouble;

and use it to add everywhere.

Or (probaly better?) you can fill with some reasonable value, e.g. the ones from CommonTools/PileupAlgos/python/Puppi_cff.py:

  algos.add<std::vector<double>>("etaMin", {0.});
  algos.add<std::vector<double>>("etaMax", {2.5});
  algos.add<std::vector<double>>("ptMin", {0.});
  algos.add<std::vector<double>>("MinNeutralPt", {0.2});

etc.

Copy link
Contributor

Choose a reason for hiding this comment

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

By the way: this default algo configuration corresponds to what? I couldn't find it in the actual config in cmssw

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2019

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28020/12120

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2019

Pull request #28020 was updated. @perrotta, @cmsbuild, @santocch, @slava77 can you please check and sign again.

@perrotta
Copy link
Contributor

perrotta commented Oct 3, 2019

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/2772/console Started: 2019/10/03 12:05

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2019

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2019

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2019

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 2 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2961049
  • DQMHistoTests: Total failures: 2
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2960706
  • DQMHistoTests: Total skipped: 341
  • 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

@perrotta
Copy link
Contributor

perrotta commented Oct 3, 2019

+1

  • Configuration description added, and the produced config was verified to contain all needed parameters
  • Jenkins tests pass and show no differences, as it should

@fabiocos
Copy link
Contributor

fabiocos commented Oct 5, 2019

+1

@fabiocos
Copy link
Contributor

fabiocos commented Oct 5, 2019

merge

@santocch
Copy link

+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 be automatically merged.

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

9 participants