L1 tracking update by tschuh · Pull Request #47056 · cms-sw/cmssw

tschuh · 2025-01-08T13:30:01Z

This PR updates mainly the modules

L1Trigger/TrackFindingTracklet
L1Trigger/TrackFindingTMTT
L1Trigger/TrackTrigger
L1Trigger/TrackerDTC
L1Trigger/TrackerTFP
DataFormats/L1TrackTrigger
SimTracker/TrackTriggerAssociation
in order to sync s/w emulation of L1 tracking with current f/w. Some name changes have also been propagated to additional modules.

The code changes of this PR did pass review of L1 tracking community checking for L1 tracking performance, code formats, etc.

cmsbuild · 2025-01-08T13:30:44Z

cms-bot internal usage

cmsbuild · 2025-01-08T13:32:54Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-47056/43207

Found files with invalid states:
- .github/workflows/github_CI.yml:
  - Added: 7be6717
  - Deleted: 2daee4b
- L1Trigger/TrackFindingTracklet/test/AnalyzerTFP.cc:
  - Added: b057b56
  - Deleted: 4a7b448
- L1Trigger/TrackFindingTracklet/data/wires_hourglassExtendedAllCombined.dat:
  - Added: 44cb866
  - Deleted: 2daee4b
- L1Trigger/TrackFindingTracklet/test/L1TrkNtuple.root:
  - Added: 4a7b448
  - Deleted: a27075e
- L1Trigger/TrackFindingTracklet/data/memorymodules_hourglassExtendedAllCombined.dat:
  - Added: 44cb866
  - Deleted: 2daee4b
There are other open Pull requests which might conflict with changes you have proposed:
- File L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker.cc modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackFindingTracklet/python/Producer_cfi.py modified in PR(s): L1Trk reco enabling CheckHistory by default #43690, Displaced vertexing gbdt #45672
- File L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackFindingTracklet/src/DR.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673
- File L1Trigger/TrackFindingTracklet/src/KFin.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673
- File L1Trigger/TrackFindingTracklet/test/AnalyzerDR.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673
- File L1Trigger/TrackFindingTracklet/test/AnalyzerKFout.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673
- File L1Trigger/TrackFindingTracklet/test/AnalyzerDRin.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673
- File L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker.cc modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackTrigger/interface/L1TrackQuality.h modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackTrigger/python/TrackQualityParams_cfi.py modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackTrigger/src/L1TrackQuality.cc modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackTrigger/src/Setup.cc modified in PR(s): L1Trk reco enabling CheckHistory by default #43690
- File L1Trigger/TrackerDTC/python/ProducerED_cfi.py modified in PR(s): L1Trk reco enabling CheckHistory by default #43690
- File L1Trigger/TrackerTFP/python/Producer_cfi.py modified in PR(s): L1Trk reco enabling CheckHistory by default #43690
- File L1Trigger/TrackFindingTracklet/test/AnalyzerKFin.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673

cmsbuild · 2025-01-08T13:33:23Z

A new Pull Request was created by @tschuh for master.

It involves the following packages:

Configuration/StandardSequences (operations)
DataFormats/L1TrackTrigger (l1, upgrade)
L1Trigger/L1TTrackMatch (l1, upgrade)
L1Trigger/Phase2L1ParticleFlow (l1, upgrade)
L1Trigger/TrackFindingTMTT (l1)
L1Trigger/TrackFindingTracklet (l1)
L1Trigger/TrackTrigger (l1, upgrade)
L1Trigger/TrackerDTC (l1, upgrade)
L1Trigger/TrackerTFP (l1)
SimTracker/TrackTriggerAssociation (l1, simulation)

@Moanwar, @aloeliger, @antoniovilela, @civanch, @cmsbuild, @davidlange6, @epalencia, @fabiocos, @kpedro88, @mandrenguyen, @mdhildreth, @rappoccio, @srimanob, @subirsarkar can you please review it and eventually sign? Thanks.
@GiacomoSguazzoni, @Martin-Grunewald, @VinInn, @VourMa, @dgulhan, @erikbutz, @fabiocos, @felicepantaleo, @makortel, @missirol, @mmusich, @mtosi, @rovere, @sameasy, @skinnari, @slomeo, @sviret, @threus this is something you requested to watch as well.
@antoniovilela, @mandrenguyen, @rappoccio, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

makortel · 2025-01-08T14:40:23Z

DataFormats/L1TrackTrigger/src/classes_def.xml

  <class name="edm::Wrapper<tt::TTTrackRefMap>"/>
  <class name="TTDTC"/>
  <class name="edm::Wrapper<TTDTC>"/>
+  <class name="std::vector<std::pair<double, double>>"/>


This dictionary already exists in

cmssw/DataFormats/StdDictionaries/src/classes_def_vector.xml

Line 14 in 134545c

<class name="std::vector<std::pair<double,double> >"/>

Please remove from here

makortel · 2025-01-08T14:41:28Z

DataFormats/L1TrackTrigger/src/classes_def.xml

  <class name="TTDTC"/>
  <class name="edm::Wrapper<TTDTC>"/>
+  <class name="std::vector<std::pair<double, double>>"/>
+  <class name="edm::Wrapper<std::vector<std::pair<double, double>>>"/>


This dictionary should be placed in DataFormats/WrappedStdDictionaries/src/classes_def.xml.

cmsbuild · 2025-01-08T16:57:52Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-47056/43216

Found files with invalid states:
- .github/workflows/github_CI.yml:
  - Added: 7be6717
  - Deleted: 2daee4b
- L1Trigger/TrackFindingTracklet/test/AnalyzerTFP.cc:
  - Added: b057b56
  - Deleted: 4a7b448
- L1Trigger/TrackFindingTracklet/data/wires_hourglassExtendedAllCombined.dat:
  - Added: 44cb866
  - Deleted: 2daee4b
- L1Trigger/TrackFindingTracklet/test/L1TrkNtuple.root:
  - Added: 4a7b448
  - Deleted: a27075e
- L1Trigger/TrackFindingTracklet/data/memorymodules_hourglassExtendedAllCombined.dat:
  - Added: 44cb866
  - Deleted: 2daee4b
There are other open Pull requests which might conflict with changes you have proposed:
- File L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker.cc modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackFindingTracklet/python/Producer_cfi.py modified in PR(s): L1Trk reco enabling CheckHistory by default #43690, Displaced vertexing gbdt #45672
- File L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackFindingTracklet/src/DR.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673
- File L1Trigger/TrackFindingTracklet/src/KFin.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673
- File L1Trigger/TrackFindingTracklet/test/AnalyzerDR.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673
- File L1Trigger/TrackFindingTracklet/test/AnalyzerKFout.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673
- File L1Trigger/TrackFindingTracklet/test/AnalyzerDRin.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673
- File L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker.cc modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackTrigger/interface/L1TrackQuality.h modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackTrigger/python/TrackQualityParams_cfi.py modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackTrigger/src/L1TrackQuality.cc modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackTrigger/src/Setup.cc modified in PR(s): L1Trk reco enabling CheckHistory by default #43690
- File L1Trigger/TrackerDTC/python/ProducerED_cfi.py modified in PR(s): L1Trk reco enabling CheckHistory by default #43690
- File L1Trigger/TrackerTFP/python/Producer_cfi.py modified in PR(s): L1Trk reco enabling CheckHistory by default #43690
- File L1Trigger/TrackFindingTracklet/test/AnalyzerKFin.cc modified in PR(s): fix minor type issues in L1Trigger/TrackFindingTracklet #43673

cmsbuild · 2025-01-08T16:58:24Z

Pull request #47056 was updated. @Dr15Jones, @Moanwar, @aloeliger, @antoniovilela, @civanch, @cmsbuild, @davidlange6, @epalencia, @fabiocos, @kpedro88, @makortel, @mandrenguyen, @mdhildreth, @rappoccio, @smuzaffar, @srimanob, @subirsarkar can you please check and sign again.

makortel · 2025-01-08T17:08:57Z

@cmsbuild, please test

makortel · 2025-01-08T17:14:50Z

Found files with invalid states:

.github/workflows/github_CI.yml:

Added: 7be6717

Deleted: 2daee4b

L1Trigger/TrackFindingTracklet/test/AnalyzerTFP.cc:

Added: b057b56

Deleted: 4a7b448

L1Trigger/TrackFindingTracklet/data/wires_hourglassExtendedAllCombined.dat:

Added: 44cb866

Deleted: 2daee4b

L1Trigger/TrackFindingTracklet/test/L1TrkNtuple.root:

Added: 4a7b448

Deleted: a27075e

L1Trigger/TrackFindingTracklet/data/memorymodules_hourglassExtendedAllCombined.dat:

Added: 44cb866

Deleted: 2daee4b

Eventually these files would need to be removed from the commit history. (the AnalyzerTFP could be left as that's really only moved around in both "Added" and "Deleted" commits, but the other files need to be cleaned up)

…ls where it is relevant and to several test configurations

The StreamID will be needed to implement implicit host-to-device copies for Alpaka EDProducers

kpedro88 · 2025-01-09T14:37:04Z

-1
incorrect rebase

tschuh · 2025-01-09T14:37:18Z

I tried to squash our commits but must have messed up. I will reopen this PR from scratch with our commits squased.

cmsbuild · 2025-01-09T14:37:33Z

This PR contains too many commits (390 >= 240) and will not be processed.
Please ensure you have selected the correct target branch and consider squashing unnecessary commits.
The processing of this PR will resume once the commit count drops below the limit.

kpedro88 · 2025-01-09T14:40:29Z

@tschuh please note there is a command git cms-squash-topic which will preserve authorship.

tschuh · 2025-01-09T15:02:05Z

@tschuh please note there is a command git cms-squash-topic which will preserve authorship.

thanks, will do better next time.

cmsbuild added this to the CMSSW_15_0_X milestone Jan 8, 2025

cmsbuild added simulation-pending l1-pending operations-pending pending-signatures tests-pending orp-pending upgrade-pending code-checks-pending trk changes-dataformats labels Jan 8, 2025

cmsbuild added code-checks-approved and removed code-checks-pending labels Jan 8, 2025

makortel reviewed Jan 8, 2025

View reviewed changes

cmsbuild added core-pending code-checks-pending and removed code-checks-approved labels Jan 8, 2025

cmsbuild added code-checks-approved and removed code-checks-pending labels Jan 8, 2025

cmsbuild added tests-started and removed tests-pending labels Jan 8, 2025

cmsbuild added tests-rejected and removed tests-started labels Jan 8, 2025

mmusich and others added 22 commits January 9, 2025 14:24

add a fillDescriptions to DeepNNTagInfoProducer

e20d260

add fillDescriptions to DeepFlavourJetTagsProducer

0702b2b

add fillDescriptions to MuonLinksProducer{ForHLT}

edcb5a5

add fillDescriptions to TrackWithVertexSelector

02ddc33

add fillDescriptions to JetTracksAssociatorAtVertex

d605838

add fillDescriptions to FixedGridRhoProducerFastjet

732dcfe

add fillDescriptions to L2MuonCandidateProducer

4bf0189

add fillDescriptions to L3MuonCandidateProducer

376928f

add fillDescriptions to AnalyticalTrackSelector

420c1d9

add fillDescriptions to a bunch of EVf plugins used at HLT

195b8af

add fillDescriptions to a bunch of RECO plugins used at HLT

78f1e9f

add BeamSpotCompatibilityChecker in all the all-in-one validation too…

773bad2

…ls where it is relevant and to several test configurations

Improve BeamSpotCompatibilityChecker

3ed24ea

add offlineBeamSpot event product to Z->mm based alcarecos

4f6e75a

update

f8a61f8

move eventID outside loop

9d9ba37

clang19 fix: template argument list is expected after a name prefixed

0f053df

Fix compilation issue with gcc13.

5ca3f67

Add Transformer compilation test for stream producers

0571721

Add StreamID parameter to Transformer callback functions

a55088f

The StreamID will be needed to implement implicit host-to-device copies for Alpaka EDProducers

using proper place for std data formats.

102952d

adressing clang errors.

744a5b4

tschuh force-pushed the L1TK-PR-14_2_0_pre4 branch from c12a855 to 744a5b4 Compare January 9, 2025 14:35

tschuh closed this Jan 9, 2025

tschuh deleted the L1TK-PR-14_2_0_pre4 branch January 9, 2025 14:39

Conversation

tschuh commented Jan 8, 2025

Uh oh!

cmsbuild commented Jan 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cmsbuild commented Jan 8, 2025

Uh oh!

cmsbuild commented Jan 8, 2025

Uh oh!

makortel Jan 8, 2025

Choose a reason for hiding this comment

Uh oh!

tschuh Jan 8, 2025

Choose a reason for hiding this comment

Uh oh!

makortel Jan 8, 2025

Choose a reason for hiding this comment

Uh oh!

tschuh Jan 8, 2025

Choose a reason for hiding this comment

Uh oh!

cmsbuild commented Jan 8, 2025

Uh oh!

cmsbuild commented Jan 8, 2025

Uh oh!

makortel commented Jan 8, 2025

Uh oh!

makortel commented Jan 8, 2025

Uh oh!

kpedro88 commented Jan 9, 2025

Uh oh!

tschuh commented Jan 9, 2025

Uh oh!

cmsbuild commented Jan 9, 2025

Uh oh!

kpedro88 commented Jan 9, 2025

Uh oh!

tschuh commented Jan 9, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

cmsbuild commented Jan 8, 2025 •

edited

Loading