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

Phase2-hgx87 Add functionality in geometry to enable avoid magic # usage in reconstruction #19485

Merged
merged 2 commits into from Jul 4, 2017

Conversation

bsunanda
Copy link
Contributor

Only equipped RecTools with some of the stuff - to be propagated to other classes in HGCalRecAlgos

@bsunanda
Copy link
Contributor Author

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 29, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/20996/console Started: 2017/06/29 17:09

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

Geometry/HGCalCommonData
Geometry/HGCalGeometry
RecoLocalCalo/HGCalRecAlgos

@perrotta, @civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @kpedro88, @slava77, @davidlange6 can you please review it and eventually sign? Thanks.
@ghellwig, @vandreev11, @sethzenz, @kpedro88, @argiro, @cseez, @pfs, @lgray this is something you requested to watch as well.
@davidlange6 you are the release manager for this.

cms-bot commands are listed here

@perrotta
Copy link
Contributor

please test

@kpedro88
Copy link
Contributor

@bsunanda thanks
@clelange FYI

@@ -73,6 +73,9 @@ class HGCalDDDConstants {
int& wafer, int& icell,
int& celltyp) const;
bool waferInLayer(int wafer, int lay, bool reco) const;
int waferKount(const int type) const {return ((type == 0) ? waferMax_[2] : waferMax_[3]);}
Copy link
Contributor

Choose a reason for hiding this comment

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

misspelling: Kount -> Count

auto geomFH = static_cast<const HGCalGeometry*>(geom_->getSubdetectorGeometry(DetId::Forward,ForwardSubdetector::HGCHEF));
bhOffset_ = fhOffset_ + (geomFH->topology().dddConstants()).layers(true);
unsigned int wmaxFH = 1 + (geomFH->topology().dddConstants()).waferMax();
maxNumberOfWafersPerLayer_ = (wmaxEE > wmaxFH) ? wmaxEE : wmaxFH;
Copy link
Contributor

Choose a reason for hiding this comment

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

could just be std::max()

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@clelange
Copy link
Contributor

alright, thanks, this is useful.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-19485/20996/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-19485/20034.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D17_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D17+RecoFullGlobal_2023D17+HARVESTFullGlobal_2023D17
  • /build/cmsbld/jenkins-workarea/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-19485/20434.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D19_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D19+RecoFullGlobal_2023D19+HARVESTFullGlobal_2023D19

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 22
  • DQMHistoTests: Total histograms compared: 1756063
  • DQMHistoTests: Total failures: 15021
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1740876
  • DQMHistoTests: Total skipped: 166
  • DQMHistoTests: Total Missing objects: 0
  • Checked 90 log files, 14 edm output root files, 22 DQM output files

@bsunanda
Copy link
Contributor Author

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 30, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/21026/console Started: 2017/06/30 16:47

@cmsbuild
Copy link
Contributor

Pull request #19485 was updated. @perrotta, @civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @kpedro88, @slava77, @davidlange6 can you please check and sign again.

@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-19485/21026/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 22
  • DQMHistoTests: Total histograms compared: 1756063
  • DQMHistoTests: Total failures: 29440
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1726457
  • DQMHistoTests: Total skipped: 166
  • DQMHistoTests: Total Missing objects: 0
  • Checked 90 log files, 14 edm output root files, 22 DQM output files

@bsunanda
Copy link
Contributor Author

bsunanda commented Jul 3, 2017

@ianna @kpedro88 @slava77 Kindly approve this PR

@perrotta
Copy link
Contributor

perrotta commented Jul 3, 2017

+1
Reorganization of the HGCal code which allows to retrieve centrally some of the magic numbers popped up in the previous versions
No effect on the workflows tested in jenkins, as expected

@kpedro88
Copy link
Contributor

kpedro88 commented Jul 3, 2017

+1

@davidlange6
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit a405400 into cms-sw:master Jul 4, 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

6 participants