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

All-combined extended wiring #292

Merged
merged 22 commits into from
Oct 10, 2024
Merged

Conversation

aehart
Copy link

@aehart aehart commented Sep 25, 2024

PR description:

This PR includes a wiring for the extended project that consistently uses combined modules, so that we are able to remove the old non-combined modules. There are various associated changes in the C++, especially in the VMRouterCM, so that the new wiring can be used while maintaining our tracking efficiency. Essentially, the VMRouterCM should have nearly identical behavior as the old VMRouter in the case of the triplet seeds. We can revert most of these changes in the near future, as the TrackletProcessorDisplaced is gradually updated and made to be compatible with the expected output from the VMRouterCM.

PR validation:

Further details and results with the new wiring can be found in the following presentations:
https://indico.cern.ch/event/1418952/#3-displaced-tracking-update
https://indico.cern.ch/event/1449863/#2-displaced-tracking-update

@tomalin
Copy link
Collaborator

tomalin commented Sep 27, 2024

Since you've changed the contents of TrackFindingTracklet/data/ , please make of PR to https://github.com/cms-data/L1Trigger-TrackFindingTracklet , specifying in the PR description that it should be merged into the same release of CMSSW as my PR of behalf of the L1Trk group cms-sw#45974 . I will add your code to the latter PR after this PR is merged.

@tomalin
Copy link
Collaborator

tomalin commented Sep 27, 2024

This looks ready to merge, aside from my few comments above.

Copy link
Collaborator

@tomalin tomalin left a comment

Choose a reason for hiding this comment

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

Approved. Nice clean up.

@tomalin tomalin merged commit addf485 into L1TK-dev-14_0_0_pre2 Oct 10, 2024
1 check passed
tomalin pushed a commit that referenced this pull request Oct 11, 2024
* Initial commit

* Separated ivmte and bins, but not correct yet

* Allow combined_ to be set for extended tracking.

* Logic for bins updated

* Revert lutwidthtab_ and use lutwidthtabextended_ for extended tracking.

* Set ivmte to zero by default and revert change to old VMRouter.

* Updated assert.

* Initialize LUTs from VMRouter.

* Use LUT values from VMRouter for triplet seeds.

* Added stubposition and made vmstubmem a vector of vectors.

* Added a combined flag to addVMStub.

* Use stubposition to get lutwidth.

* Skip disk 2S stubs only for pair seeds.

* Added some comments.

* Added assert on melutOld.

* Initialize in same order as declared in header file.

* Code format.

* Added method to return nbits_.

* Removed magic numbers.

* Added comments.

* Use new wiring with all combined modules.

* Temporarily added data directory from here:
https://github.com/aehart/L1Trigger-TrackFindingTracklet/tree/new_extended_wiring

---------

Co-authored-by: Jannicke Pearkes <jannicke.pearkes@cern.ch>
cgsavard pushed a commit that referenced this pull request Oct 17, 2024
* Initial commit

* Separated ivmte and bins, but not correct yet

* Allow combined_ to be set for extended tracking.

* Logic for bins updated

* Revert lutwidthtab_ and use lutwidthtabextended_ for extended tracking.

* Set ivmte to zero by default and revert change to old VMRouter.

* Updated assert.

* Initialize LUTs from VMRouter.

* Use LUT values from VMRouter for triplet seeds.

* Added stubposition and made vmstubmem a vector of vectors.

* Added a combined flag to addVMStub.

* Use stubposition to get lutwidth.

* Skip disk 2S stubs only for pair seeds.

* Added some comments.

* Added assert on melutOld.

* Initialize in same order as declared in header file.

* Code format.

* Added method to return nbits_.

* Removed magic numbers.

* Added comments.

* Use new wiring with all combined modules.

* Temporarily added data directory from here:
https://github.com/aehart/L1Trigger-TrackFindingTracklet/tree/new_extended_wiring

---------

Co-authored-by: Jannicke Pearkes <jannicke.pearkes@cern.ch>
cgsavard pushed a commit that referenced this pull request Oct 17, 2024
* Initial commit

* Separated ivmte and bins, but not correct yet

* Allow combined_ to be set for extended tracking.

* Logic for bins updated

* Revert lutwidthtab_ and use lutwidthtabextended_ for extended tracking.

* Set ivmte to zero by default and revert change to old VMRouter.

* Updated assert.

* Initialize LUTs from VMRouter.

* Use LUT values from VMRouter for triplet seeds.

* Added stubposition and made vmstubmem a vector of vectors.

* Added a combined flag to addVMStub.

* Use stubposition to get lutwidth.

* Skip disk 2S stubs only for pair seeds.

* Added some comments.

* Added assert on melutOld.

* Initialize in same order as declared in header file.

* Code format.

* Added method to return nbits_.

* Removed magic numbers.

* Added comments.

* Use new wiring with all combined modules.

* Temporarily added data directory from here:
https://github.com/aehart/L1Trigger-TrackFindingTracklet/tree/new_extended_wiring

---------

Co-authored-by: Jannicke Pearkes <jannicke.pearkes@cern.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants