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

Run2-alca109 Update a few plugins to conform standard #21720

Merged
merged 3 commits into from Dec 18, 2017

Conversation

bsunanda
Copy link
Contributor

Update IsolatedGenParticle and IsolatedTrackHcalScale used to get energy scale factor Hcal

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

Calibration/IsolatedParticles

@ghellwig, @arunhep, @cerminar, @cmsbuild, @franzoni, @lpernie can you please review it and eventually sign? Thanks.
@ghellwig, @mmusich, @tocheng 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

@davidlange6
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 14, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/25103/console Started: 2017/12/14 19:19

@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-21720/25103/summary.html

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /build/cmsbld/jenkins-workarea/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-21720/1325.7_TTbar_13_94XNanoAODINPUT+TTbar_13_94XNanoAODINPUT+NANOEDMMC2017

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 17 differences found in the comparisons
  • DQMHistoTests: Total files compared: 27
  • DQMHistoTests: Total histograms compared: 2836825
  • DQMHistoTests: Total failures: 2770
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2833877
  • DQMHistoTests: Total skipped: 178
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 1.09000000004 KiB( 23 files compared)
  • Checked 113 log files, 9 edm output root files, 27 DQM output files

void clearTreeVectors();
int particleCode(int);

static const int NPBins_ = 3;

Choose a reason for hiding this comment

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

@bsunanda you could even make them constexpr

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done


IsolatedGenParticles::IsolatedGenParticles(const edm::ParameterSet& iConfig) {

genSrc_ = iConfig.getUntrackedParameter("GenSrc",std::string("generatorSmeared"));
usesResource("TFileService");

Choose a reason for hiding this comment

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

please use the string constant:

usesResource(TFileService::kSharedResource);

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

a_Isolation_= iConfig.getUntrackedParameter<bool>("UseConeIsolation",false);
pCutIsolate_= iConfig.getUntrackedParameter<double>("PMaxIsolation",20.0);
verbosity_ = iConfig.getUntrackedParameter<int>("Verbosity", 0);
debugL1Info_= iConfig.getUntrackedParameter<bool>( "DebugL1Info", false );

Choose a reason for hiding this comment

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

this could go into the initializer list of the constructor

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

#include "Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.h"

// system include files
#include <memory>

Choose a reason for hiding this comment

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

no need to include this if you do not use smart pointers

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

#process.isolatedGenParticles.PTMin = 0.0
process.isolatedGenParticles.Verbosity = 0
#process.isolatedGenParticles.MaxChargedHadronEta = 3.5
process.load("Calibration.IsolatedParticles.IsolatedGenParticles_cfi")

Choose a reason for hiding this comment

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

I might be wrong, but I believe the CMS naming convention is to start with lower case.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the name of the file created in cfipython

Choose a reason for hiding this comment

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

well, then you should adapt fillDescriptions accordingly

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Pull request #21720 was updated. @ghellwig, @arunhep, @cerminar, @cmsbuild, @franzoni, @lpernie can you please check and sign again.

@bsunanda
Copy link
Contributor Author

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 15, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/25133/console Started: 2017/12/15 23:18

@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-21720/25133/summary.html

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /build/cmsbld/jenkins-workarea/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-21720/1325.7_TTbar_13_94XNanoAODINPUT+TTbar_13_94XNanoAODINPUT+NANOEDMMC2017

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 18 differences found in the comparisons
  • DQMHistoTests: Total files compared: 27
  • DQMHistoTests: Total histograms compared: 2836825
  • DQMHistoTests: Total failures: 1391
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2835256
  • DQMHistoTests: Total skipped: 178
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 1.58000000015 KiB( 23 files compared)
  • Checked 113 log files, 9 edm output root files, 27 DQM output files

@ghellwig
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 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)

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit d13bef2 into cms-sw:master Dec 18, 2017
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

4 participants