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.

Sign up for GitHub

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

Jump to bottom

Addition of L1 tracking code for "TMTT" & (part of) "Hybrid" algorithms (L1Trigger/TrackFindingTMTT) #29381

Merged
merged 23 commits into from
May 22, 2020
Merged

Addition of L1 tracking code for "TMTT" & (part of) "Hybrid" algorithms (L1Trigger/TrackFindingTMTT) #29381

merged 23 commits into from
May 22, 2020

Conversation

tomalin
Copy link
Contributor

@tomalin tomalin commented Apr 2, 2020

PR description:

L1Trigger/TrackFindingTMTT/ contains code to run the TMTT L1 track algo, and also some of code needed to run the Hybrid L1 track algo.

The comments received during the closed PR #29284 have been implemented.

P.S. I recommend you start by reviewing the KF fit code (classes L1KalmanComb, KFParamsComb, L1track3D, L1fittedTrack, KFTrackletTrack, KalmanState). If there is a lot of work to do with these, we could consider a reduced PR with only the code needed for the Hybrid, dropping the code needed for the pure TMTT & pure Tracklet algos, which could then be added in CMSSW 11.2. Though it would require some editing to extract just these elements, and it is not guaranteed that 11.2 could read 11.1 MC samples.

PR validation:

L1 track performance good.

@cmsbuild cmsbuild added this to the CMSSW_11_1_X milestone Apr 2, 2020
@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 2, 2020

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 2, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29381/14489

  • This PR adds an extra 688KB to repository

  • Found files with invalid states:

    • L1Trigger/TrackFindingTMTT/test/MCsamples/1060/README:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/RelVal/TTbar/PU200.txt:
    • L1Trigger/TrackFindingTMTT/interface/HLS/KalmanMatrices5.h:
    • L1Trigger/TrackFindingTMTT/interface/HLS/KFpragmaOpts.h:
    • L1Trigger/TrackFindingTMTT/interface/HLS/KFconstants.h:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1060/RelVal/TTbar/PU200.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/RelVal/TTbar/PU0.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/RelVal/SingleElPt2to100/PU0.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1060/RelVal/TTbar/PU140.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/RelVal/OnlyPU/PU200.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1110/RelVal/TTbar/PU0.txt:
    • L1Trigger/TrackFindingTMTT/interface/HLS/KFParamsCombCallHLS.h:
    • L1Trigger/TrackFindingTMTT/src/KF4ParamsCombIV.bak:
    • L1Trigger/TrackFindingTMTT/src/HLS/KFParamsCombCallHLS.cc:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/RelVal/DisplacedSingleMuPt2to100/PU0.txt:
    • L1Trigger/TrackFindingTMTT/src/HLS/KalmanUpdate.cc:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1060/RelVal/TTbar/PU0.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1110/RelVal/SingleMuPt1p5to8/PU0.txt:
    • L1Trigger/TrackFindingTMTT/interface/KF4ParamsCombV2.bak:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/RelVal/OnlyPU/PU200.txt:
    • L1Trigger/TrackFindingTMTT/src/HLS/KalmanMatrices.cc:
    • L1Trigger/TrackFindingTMTT/src/HLS/KalmanMatrices5.cc:
    • L1Trigger/TrackFindingTMTT/src/HLS/KalmanMatrices4.cc:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/RelVal/SingleElPt1p5to8/PU0.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/README:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1110/RelVal/TTbar/PU200.txt:
    • L1Trigger/TrackFindingTMTT/Doxyfile:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1060/RelVal/SingleElPt2to100/PU0.txt:
    • L1Trigger/TrackFindingTMTT/interface/HLS/KalmanMatrices.h:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1060/RelVal/SingleMuPt2to100/PU0.txt:
    • L1Trigger/TrackFindingTMTT/README_HLS.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1110/RelVal/SingleElPt1p5to8/PU0.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/RelVal/TTbar/PU200.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/RelVal/SingleMuPt1p5to8/PU0.txt:
    • L1Trigger/TrackFindingTMTT/interface/HLS/KalmanUpdate.h:
    • L1Trigger/TrackFindingTMTT/interface/HLS/HLSutilities.h:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/RelVal/TTbar/PU140.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/RelVal/TTbar/localRAL/PU200.txt:
    • L1Trigger/TrackFindingTMTT/src/HLS/HLSutilities.cc:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/RelVal/SingleMuPt2to100/PU0.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1110/RelVal/DisplacedSingleMuPt2to100/PU0.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/RelVal/TTbar/PU140.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/RelVal/SingleElPt1p5to8/PU0.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/RelVal/DisplacedSingleMuPt1p5to8/PU0.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1110/RelVal/SingleElPt2to100/PU0.txt:
    • L1Trigger/TrackFindingTMTT/src/KF5ParamsComb.cc.bak:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/RelVal/SingleElPt2to100/PU0.txt:
    • L1Trigger/TrackFindingTMTT/interface/HLS/KFstub.h:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/RelVal/TTbar/localRAL/PU200.txt:
    • L1Trigger/TrackFindingTMTT/interface/HLS/KalmanUpdate_top.h:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/README:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/RelVal/SingleMuPt2to100/PU0.txt:
    • L1Trigger/TrackFindingTMTT/src/HLS/KalmanUpdate_top.cc:
    • L1Trigger/TrackFindingTMTT/interface/KF4ParamsCombIV.bak:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/RelVal/TTbar/PU0.txt:
    • L1Trigger/TrackFindingTMTT/interface/KF4ParamsComb.h.bak:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1060/RelVal/SingleMuPt1p5to8/PU0.txt:
    • L1Trigger/TrackFindingTMTT/test/L1TrackNtupleMaker_cfg.py:
    • L1Trigger/TrackFindingTMTT/interface/HLS/KalmanMatrices4.h:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1110/RelVal/SingleMuPt2to100/PU0.txt:
    • L1Trigger/TrackFindingTMTT/interface/HLS/KFstate.h:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1110/README:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1040/RelVal/SingleMuPt1p5to8/PU0.txt:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/1060/RelVal/SingleElPt1p5to8/PU0.txt:
    • L1Trigger/TrackFindingTMTT/src/KF4ParamsComb.cc.bak:
    • L1Trigger/TrackFindingTMTT/src/KF4ParamsCombV2.bak:
    • L1Trigger/TrackFindingTMTT/hls.xml:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/RelVal/TTbar/PU250.txt:
    • L1Trigger/TrackFindingTMTT/interface/KF5ParamsComb.h.bak:
    • L1Trigger/TrackFindingTMTT/test/TrackerLayout.png:
    • L1Trigger/TrackFindingTMTT/test/MCsamples/937/RelVal/TTbar/PU300.txt:
    • L1Trigger/TrackFindingTMTT/BuildFile_HLS.xml:

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 2, 2020

A new Pull Request was created by @tomalin (Ian Tomalin) for master.

It involves the following packages:

L1Trigger/TrackFindingTMTT

The following packages do not have a category, yet:

L1Trigger/TrackFindingTMTT
Please create a PR for https://github.com/cms-sw/cms-bot/blob/master/categories_map.py to assign category

@cmsbuild can you please review it and eventually sign? Thanks.
@Martin-Grunewald this is something you requested to watch as well.
@silviodonato, @dpiparo you are the release manager for this.

cms-bot commands are listed here

@rekovic
Copy link
Contributor

rekovic commented Apr 2, 2020

assign l1

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 2, 2020

New categories assigned: l1

@benkrikler,@rekovic you have been requested to review this Pull request/Issue and eventually sign? Thanks

@cmsbuild
Copy link
Contributor

+1
Tested at: 9b8d2c4
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-7159cb/6497/summary.html
CMSSW: CMSSW_11_1_X_2020-05-21-2300
SCRAM_ARCH: slc7_amd64_gcc820

@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-7159cb/6497/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 6 differences found in the comparisons
  • DQMHistoTests: Total files compared: 35
  • DQMHistoTests: Total histograms compared: 2694466
  • DQMHistoTests: Total failures: 3
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2694414
  • DQMHistoTests: Total skipped: 49
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
  • Checked 150 log files, 16 edm output root files, 35 DQM output files

@silviodonato silviodonato merged commit 39527cd into cms-sw:master May 22, 2020
@silviodonato
Copy link
Contributor

merge
I double checked that all pending comments have been implemented. @fwyzard @kpedro88 @rekovic if you have further comments, please let us know. I'm going to build 11_1_0_pre8 now (after checking the morning IB).

@kpedro88
Copy link
Contributor

+upgrade

topics to be addressed in followup PR(s):

  • using EventSetup to share Settings object
  • moving histograms from production code to validation subsystem
  • reducing/removing mutexes (related to above)
  • avoiding magic numbers for track fitter # parameters

@cmsbuild
Copy link
Contributor

cmsbuild commented May 23, 2020 •
edited
Loading

The tests are being triggered in jenkins.
Tested with other pull request(s) #29527
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/6543/console Started: 2020/05/23 19:25

@cmsbuild
Copy link
Contributor

+1
Tested at: 9b8d2c4
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-3200ed/6543/summary.html
CMSSW: CMSSW_11_2_X_2020-05-23-1100
SCRAM_ARCH: slc7_amd64_gcc820

@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-3200ed/6543/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 36
  • DQMHistoTests: Total histograms compared: 2780792
  • DQMHistoTests: Total failures: 45
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2780697
  • DQMHistoTests: Total skipped: 50
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 35 files compared)
  • Checked 152 log files, 16 edm output root files, 36 DQM output files

@kpedro88
Copy link
Contributor

kpedro88 commented Jun 3, 2020

@tomalin the flags that were supposed to be removed are still here:
https://github.com/cms-sw/cmssw/blob/master/L1Trigger/TrackFindingTMTT/plugins/BuildFile.xml

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rekovic rekovic rekovic left review comments

@kpedro88 kpedro88 kpedro88 left review comments

@fwyzard fwyzard fwyzard requested changes

@makortel makortel makortel left review comments

Assignees
No one assigned
Labels
code-checks-approved comparison-available l1-pending orp-approved pending-signatures requires-external tests-approved upgrade-approved
Projects
None yet
Milestone
CMSSW_11_1_X
Development

Successfully merging this pull request may close these issues.
9 participants
@tomalin @cmsbuild @rekovic @silviodonato @fwyzard @skinnari @makortel @kpedro88 @boudoul