L1track jet emulator update #40563

gkaratha · 2023-01-18T23:28:17Z

Dear experts

This PR includes the updated trackjet emulation code. The new code has a different structure and uses common functions between emulator and simulation. This way we are sure that exactly the same code is run in both cases and the only difference is in the inputs. The code was presented in the GTT meeting:

Best regards,
George

cmsbuild · 2023-01-18T23:38:09Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40563/33795

This PR adds an extra 36KB to repository

Code check has found code style and quality issues which could be resolved by applying following patch(s)

code-format:
https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40563/33795/code-format.patch
e.g. curl -k https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40563/33795/code-format.patch | patch -p1
You can also run scram build code-format to apply code format directly

cecilecaillol · 2023-01-20T10:38:20Z

DataFormats/L1Trigger/src/TkJetWord.cc

The namespace is still l1t

cecilecaillol · 2023-01-20T10:38:39Z

DataFormats/L1Trigger/src/classes_def.xml

-  <class name="l1t::TkJetWord" ClassVersion="3">
-    <version ClassVersion="3" checksum="3521396532"/>
+  <class name="l1t::TkJetWord" ClassVersion="4">
+    <version ClassVersion="4" checksum="2346039066"/>


Can you keep the ClassVersion 3 below?

@cecilecaillol How I can do that? This number is generated automatically (as far as I know). Is there a way to keep it bellow 3? If so I would be glad to do it.

You should use ClassVersion 4 as automatically generated, but ClassVersion 3 details are still written below to keep track:

class name="l1t::TkJetWord" ClassVersion="4"
version ClassVersion="4" checksum="2346039066"/
version ClassVersion="3" checksum="3521396532"/

Hi Cecile,

Ok If I understand correctly, use the class v4 but keep the v3 lines as well (like comment) right?

yes, see eg

cmssw/DataFormats/L1Trigger/src/classes_def.xml

Lines 2 to 5 in a473301

<class name="l1t::L1Candidate" ClassVersion="12">

<version ClassVersion="12" checksum="939575486"/>

<version ClassVersion="11" checksum="2395983446"/>

<version ClassVersion="10" checksum="3629668391"/>

Thanks a lot. I will do it today and update the PR!

Dear Cecile,

I did it in my new update. Let me know if you have more questions

cecilecaillol · 2023-01-20T10:38:59Z

L1Trigger/L1TTrackMatch/interface/L1TrackJetEmulationProducer.h

@@ -1,3 +1,5 @@
+
+


Remove the empty lines

cecilecaillol · 2023-01-20T10:44:49Z

L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py

+
+L1TrackJetsEmulation = cms.EDProducer('L1TrackJetEmulatorProducer',
+	L1TrackInputTag= cms.InputTag("L1GTTInputProducer", "Level1TTTracksConverted"),
+        #L1TrackInputTag= cms.InputTag("L1TrackSelectionProducer", "Level1TTTracksSelectedEmulation"),       


Remove commented line

cecilecaillol · 2023-01-20T10:46:14Z

L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py

+L1TrackJetsEmulation = cms.EDProducer('L1TrackJetEmulatorProducer',
+	L1TrackInputTag= cms.InputTag("L1GTTInputProducer", "Level1TTTracksConverted"),


These lines are not following the naming conventions. l1tTrackJetsEmulation, l1tGTTInputProducer

The convention changed when I was working in the code... I have changed them now

cecilecaillol · 2023-01-20T10:48:24Z

L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py

+
+#displaced jets
+L1TrackJetsExtended = cms.EDProducer('L1TrackJetProducer',
+	L1TrackInputTag= cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"),


l1tTTTracksFromExtendedTrackletEmulation

cecilecaillol · 2023-01-20T10:48:39Z

L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py

+#displaced jets
+L1TrackJetsExtended = cms.EDProducer('L1TrackJetProducer',
+	L1TrackInputTag= cms.InputTag("TTTracksFromExtendedTrackletEmulation", "Level1TTTracks"),
+        VertexInputTag = cms.InputTag("VertexProducerEmu","l1verticesEmulation"),


l1tVertexProducerEmu

I think this is l1tVertexFinderEmulator right?

cecilecaillol · 2023-01-20T10:49:01Z

L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py

+)
+
+L1TrackJetsExtendedEmulation = cms.EDProducer('L1TrackJetEmulatorProducer',
+	L1TrackInputTag= cms.InputTag("L1GTTInputProducerExtended", "Level1TTTracksExtendedConverted"),


l1tGTTInputProducerExtended

cecilecaillol · 2023-01-20T10:49:12Z

L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py

+
+L1TrackJetsExtendedEmulation = cms.EDProducer('L1TrackJetEmulatorProducer',
+	L1TrackInputTag= cms.InputTag("L1GTTInputProducerExtended", "Level1TTTracksExtendedConverted"),
+        VertexInputTag=cms.InputTag("VertexProducerEmu", "l1verticesEmulation"),


l1tVertexProducerEmu

cecilecaillol · 2023-01-20T10:49:27Z

L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py

+L1TrackJetsEmulation = cms.EDProducer('L1TrackJetEmulatorProducer',
+	L1TrackInputTag= cms.InputTag("L1GTTInputProducer", "Level1TTTracksConverted"),
+        #L1TrackInputTag= cms.InputTag("L1TrackSelectionProducer", "Level1TTTracksSelectedEmulation"),       
+        VertexInputTag=cms.InputTag("VertexProducerEmu","l1verticesEmulation"),


l1tVertexProducerEmu

perrotta · 2023-02-07T14:58:25Z

@gkaratha do you plan to apply the code-format update and implement the comments from the code review, or should we close this PR instead?

gkaratha · 2023-02-07T15:02:04Z

Hi @perrotta ,

Yes I will implement the comments (thanks @cecilecaillol ). Sorry for the delay (the Moriond period is tough).

Best,
George

cmsbuild · 2023-02-17T17:02:51Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40563/34250

This PR adds an extra 20KB to repository
Found files with invalid states:
- L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py:
  - Added: d430268
  - Deleted: 044d18e
- L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py:
  - Added: d430268
  - Deleted: 044d18e

Code check has found code style and quality issues which could be resolved by applying following patch(s)

code-format:
https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40563/34250/code-format.patch
e.g. curl -k https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40563/34250/code-format.patch | patch -p1
You can also run scram build code-format to apply code format directly

cmsbuild · 2023-02-17T17:22:03Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40563/34252

This PR adds an extra 40KB to repository
Found files with invalid states:
- L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py:
  - Added: d430268
  - Deleted: 044d18e
- L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py:
  - Added: d430268
  - Deleted: 044d18e

cmsbuild · 2023-02-17T17:22:29Z

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

It involves the following packages:

DataFormats/L1Trigger (l1)
L1Trigger/DemonstratorTools (l1)
L1Trigger/L1TTrackMatch (upgrade, l1)

@rekovic, @epalencia, @cmsbuild, @AdrianoDee, @srimanob, @cecilecaillol can you please review it and eventually sign? Thanks.
@kreczko, @rovere, @eyigitba, @Martin-Grunewald, @missirol, @thomreis, @dinyar 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

cmsbuild · 2023-02-21T14:42:15Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40563/34293

This PR adds an extra 20KB to repository
Found files with invalid states:
- L1Trigger/L1TTrackMatch/python/L1TrackJetEmulationProducer_cfi.py:
  - Added: d430268
  - Deleted: 044d18e
- L1Trigger/L1TTrackMatch/python/L1TrackJetProducer_cfi.py:
  - Added: d430268
  - Deleted: 044d18e

cmsbuild · 2023-05-03T12:38:11Z

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

perrotta · 2023-05-03T12:42:39Z

please test

cmsbuild · 2023-05-03T15:13:54Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0dc9e2/32343/summary.html
COMMIT: 79afeb4
CMSSW: CMSSW_13_1_X_2023-05-02-2300/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/40563/32343/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

You potentially removed 59 lines from the logs
Reco comparison results: 7 differences found in the comparisons
DQMHistoTests: Total files compared: 48
DQMHistoTests: Total histograms compared: 3460877
DQMHistoTests: Total failures: 3
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3460852
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: no differences found

makortel · 2023-05-03T15:25:45Z

+core

perrotta · 2023-05-04T08:26:38Z

@cms-sw/l1-l2 @cms-sw/upgrade-l2 do you have other comments? Or can we merge this longstanding PR, as it seems now converged to something working in cmssw?

AdrianoDee · 2023-05-04T08:58:30Z

+upgrade

epalencia · 2023-05-04T09:04:40Z

+l1

cmsbuild · 2023-05-04T09:05:09Z

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-04T09:11:49Z

+1

cmsbuild added this to the CMSSW_13_0_X milestone Jan 18, 2023

cmsbuild added code-checks-pending l1-pending orp-pending pending-signatures tests-pending upgrade-pending labels Jan 18, 2023

cmsbuild added code-checks-rejected and removed code-checks-pending labels Jan 18, 2023

cecilecaillol reviewed Jan 20, 2023

View reviewed changes

cmsbuild mentioned this pull request Jan 26, 2023

Backport codes for adding new data catalogs from Rucio storage description (RucioCatalog) and use it by default instead of trivial data catalogs (TrivialCatalog) #37278, and related bug fixes #40628

Closed

smuzaffar modified the milestones: CMSSW_13_0_X, CMSSW_13_1_X Feb 11, 2023

cmsbuild added code-checks-pending and removed code-checks-rejected labels Feb 17, 2023

cmsbuild added code-checks-rejected code-checks-pending and removed code-checks-pending code-checks-rejected labels Feb 17, 2023

cmsbuild added code-checks-approved and removed code-checks-pending labels Feb 17, 2023

cmsbuild added code-checks-pending and removed code-checks-approved labels Feb 21, 2023

cmsbuild added the code-checks-approved label May 3, 2023

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

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

cmsbuild added core-approved and removed core-pending labels May 3, 2023

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

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

cmsbuild added l1-approved fully-signed and removed l1-pending pending-signatures labels May 4, 2023

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

cmsbuild merged commit 69fbbc1 into cms-sw:master May 4, 2023

cmsbuild mentioned this pull request May 5, 2023

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

Merged

This was referenced May 5, 2023

L1track jet emulator update (backport of PR40563) cms-l1t-offline/cmssw#1116

Closed

L1track jet emulator update (backport of PR40563) cms-l1t-offline/cmssw#1117

Merged

	<class name="l1t::L1Candidate" ClassVersion="12">
	<version ClassVersion="12" checksum="939575486"/>
	<version ClassVersion="11" checksum="2395983446"/>
	<version ClassVersion="10" checksum="3629668391"/>

		L1TrackJetsEmulation = cms.EDProducer('L1TrackJetEmulatorProducer',
		L1TrackInputTag= cms.InputTag("L1GTTInputProducer", "Level1TTTracksConverted"),

L1track jet emulator update #40563

L1track jet emulator update #40563

Conversation

gkaratha commented Jan 18, 2023

cmsbuild commented Jan 18, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cecilecaillol Feb 20, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

perrotta commented Feb 7, 2023

gkaratha commented Feb 7, 2023

cmsbuild commented Feb 17, 2023

cmsbuild commented Feb 17, 2023

cmsbuild commented Feb 17, 2023

cmsbuild commented Feb 21, 2023

cmsbuild commented May 3, 2023

perrotta commented May 3, 2023

cmsbuild commented May 3, 2023

Comparison Summary

makortel commented May 3, 2023

perrotta commented May 4, 2023

AdrianoDee commented May 4, 2023

epalencia commented May 4, 2023

cmsbuild commented May 4, 2023

perrotta commented May 4, 2023

cecilecaillol Feb 20, 2023 •

edited

Loading