Skip to content

Conversation

@skinnari
Copy link
Contributor

@skinnari skinnari commented Jul 9, 2021

PR description:

This PR is a backport of PR #34215, which was recently merged, and is identical to the original one except that it is rebased for CMSSW_11_3_X. This PR includes updates to the L1 tracking for HL-LHC.

Similar as the original PR, this PR must be coupled to, and tested with, the update in: cms-data/L1Trigger-TrackFindingTracklet#3. This update of data files were merged to master along with the original PR though, so I am not sure how it is handled from the central SW side? But that update is needed also for this backport.

PR validation:

Same as #34215

if this PR is a backport please specify the original PR and why you need to backport that PR:

Since HL-LHC L1 tracking/trigger studies still use the CMSSW_11_3_X series, we need it backported to here.

aehart and others added 21 commits July 9, 2021 12:13
* Various changes for outputting PurgeDuplicates test-vectors.

* Removed some magic numbers.

* Updated trackfitstr() to be more readable and include more comments.

* Removed more magic.
* Update max steps per TM period to match HLS

* Updated MC dataset
* add beam spot constraint flag to save new bcon values

* add check on scaled chi2 value after beam constraint

* get rid of code duplication

* include comment on kalmanAddBeamConstr_ boolean

* take out unecessary function
* Anders DTC merge with a gazillion manual fixes

* propagate buildfile fixes

* code formats

* fix cherrypick  mess up

* Remove LayerProjection class

* Further cleanup of tracklet projections interface

* Correct number of processing steps by changing < to <=

* Add missing include of algorithm

* Remove extra const

* Remove some commented out code

* Remove duplicate code

* Fix message logger and DTC Stub for consistency with hybrid configuration

* Fix problem with writing of input link memories

* Create Residual class that will replace LayerResidual and DiskResidual

* Remove the use of the class DiskResiduals

* Remove unused nMatch and nMatchDisk method of Tracklet

* (Re-)Implement the correction to writing the DTC data link file after moving functionality to Sector.

* Combine addMatch method for disk and layers into on method

* combine the disk and layer match into one method

* Remove some redundant poiters to l1tstubs

* Pass iSeed to Tracklet

* Introduce an InputRouter module. Does not change functionality, but simplifies/unifies the code and makes it similar to the HLS

* Cleanup of writing the DTC link files

* Change processing order such that all steps in one sector are done and then move to the next sector. This saves memory

* Interface updates for CMSSW following change to module processing order

* Change in VMRouter to processing PS links before 2S in disks

* Cleanup of unused iSector variable in processs and memory modules

* Fixes to make the HybridTracks_cfg.py run

* Cleanup of hardcoded numbers etc.

* Updates to MP to put all regions into one memory slot in the ProjectionTemp

* Fix to calculation of irinv for projections - no matches what is done in HLS

* Remove now unused file paths for the old cable mapping code

* Correct missplaced curly bracket

* Fixes for the displaced tracking

* Fix to avoid duplicate VMSTE name in D1 for standard configuration

* Address comments from Louise S.

* Ran scram b code-format

* Address comments from Louise S.

* Addressing more comments from Louise S.

* More fixes to comments

* Make running hybrid default (not displaced)

* restore buildfile

* Add DTC link config to Settings.h

* Changes to suppress warning in MatchCalculator when running displaced tracking

* Fix typo introduced in code cleanup for MatchProcessor

Co-authored-by: Anders Ryd <[email protected]>
Co-authored-by: Anders <[email protected]>
* Fix to compiler warning and removal of hardoded value in MatchCalculator

* Updates to fix names of pins to make unique

Co-authored-by: Anders Ryd <[email protected]>
* Fix to compiler warning and removal of hardoded value in MatchCalculator

* Updates to fix names of pins to make unique

* Migrate to new format of table for phi correction memory

* Remove unused TETableBase class

* Cleanup of VMRouterTable

* Cleanup of LUT for bend consistency

* Cleanup of LUT used in MEU for bend consistency

* Cleanup code for disk bend table

* cleanup of code to generate table used by TE

* Cleanup of TP LUTs

* Cleanup of LUTs for MatchCalculator cuts

* Fix names of new LUT when writing to files

* Cleanup of writing LUTs for the combined modules

* Add code to write projection bend table for disk projections

* More cleanup to remove hard coded layer and seed numbers

* Cleanup of hardcoded numbers

* Remove few more hardcoded constants:

* Some further cleanup based on comments from Louise S.

Co-authored-by: Anders Ryd <[email protected]>
Co-authored-by: Louise Skinnari <[email protected]>
* Updates to MatchProcessor so that we can get full agreement with HLS version

* Fix to LUT for adding stub in VMStubsTEMemory when running extendted tracking

Co-authored-by: Anders Ryd <[email protected]>
…ing (#82)

* Corrections to fix updates to new LUTs that broke the displaced tracking

* Fix compile errors in CMSSW

* Remove commented out code

Co-authored-by: Louise Skinnari <[email protected]>
* fix matchtp variables

* remove d=0 variables

* switch values for cms constants

* change pi to constant

* change trk_d0 sign

* move tmp_tp_d0 and tmp_tp_z0 calc up

* flip tp_d0 sign
@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 9, 2021

A new Pull Request was created by @skinnari (Louise Skinnari) for CMSSW_11_3_X.

It involves the following packages:

  • L1Trigger/TrackFindingTMTT (l1)
  • L1Trigger/TrackFindingTracklet (l1)
  • L1Trigger/TrackerDTC (upgrade, l1)

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

cms-bot commands are listed here

@cecilecaillol
Copy link
Contributor

please test with cms-data/L1Trigger-TrackFindingTracklet#3

@srimanob
Copy link
Contributor

@skinnari
Why do you need it in 11_3? Thx.

@skinnari
Copy link
Contributor Author

hi, we initially thought we needed this back-ported for use by the Phase-2 L1 trigger studies (since these use 11_3) but decided to consider just having it in 12_X, hence the "draft". it seems we don't need to make the back-port after all, so I will close this draft PR now.

@skinnari skinnari closed this Jul 12, 2021
@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-1fdc1b/16695/summary.html
COMMIT: 23e948d
CMSSW: CMSSW_11_3_X_2021-07-11-0000/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34422/16695/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 38
  • DQMHistoTests: Total histograms compared: 2878314
  • DQMHistoTests: Total failures: 325
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2877967
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 37 files compared)
  • Checked 160 log files, 37 edm output root files, 38 DQM output files
  • TriggerResults: no differences found

@tomalin tomalin deleted the L1TK-PR-june2021_backport 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.

8 participants