Correlator PR corresponding to l1t-offline PR 1063 #41279

aloeliger · 2023-04-05T07:34:34Z

PR description:

This PR now takes the place of #41260 which messed up the git history, and supersedes the original PR #40670

Previous PR description:

This is an update of the correlator code

Includes:

p2l1pfp#92 by @thesps and @slaurila
p2l1pfp#94 by @thomreis and @cerminar (only adds a new feature to the emulator, doesn't change any of the existing emulated values)
p2l1pfp#96 by @thesps
p2l1pfp#97 by @drankincms
p2l1pfp#98 by @drankincms (not used by default)
p2l1pfp#100 by @thesps
p2l1pfp#101 by @gpetruc (not used in production)
p2l1pfp#105 by @gpetruc (not used in production)
p2l1pfp#107 by @gpetruc (transparent)

Local: cms-l1t-offline#1063

My apologies to the original authors, but the code has been squashed to remove history. I have added everyone as co-authors to the squashed commit, but it may not be your github email address.

I will be updating this PR as requested in the original thread and the messed up PR, as soon as I am able.

Co-authored-by: Sioni Summers <sioni.paris.summers@cern.ch> Co-authored-by: Santeri Laurila <santeri.laurila@cern.ch> Co-authored-by: Thomas Reis <thomas.reis@cern.ch> Co-authored-by: Gianluca Cerminara <gianluca.cerminara@cern.ch> Co-authored-by: Dylan Rankin <dylan.sheldon.rankin@cern.ch> Co-authored-by: Giovanni Petrucciani <giovanni.petrucciani@cern.ch> Co-authored-by: Emyr Clement <emyr.john.clement@cern.ch>

cmsbuild · 2023-04-05T07:41:14Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-41279/35046

This PR adds an extra 100KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py modified in PR(s): Add missing L1 jet collection to event (Phase 2) #41258
- File L1Trigger/Configuration/python/SimL1Emulator_cff.py modified in PR(s): L1track jet emulator update #40563

cmsbuild · 2023-04-05T07:41:49Z

A new Pull Request was created by @aloeliger (Andrew Loeliger) for master.

It involves the following packages:

DataFormats/L1TParticleFlow (upgrade, l1)
L1Trigger/Configuration (l1)
L1Trigger/Phase2L1ParticleFlow (upgrade, l1)

@epalencia, @cmsbuild, @AdrianoDee, @srimanob, @aloeliger, @cecilecaillol can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @missirol, @rovere this is something you requested to watch as well.
@perrotta, @dpiparo, @rappoccio you are the release manager for this.

cms-bot commands are listed here

Add SC jets from extended tracks to event content.

cmsbuild · 2023-04-05T12:07:09Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-41279/35050

This PR adds an extra 16KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py modified in PR(s): Add missing L1 jet collection to event (Phase 2) #41258
- File L1Trigger/Configuration/python/SimL1Emulator_cff.py modified in PR(s): L1track jet emulator update #40563

cmsbuild · 2023-04-05T12:07:42Z

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

aloeliger · 2023-04-05T12:31:08Z

@makortel In reference to: #40670 (comment), could you look over my shoulder a bit on a22c934 and make sure this solves your comment adequately. This should put the session at the cache level and reference it at the ID level for running of the NN, but I'm tossing around references to pointers, which seems like the sort of thing one should double check with somebody.

cmsbuild · 2023-04-05T12:33:28Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-41279/35052

This PR adds an extra 104KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py modified in PR(s): Add missing L1 jet collection to event (Phase 2) #41258
- File L1Trigger/Configuration/python/SimL1Emulator_cff.py modified in PR(s): L1track jet emulator update #40563

cmsbuild · 2023-04-05T12:33:59Z

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

cmsbuild · 2023-04-30T13:56:21Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-41279/35332

This PR adds an extra 16KB to repository
Found files with invalid states:
- L1Trigger/Phase2L1ParticleFlow/python/L1BJetProducer_cfi.py:
  - Added: 455c7bd
  - Modified: 6802f37
  - Deleted: 51266ce
- L1Trigger/Phase2L1ParticleFlow/plugins/L1BJetPFJetProducer.cc:
  - Added: 4b4967d
  - Deleted: 455c7bd
There are other open Pull requests which might conflict with changes you have proposed:
- File DataFormats/L1TParticleFlow/interface/layer1_emulator.h modified in PR(s): Phase-2 L1T e/g: new Composite Electron ID #41290
- File DataFormats/L1TParticleFlow/src/classes_def.xml modified in PR(s): Phase-2 L1T e/g: new Composite Electron ID #41290
- File L1Trigger/Configuration/python/SimL1Emulator_cff.py modified in PR(s): implement fw-based Phase2 EG standalone barrel #41224, L1track jet emulator update #40563
- File L1Trigger/Phase2L1ParticleFlow/interface/conifer.h modified in PR(s): Phase-2 L1T e/g: new Composite Electron ID #41290
- File L1Trigger/Phase2L1ParticleFlow/plugins/L1TCorrelatorLayer1Producer.cc modified in PR(s): Phase-2 L1T e/g: new Composite Electron ID #41290
- File L1Trigger/Phase2L1ParticleFlow/plugins/L1TCtL2EgProducer.cc modified in PR(s): Phase-2 L1T e/g: new Composite Electron ID #41290
- File L1Trigger/Phase2L1ParticleFlow/plugins/PFClusterProducerFromHGC3DClusters.cc modified in PR(s): Phase-2 L1T e/g: new Composite Electron ID #41290
- File L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py modified in PR(s): Phase-2 L1T e/g: new Composite Electron ID #41290
- File L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer2EG_cff.py modified in PR(s): Phase-2 L1T e/g: new Composite Electron ID #41290

cmsbuild · 2023-04-30T13:56:56Z

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

aloeliger · 2023-05-01T14:20:37Z

please test

cmsbuild · 2023-05-01T17:48:55Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-add0e4/32275/summary.html
COMMIT: 46d37af
CMSSW: CMSSW_13_1_X_2023-05-01-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/41279/32275/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

You potentially added 8 lines to the logs
ROOTFileChecks: Some differences in event products or their sizes found
Reco comparison results: 11 differences found in the comparisons
DQMHistoTests: Total files compared: 48
DQMHistoTests: Total histograms compared: 3460877
DQMHistoTests: Total failures: 67
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3460788
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 47 files compared)
Checked 207 log files, 159 edm output root files, 48 DQM output files
TriggerResults: found differences in 3 / 46 workflows

aloeliger · 2023-05-01T22:49:32Z

+l1

AdrianoDee · 2023-05-03T07:20:48Z

+upgrade
(comments addressed, there's this only left but to be honest I can't really say it would be blocking from my side)

cmsbuild · 2023-05-03T07:21:23Z

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

perrotta · 2023-05-03T08:04:39Z

@smuzzafar, do I remember correctly that there was a way to get the output of the static analyzer even if it is not accessible through the usual link in #41279 (comment) ?

Update files that have been removed in cms-sw/cmssw#41279

perrotta · 2023-05-04T08:12:29Z

+1

It is a pity that we cannot access the results of the static analyzer, because this PR was somehow messed up before the last commits, and those warnings can be useful to spot possible hidden mistakes in the logic. Let keep an eye on those outputs in the IBs, when available

EmyrClement and others added 2 commits April 3, 2023 11:36

Add SC jets from extended tracks to event content.

d3f00bd

cmsbuild added this to the CMSSW_13_1_X milestone Apr 5, 2023

cmsbuild added l1-pending pending-signatures tests-pending orp-pending upgrade-pending code-checks-pending labels Apr 5, 2023

aloeliger mentioned this pull request Apr 5, 2023

Add missing L1 jet collection to event (Phase 2) #41258

Closed

cmsbuild added code-checks-approved and removed code-checks-pending labels Apr 5, 2023

EmyrClement mentioned this pull request Apr 5, 2023

Add SC jets from extended tracks to event content. aloeliger/cmssw#2

Merged

Merge pull request #2 from EmyrClement/bTagNN_addExtSCJets_master

75130d6

Add SC jets from extended tracks to event content.

cmsbuild added code-checks-pending and removed code-checks-approved labels Apr 5, 2023

cmsbuild added code-checks-approved and removed code-checks-pending labels Apr 5, 2023

Add tensorflow session to cache, and reference it at ID level

a22c934

cmsbuild added code-checks-pending and removed code-checks-approved labels Apr 5, 2023

cmsbuild added code-checks-approved and removed code-checks-pending labels Apr 5, 2023

cmsbuild added code-checks-approved and removed code-checks-pending labels Apr 30, 2023

cmsbuild added tests-started and removed tests-pending labels May 1, 2023

cmsbuild added tests-approved and removed tests-started labels May 1, 2023

cmsbuild added l1-approved and removed l1-pending labels May 1, 2023

cmsbuild added fully-signed upgrade-approved and removed pending-signatures upgrade-pending labels May 3, 2023

smuzaffar modified the milestones: CMSSW_13_1_X, CMSSW_13_2_X May 4, 2023

cmsbuild added a commit to cms-data/L1Trigger-Phase2L1ParticleFlow that referenced this pull request May 4, 2023

Merge pull request #5 from aloeliger/master

1f8553b

Update files that have been removed in cms-sw/cmssw#41279

cmsbuild added orp-approved and removed orp-pending labels May 4, 2023

cmsbuild merged commit 3cd98a0 into cms-sw:master May 4, 2023

This was referenced May 4, 2023

Add flag to drop quality of low-pt TkMuons without an SA match #41546

Merged

bug fix for DBG IB: use correct variable name #41549

Merged

EmyrClement mentioned this pull request May 16, 2023

Phase2 L1T - Ensure cluster ecal_eta/phi are set when not running CombinedCaloLinker. #41697

Merged

Correlator PR corresponding to l1t-offline PR 1063 #41279

Correlator PR corresponding to l1t-offline PR 1063 #41279

Uh oh!

Conversation

aloeliger commented Apr 5, 2023

PR description:

Uh oh!

cmsbuild commented Apr 5, 2023

Uh oh!

cmsbuild commented Apr 5, 2023

Uh oh!

cmsbuild commented Apr 5, 2023

Uh oh!

cmsbuild commented Apr 5, 2023

Uh oh!

aloeliger commented Apr 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cmsbuild commented Apr 5, 2023

Uh oh!

cmsbuild commented Apr 5, 2023

Uh oh!

cmsbuild commented Apr 30, 2023

Uh oh!

cmsbuild commented Apr 30, 2023

Uh oh!

aloeliger commented May 1, 2023

Uh oh!

cmsbuild commented May 1, 2023

Comparison Summary

Uh oh!

aloeliger commented May 1, 2023

Uh oh!

AdrianoDee commented May 3, 2023

Uh oh!

cmsbuild commented May 3, 2023

Uh oh!

perrotta commented May 3, 2023

Uh oh!

perrotta commented May 4, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

aloeliger commented Apr 5, 2023 •

edited

Loading