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

Updated trackerStablePhiSort and mtdStablePhiSort #25196

Merged
merged 5 commits into from
Nov 16, 2018
Merged

Updated trackerStablePhiSort and mtdStablePhiSort #25196

merged 5 commits into from
Nov 16, 2018

Conversation

guitargeek
Copy link
Contributor

Hi, this is a follow up on #24549, where I had to wrap some functions which did not inherit anymore from the unary_function into std::functions such that they could be used with the trackerStablePhiSort and mtdStablePhiSort. I knew that was not the most elegant solution, but since #24549 was already a huge PR I accepted it for now.

Here I propose a better solution with is to rewrite trackerStablePhiSort and mtdStablePhiSort in a way that they can take arbitrary function objects, including normal functions and lambdas. Basically the same as I did here #25080 for the precomputed_value_sort.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

{
// ordered....
std::vector<double> phis; phis += -0.1683, -0.0561, +0.0000, +0.0561 +0.1683;
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'd like to point out this nice example of why too much "boost magic" can be dangerous. Did the author intend to insert +0.0561 and +0.1683 as different elements and just forgot a comma, or was it really the idea to add the doubles and then insert the sum? We will never know...

Copy link
Contributor

Choose a reason for hiding this comment

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

forgot the comma

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @guitargeek (Jonas Rembser) for master.

It involves the following packages:

Geometry/MTDNumberingBuilder
Geometry/TrackerNumberingBuilder

@civanch, @Dr15Jones, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @kpedro88 can you please review it and eventually sign? Thanks.
@makortel, @ebrondol, @VinInn, @venturia 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

@kpedro88
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 11, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/31589/console Started: 2018/11/11 18:13

@VinInn
Copy link
Contributor

VinInn commented Nov 11, 2018

+1

@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-25196/31589/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 3013827
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3013629
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 134 log files, 14 edm output root files, 32 DQM output files

@kpedro88
Copy link
Contributor

+upgrade

@cmsbuild
Copy link
Contributor

Pull request #25196 was updated. @civanch, @Dr15Jones, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @kpedro88 can you please check and sign again.

@guitargeek
Copy link
Contributor Author

ping for testing please!

@Dr15Jones
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 13, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/31628/console Started: 2018/11/13 16: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-25196/31628/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-25196/27434.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D35_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D35+RecoFullGlobal_2023D35+HARVESTFullGlobal_2023D35

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 3013311
  • DQMHistoTests: Total failures: 11
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3013103
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 134 log files, 14 edm output root files, 32 DQM output files

@ianna
Copy link
Contributor

ianna commented Nov 13, 2018

+1

@guitargeek
Copy link
Contributor Author

@kpedro88 can you please sign? I only implemented comments by @ianna since your last signature.

@kpedro88
Copy link
Contributor

+upgrade

@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 02136f9 into cms-sw:master Nov 16, 2018
@guitargeek guitargeek deleted the stableSort branch November 21, 2018 13:03
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