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

Improvements to L1 tracking code #42663

Merged
merged 38 commits into from
Dec 11, 2023
Merged

Conversation

tomalin
Copy link
Contributor

@tomalin tomalin commented Aug 25, 2023

PR description:

This consists of a number of improvements from the L1 tracking group.

The biggest one is the implementation of a bit-accurate emulation of the L1 track duplicate removal algorithm (DR.cc) together with modifications of nearby code in the L1 tracking chain to incorperate it (e.g. DRin.cc, KFin.cc).

Other improvements include test code for study partially dead tracker scenarios (StubKiller.cc) and numerous small improvements to improve agreement with firwamre.

N.B. Despite the branch name, this has actually been rebased of CMSSW_14_0_0_pre0.

PR validation:

This has been checked by the detailed git CI of the L1 track group. The tracking performance remains good on 1000 ttbar + 0 pile-up events.

P.S. @skinnari shares responsibility for the code in this PR.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-42663/36729

  • This PR adds an extra 392KB to repository

  • Found files with invalid states:

    • L1Trigger/TrackTrigger/data/L1_TrackQuality_GBDT_emulation_digitized.json:
    • L1Trigger/TrackTrigger/data/clf_GBDT_emulation_newKF_digitized.json:
    • .github/workflows/github_CI.yml:

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

  • L1Trigger/TrackFindingTMTT (l1)
  • L1Trigger/TrackFindingTracklet (l1)
  • L1Trigger/TrackTrigger (upgrade, l1)
  • L1Trigger/TrackerDTC (upgrade, l1)
  • L1Trigger/TrackerTFP (l1)
  • SimTracker/TrackTriggerAssociation (l1, simulation)

@civanch, @epalencia, @mdhildreth, @cmsbuild, @AdrianoDee, @srimanob, @aloeliger can you please review it and eventually sign? Thanks.
@erikbutz, @VourMa, @mtosi, @GiacomoSguazzoni, @JanFSchulte, @rovere, @VinInn, @Martin-Grunewald, @missirol, @skinnari, @sviret, @mmusich, @threus, @dgulhan this is something you requested to watch as well.
@perrotta, @dpiparo, @antoniovilela, @rappoccio you are the release manager for this.

cms-bot commands are listed here

@tomalin tomalin marked this pull request as ready for review August 25, 2023 11:23
@tomalin
Copy link
Contributor Author

tomalin commented Aug 25, 2023

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-42663/36729

  • This PR adds an extra 392KB to repository

  • Found files with invalid states:

    • L1Trigger/TrackTrigger/data/L1_TrackQuality_GBDT_emulation_digitized.json:

    • L1Trigger/TrackTrigger/data/clf_GBDT_emulation_newKF_digitized.json:

    • .github/workflows/github_CI.yml:

We added all these files a few months ago, for the convenience of the L1 tracking group, but deleted them before making this PR, as they don't belong in central CMSSW. This seems to confuse git, which declares them to be in an "invalid state".

@aloeliger
Copy link
Contributor

+code-checks
Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-42663/36729

  • This PR adds an extra 392KB to repository

  • Found files with invalid states:

    • L1Trigger/TrackTrigger/data/L1_TrackQuality_GBDT_emulation_digitized.json:

    • L1Trigger/TrackTrigger/data/clf_GBDT_emulation_newKF_digitized.json:

    • .github/workflows/github_CI.yml:

We added all these files a few months ago, for the convenience of the L1 tracking group, but deleted them before making this PR, as they don't belong in central CMSSW. This seems to confuse git, which declares them to be in an "invalid state".

@tomalin This is typical for any PR which adds and deletes files in the same PR. If it is an issue for the PR history, these commits can be squashed together to remove it.

L1Trigger/TrackFindingTMTT/plugins/BuildFile.xml Outdated Show resolved Hide resolved
L1Trigger/TrackFindingTracklet/interface/MatchEngineUnit.h Outdated Show resolved Hide resolved
L1Trigger/TrackFindingTracklet/src/PurgeDuplicate.cc Outdated Show resolved Hide resolved
L1Trigger/TrackFindingTracklet/src/PurgeDuplicate.cc Outdated Show resolved Hide resolved
L1Trigger/TrackFindingTracklet/src/TrackletLUT.cc Outdated Show resolved Hide resolved
L1Trigger/TrackTrigger/interface/conifer.h Outdated Show resolved Hide resolved
@aloeliger
Copy link
Contributor

@tomalin Just wanted to ping you on the review comments.

@aloeliger
Copy link
Contributor

@tomalin Pinging you again on the review comments

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2023

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-42663/37086

  • This PR adds an extra 396KB to repository

  • Found files with invalid states:

    • L1Trigger/TrackTrigger/data/L1_TrackQuality_GBDT_emulation_digitized.json:
    • L1Trigger/TrackTrigger/data/clf_GBDT_emulation_newKF_digitized.json:
    • .github/workflows/github_CI.yml:

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2023

Pull request #42663 was updated. @aloeliger, @epalencia, @mdhildreth, @civanch, @srimanob, @AdrianoDee, @cmsbuild can you please check and sign again.

@srimanob
Copy link
Contributor

srimanob commented Oct 3, 2023

@tomalin
Could you please confirm if I should trigger the test, or something still to come for reviewing? Thx.

@tomalin
Copy link
Contributor Author

tomalin commented Oct 3, 2023

@tomalin Could you please confirm if I should trigger the test, or something still to come for reviewing? Thx.

@srimanob I've been away, so am just getting back to this. We must address the comments reviewers made above, which will mean small changes to the code. I do not expect any large changes to the current PR.

@aloeliger
Copy link
Contributor

+l1

  • @tomalin The MatchEngineUnit.h naming scheme really should be fixed for next time because the variable name + some number of underscores is one of those things that is easy to keep putting off, but could cause a lot of confusion..

@civanch
Copy link
Contributor

civanch commented Nov 22, 2023

+1

Nothing changed for simulation.

@tomalin
Copy link
Contributor Author

tomalin commented Dec 7, 2023

I think this only misses approval from "trk". Is anyone able to check that?

@srimanob
Copy link
Contributor

srimanob commented Dec 7, 2023

Hi @tomalin
Sorry, I missed this PR. Will trigger a test again after 2 weeks. If it is good, I will just sign.

@srimanob
Copy link
Contributor

srimanob commented Dec 7, 2023

@cmsbuild please test

Re-trigger the test after 2 weeks.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 7, 2023

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-32d397/36369/summary.html
COMMIT: faa3fde
CMSSW: CMSSW_14_0_X_2023-12-07-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/42663/36369/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

@srimanob
Copy link
Contributor

srimanob commented Dec 8, 2023

Hi @tomalin

I see that the failures in Phase-2 workflow comparison show up in L1T and SiOuterTracker. I assume L1T is expected. Do you check the SiOuterTracker? Thx.

@tomalin
Copy link
Contributor Author

tomalin commented Dec 9, 2023

Hi @tomalin

I see that the failures in Phase-2 workflow comparison show up in L1T and SiOuterTracker. I assume L1T is expected. Do you check the SiOuterTracker? Thx.

Hi @srimanob , are you referring to https://cmssdt.cern.ch/SDT/jenkins-artifacts/baseLineComparisons/CMSSW_14_0_X_2023-12-07-1100+32d397/60200/25034.999_TTbar_14TeV+2026D98PU_PMXS1S2PR/SiOuterTracker_Tracks_HQ.html ? It claims that 100% of the 20 plots fail the comparison test, but by eye the plots seem in almost perfect agreement. This shows L1 tracks, so its normal that there are some changes.

We did not check if our PR changed offline track reco. It's hard to imagine how it could.

@srimanob
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. @rappoccio, @antoniovilela, @sextonkennedy (and backports should be raised in the release meeting by the corresponding L2)

@rappoccio
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit afa2d7c into cms-sw:master Dec 11, 2023
11 checks passed
@tomalin tomalin deleted the L1TK-PR-13_3_0_pre2 branch September 10, 2024 14:20
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.