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-alca110 Modify two plugins to conform standard #21748

Merged
merged 5 commits into from Jan 11, 2018

Conversation

bsunanda
Copy link
Contributor

IsolatedParticlesGeneratedJets and IsolatedTracksCone are modified to conform current standards

@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/HcalCalibAlgos
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 19, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/25194/console Started: 2017/12/20 03:57

@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-21748/25194/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-21748/1325.7_TTbar_13_94XNanoAODINPUT+TTbar_13_94XNanoAODINPUT+NANOEDMMC2017

Comparison Summary:

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

@@ -466,6 +478,10 @@ void RecAnalyzerMinbias::analyzeHcal(const HBHERecHitCollection & HithbheMB,
if (itr1 != histHC_.end()) itr1->second->Fill(energyhit);
}
h_[hid.subdet()-1]->Fill(energyhit);
if(energyhit >2) {

Choose a reason for hiding this comment

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

@bsunanda what is this magic number 2?

Choose a reason for hiding this comment

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

@bsunanda could you please comment on this?

Choose a reason for hiding this comment

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

@bsunanda nevermind, I looked at an outdated version and found that you answered in the code

// Created: Thu Mar 4 18:52:02 CST 2010
//
//

Choose a reason for hiding this comment

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

Isn't this part required for the CMSSW reference manual (of course, filled with content...)?

void bookHistograms();
void clearTreeVectors();

bool debug_;

Choose a reason for hiding this comment

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

please make this configuration parameter const bool


debug = iConfig.getUntrackedParameter<bool> ("Debug", false);
tok_jets_ = consumes<reco::GenJetCollection>(iConfig.getParameter<edm::InputTag>("JetSource"));
tok_parts_ = consumes<reco::GenParticleCollection>(iConfig.getParameter<edm::InputTag>("ParticleSource"));

Choose a reason for hiding this comment

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

these could also become const members and their initialization could be moved to the initializer list

// Original Author: Jim Hirschauer (adaptation of Seema Sharma's
// IsolatedTracksNew)
// Created: Thu Nov 6 15:30:40 CST 2008
//

Choose a reason for hiding this comment

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

see above

desc.setUnknown();
descriptions.addDefault(desc);
}

Choose a reason for hiding this comment

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

what about a non-default parameter set description?

CaloSubdetectorGeometry* gHB = (CaloSubdetectorGeometry*)
(geo->getSubdetectorGeometry(DetId::Hcal,HcalBarrel));
CaloSubdetectorGeometry* gHE = (CaloSubdetectorGeometry*)
(geo->getSubdetectorGeometry(DetId::Hcal,HcalEndcap));

Choose a reason for hiding this comment

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

Why are casts required here?
Why removing const?
Why using C-style casts?

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 corrected in a separate PR

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I do not want to make this change to have conflict in PR's

hRawEta->Fill(eta1);
hRawPhi->Fill(phi1);
h_RawPt ->Fill(pt1);
h_RawP ->Fill(p1 );

Choose a reason for hiding this comment

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

minor comment, but since you are anyway making a cosmetic change here, you could also remove the remaining whitespace in (p1 )

double tempgen_TH[nPBins_+1] = { 0.0, 1.0, 2.0, 3.0, 4.0,
5.0, 6.0, 7.0, 8.0, 9.0,
10.0, 12.0, 15.0, 20.0, 25.0,
30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 100};

Choose a reason for hiding this comment

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

I think here and also above you could replace this with std::array and just use the nice interface for iterating trough it

@@ -1080,7 +1358,7 @@ void IsolatedTracksCone::beginJob() {
t_ievt = new std::vector<unsigned int>();
t_ilum = new std::vector<unsigned int>();

Choose a reason for hiding this comment

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

not part of this PR, but these vectors are never deleted

Copy link
Contributor Author

Choose a reason for hiding this comment

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

These are part of a branch of a Tree. I am not sure if these to be deleted.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 10, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/25364/console Started: 2018/01/11 00:27

@cmsbuild
Copy link
Contributor

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

@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-21748/25364/summary.html

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

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 26
  • DQMHistoTests: Total histograms compared: 2775243
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2775073
  • DQMHistoTests: Total skipped: 169
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0 KiB( 0 files compared)
  • Checked 110 log files, 9 edm output root files, 26 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)

@fabiocos
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 3e55266 into cms-sw:master Jan 11, 2018
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