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.

Sign up for GitHub

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

[14.0.X] L1T DQM: Combined backport of cms-sw/cmssw#45242 and cms-sw/cmssw#45634 #45805

Merged
merged 4 commits into from
Aug 31, 2024
Merged

[14.0.X] L1T DQM: Combined backport of cms-sw/cmssw#45242 and cms-sw/cmssw#45634 #45805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7aa81d4
Era modifier updated from Run3 to Run3_2024 in dqm client configs
jaisatul Aug 5, 2024
c4830a1
Unprescaled AXO seeds (L1_AXO_Nominal, L1_AXO_VTight) added to the un…
jaisatul Jun 17, 2024
06962db
AXO and CICADA seeds added with 2024 era modifier
jaisatul Aug 5, 2024
4119867
Update DQM/L1TMonitor/python/L1TStage2uGTTiming_cfi.py
jaisatul Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import FWCore.ParameterSet.Config as cms

import sys
from Configuration.Eras.Era_Run3_cff import Run3
process = cms.Process("L1TStage2DQM", Run3)
from Configuration.Eras.Era_Run3_2024_cff import Run3_2024
process = cms.Process("L1TStage2DQM", Run3_2024)

unitTest = False
if 'unitTest=True' in sys.argv:
Expand Down
4 changes: 2 additions & 2 deletions DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import FWCore.ParameterSet.Config as cms

import sys
from Configuration.Eras.Era_Run3_cff import Run3
process = cms.Process("L1TStage2EmulatorDQM", Run3)
from Configuration.Eras.Era_Run3_2024_cff import Run3_2024
process = cms.Process("L1TStage2EmulatorDQM", Run3_2024)

unitTest = False
if 'unitTest=True' in sys.argv:
Expand Down
91 changes: 56 additions & 35 deletions DQM/L1TMonitor/python/L1TStage2uGTTiming_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,65 @@
import FWCore.ParameterSet.Config as cms
from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer

unprescaledAlgoList = cms.untracked.vstring(
"L1_SingleMu22_BMTF",
"L1_SingleMu22_OMTF",
"L1_SingleMu22_EMTF",
"L1_SingleIsoEG28er1p5",
"L1_SingleIsoEG32er2p5",
"L1_SingleEG40er2p5",
"L1_SingleEG60",
"L1_SingleTau120er2p1",
"L1_SingleJet180",
"L1_ETMHF130",
"L1_HTT360er",
"L1_ETT2000"
)
prescaledAlgoList = cms.untracked.vstring(
"L1_FirstCollisionInTrain",
"L1_LastCollisionInTrain",
"L1_IsolatedBunch",
"L1_SingleMu0_BMTF",
"L1_SingleMu0_OMTF",
"L1_SingleMu0_EMTF",
"L1_SingleEG10er2p5",
"L1_SingleEG15er2p5",
"L1_SingleEG26er2p5",
"L1_SingleLooseIsoEG28er1p5",
"L1_SingleJet35",
"L1_SingleJet35er2p5",
"L1_SingleJet35_FWD2p5",
"L1_ETMHF100",
"L1_HTT120er",
"L1_ETT1600"
)

unprescaledAlgoList_2024 = cms.untracked.vstring(unprescaledAlgoList)
unprescaledAlgoList_2024.extend([
"L1_AXO_Nominal",
"L1_AXO_VTight",
"L1_CICADA_Medium",
"L1_CICADA_VTight"
])

prescaledAlgoList_2024 = cms.untracked.vstring(prescaledAlgoList)
if "L1_ETT1600" in prescaledAlgoList_2024:
prescaledAlgoList_2024.remove("L1_ETT1600")

l1tStage2uGTTiming = DQMEDAnalyzer('L1TStage2uGTTiming',
l1tStage2uGtSource = cms.InputTag("gtStage2Digis"),
l1tStage2uGtSource = cms.InputTag("gtStage2Digis"),
monitorDir = cms.untracked.string("L1T/L1TStage2uGT/timing_aux"),
verbose = cms.untracked.bool(False),
firstBXInTrainAlgo = cms.untracked.string("L1_FirstCollisionInTrain"),
lastBXInTrainAlgo = cms.untracked.string("L1_LastCollisionInTrain"),
isoBXAlgo = cms.untracked.string("L1_IsolatedBunch"),
unprescaledAlgoShortList = cms.untracked.vstring(
"L1_SingleMu22_BMTF",
"L1_SingleMu22_OMTF",
"L1_SingleMu22_EMTF",
"L1_SingleIsoEG28er1p5",
"L1_SingleIsoEG32er2p5",
"L1_SingleEG40er2p5",
"L1_SingleEG60",
"L1_SingleTau120er2p1",
"L1_SingleJet180",
"L1_ETMHF130",
"L1_HTT360er",
"L1_ETT2000"
),
prescaledAlgoShortList = cms.untracked.vstring(
"L1_FirstCollisionInTrain",
"L1_LastCollisionInTrain",
"L1_IsolatedBunch",
"L1_SingleMu0_BMTF",
"L1_SingleMu0_OMTF",
"L1_SingleMu0_EMTF",
"L1_SingleEG10er2p5",
"L1_SingleEG15er2p5",
"L1_SingleEG26er2p5",
"L1_SingleLooseIsoEG28er1p5",
"L1_SingleJet35",
"L1_SingleJet35er2p5",
"L1_SingleJet35_FWD2p5",
"L1_ETMHF100",
"L1_HTT120er",
"L1_ETT1600"
),
lastBXInTrainAlgo = cms.untracked.string("L1_LastCollisionInTrain"),
isoBXAlgo = cms.untracked.string("L1_IsolatedBunch"),
unprescaledAlgoShortList = unprescaledAlgoList,
prescaledAlgoShortList = prescaledAlgoList,
useAlgoDecision = cms.untracked.string("initial")
)

from Configuration.Eras.Modifier_run3_2024_L1T_cff import run3_2024_L1T
run3_2024_L1T.toModify(l1tStage2uGTTiming,
unprescaledAlgoShortList = unprescaledAlgoList_2024,
prescaledAlgoShortList = prescaledAlgoList_2024
)