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

HGCal clustering: label border hits with rho = rho_b as Halo instead of core #19149

Merged
merged 8 commits into from Jun 30, 2017

Conversation

clelange
Copy link
Contributor

@clelange clelange commented Jun 8, 2017

There was a typo in one of the if statements, which had been there a long time. After fixing the overall clustering in the previous pull request #18236, this is just a minor correction. The effect is documented in 2-5 in
https://indico.cern.ch/event/644587/contributions/2619127/attachments/1471418/2276984/hgc_cluster_issues_v2.pdf

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 8, 2017

A new Pull Request was created by @clelange (Clemens Lange) for master.

It involves the following packages:

RecoLocalCalo/HGCalRecAlgos

@perrotta, @cmsbuild, @slava77, @kpedro88, @davidlange6 can you please review it and eventually sign? Thanks.
@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

@kpedro88
Copy link
Contributor

kpedro88 commented Jun 8, 2017

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 8, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/20436/console Started: 2017/06/08 18:43

@@ -359,7 +359,7 @@ int HGCalImagingAlgo::findAndAssignClusters(std::vector<KDNode> &nd,KDTree &lp,
if(flag_isolated) nd[i].data.isBorder = true; //the hit is more than delta_c from any of its brethren
}
//check if this border hit has density larger than the current rho_b and update
if(nd[i].data.isBorder && rho_b[ci] < nd[i].data.rho)
if(nd[i].data.isBorder && rho_b[ci] <= nd[i].data.rho)
rho_b[ci] = nd[i].data.rho;
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm somehow missing how an additional (incremental to what it was before)
if (rho_b[ci] == nd[i].data.rho) rho_b[ci] = nd[i].data.rho;
can change anything (note that rho_b is just a simple vector of doubles, so no possible difference after full assignment if there is an equality)

Please clarify.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 8, 2017

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 8, 2017

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 8, 2017

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

Comparison Summary:

  • You potentially added 3 lines to the logs
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 23
  • DQMHistoTests: Total histograms compared: 1867702
  • DQMHistoTests: Total failures: 35050
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1832479
  • DQMHistoTests: Total skipped: 173
  • DQMHistoTests: Total Missing objects: 0
  • Checked 94 log files, 14 edm output root files, 23 DQM output files

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 8, 2017

Pull request #19149 was updated. @perrotta, @cmsbuild, @slava77, @kpedro88, @davidlange6 can you please check and sign again.

@clelange
Copy link
Contributor Author

clelange commented Jun 8, 2017

@slava77 Yes, you are very right. Thank you for catching that. We had a miscommunication and had changed the wrong line. Apologies. I've fixed that now. Can you trigger the tests again, please?

@kpedro88
Copy link
Contributor

kpedro88 commented Jun 8, 2017

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 8, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/20439/console Started: 2017/06/08 22:06

@cmsbuild
Copy link
Contributor

Pull request #19149 was updated. @perrotta, @cmsbuild, @slava77, @kpedro88, @davidlange6 can you please check and sign again.

@perrotta
Copy link
Contributor

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/20984/console Started: 2017/06/29 15:52

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@perrotta
Copy link
Contributor

+1
Given the content of the last commit, I can sing this off once again (see #19149 (comment)) without waiting for the comparisons being run

@kpedro88
Copy link
Contributor

+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 requires discussion in the ORP meeting before it's merged. @davidlange6, @smuzaffar

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-19149/20984/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-19149/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-19149/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: 15030
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1740867
  • DQMHistoTests: Total skipped: 166
  • DQMHistoTests: Total Missing objects: 0
  • Checked 90 log files, 14 edm output root files, 22 DQM output files

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 2bbe8de into cms-sw:master Jun 30, 2017
@clelange clelange deleted the boundaryHitsFix branch June 3, 2019 19:45
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

7 participants