Skip to content

[15_0_X] ScoutingNano: Rename era modifier to be more generic (partial backport of #49084) #49172

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

Merged
cmsbuild merged 2 commits into from
Oct 28, 2025
Merged

[15_0_X] ScoutingNano: Rename era modifier to be more generic (partial backport of #49084) #49172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0614a22
rename era modifiers related to scouting
patinkaew Sep 23, 2025
bb78cd6
add era modifier for scouting in 2025
patinkaew Sep 23, 2025
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 Configuration/Eras/python/Era_Run3_2023_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

from Configuration.Eras.Era_Run3_cff import Run3
from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023
from Configuration.Eras.Modifier_run3_scouting_nanoAOD_2023_cff import run3_scouting_nanoAOD_2023
from Configuration.Eras.Modifier_run3_scouting_2023_cff import run3_scouting_2023

Run3_2023 = cms.ModifierChain(Run3, run3_egamma_2023, run3_scouting_nanoAOD_2023)
Run3_2023 = cms.ModifierChain(Run3, run3_egamma_2023, run3_scouting_2023)
4 changes: 2 additions & 2 deletions Configuration/Eras/python/Era_Run3_2024_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

from Configuration.Eras.Era_Run3_cff import Run3
from Configuration.Eras.Modifier_stage2L1Trigger_2024_cff import stage2L1Trigger_2024
from Configuration.Eras.Modifier_run3_scouting_nanoAOD_2024_cff import run3_scouting_nanoAOD_2024
from Configuration.Eras.Modifier_run3_scouting_2024_cff import run3_scouting_2024

Run3_2024 = cms.ModifierChain(Run3, stage2L1Trigger_2024, run3_scouting_nanoAOD_2024)
Run3_2024 = cms.ModifierChain(Run3, stage2L1Trigger_2024, run3_scouting_2024)
3 changes: 2 additions & 1 deletion Configuration/Eras/python/Era_Run3_2025_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
from Configuration.Eras.Modifier_stage2L1Trigger_2025_cff import stage2L1Trigger_2025
from Configuration.Eras.Modifier_run3_SiPixel_2025_cff import run3_SiPixel_2025
from Configuration.Eras.Modifier_run3_nanoAOD_2025_cff import run3_nanoAOD_2025
from Configuration.Eras.Modifier_run3_scouting_2025_cff import run3_scouting_2025
from Configuration.ProcessModifiers.ecal_cctiming_cff import ecal_cctiming
from Configuration.ProcessModifiers.siPixelGoodEdgeAlgo_cff import siPixelGoodEdgeAlgo
from Configuration.ProcessModifiers.siPixelDigiMorphing_cff import siPixelDigiMorphing

Run3_2025 = cms.ModifierChain(Run3_2024, run3_GEM_2025, stage2L1Trigger_2025, run3_SiPixel_2025, run3_CSC_2025, run3_nanoAOD_2025, ecal_cctiming, siPixelGoodEdgeAlgo, siPixelDigiMorphing)
Run3_2025 = cms.ModifierChain(Run3_2024, run3_GEM_2025, stage2L1Trigger_2025, run3_SiPixel_2025, run3_CSC_2025, run3_nanoAOD_2025, run3_scouting_2025, ecal_cctiming, siPixelGoodEdgeAlgo, siPixelDigiMorphing)
3 changes: 3 additions & 0 deletions Configuration/Eras/python/Modifier_run3_scouting_2023_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

run3_scouting_2023 = cms.Modifier()
3 changes: 3 additions & 0 deletions Configuration/Eras/python/Modifier_run3_scouting_2024_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

run3_scouting_2024 = cms.Modifier()
3 changes: 3 additions & 0 deletions Configuration/Eras/python/Modifier_run3_scouting_2025_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

run3_scouting_2025 = cms.Modifier()
3 changes: 0 additions & 3 deletions Configuration/Eras/python/Modifier_run3_scouting_nanoAOD_2023_cff.py
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Configuration/Eras/python/Modifier_run3_scouting_nanoAOD_2024_cff.py
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions PhysicsTools/NanoAOD/python/custom_run3scouting_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
scoutingMuonDisplacedVertexTableTask = cms.Task(scoutingMuonDisplacedVertexTable)

# from 2024, there are two muon collections (https://its.cern.ch/jira/browse/CMSHLT-3089)
run3_scouting_nanoAOD_2024.toReplaceWith(scoutingMuonTableTask, cms.Task(scoutingMuonVtxTable, scoutingMuonNoVtxTable))\
run3_scouting_2024.toReplaceWith(scoutingMuonTableTask, cms.Task(scoutingMuonVtxTable, scoutingMuonNoVtxTable))\
.toReplaceWith(scoutingMuonDisplacedVertexTableTask, cms.Task(scoutingMuonVtxDisplacedVertexTable, scoutingMuonNoVtxDisplacedVertexTable))

# Scouting Electron
scoutingElectronTableTask = cms.Task(scoutingElectronTable)

# from 2023, scouting electron's tracks are added as std::vector since multiple tracks can be associated to a scouting electron
# plugin to select the best track to reduce to a single track per scouting electron is added
(run3_scouting_nanoAOD_2023 | run3_scouting_nanoAOD_2024).toReplaceWith(
(run3_scouting_2023 | run3_scouting_2024).toReplaceWith(
scoutingElectronTableTask, cms.Task(scoutingElectronBestTrack, scoutingElectronTable)
)

Expand Down Expand Up @@ -278,7 +278,7 @@ def addScoutingElectronTrack(process):
)

# additional electron track variables added in 2024 in https://github.com/cms-sw/cmssw/pull/43744
run3_scouting_nanoAOD_2024.toModify(
run3_scouting_2024.toModify(
process.scoutingElectronTable.collectionVariables.variables,
pMode = Var("trkpMode", "float", doc="track pMode"),
etaMode = Var("trketaMode", "float", doc="track etaMode"),
Expand Down
14 changes: 7 additions & 7 deletions PhysicsTools/NanoAOD/python/run3scouting_cff.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
from PhysicsTools.NanoAOD.common_cff import *
from PhysicsTools.NanoAOD.simpleCandidateFlatTableProducer_cfi import simpleCandidateFlatTableProducer
from Configuration.Eras.Modifier_run3_scouting_nanoAOD_2023_cff import run3_scouting_nanoAOD_2023
from Configuration.Eras.Modifier_run3_scouting_nanoAOD_2024_cff import run3_scouting_nanoAOD_2024
from Configuration.Eras.Modifier_run3_scouting_2023_cff import run3_scouting_2023
from Configuration.Eras.Modifier_run3_scouting_2024_cff import run3_scouting_2024

#####################################
##### Scouting Original Objects #####
Expand Down Expand Up @@ -125,7 +125,7 @@
# used for both primary vertex and dimuon displaced vertex
# https://github.com/cms-sw/cmssw/blob/CMSSW_14_0_X/DataFormats/Scouting/interface/Run3ScoutingVertex.h

run3_scouting_nanoAOD_2024.toModify(
run3_scouting_2024.toModify(
scoutingVertexVariables,
xyCov = Var('xyCov', 'float', precision=10, doc='xy covariance'),
xzCov = Var('xzCov', 'float', precision=10, doc='xz covariance'),
Expand Down Expand Up @@ -234,7 +234,7 @@
DeltaPhiMax = cms.vdouble(0.06, 0.06)
)

(run3_scouting_nanoAOD_2023 | run3_scouting_nanoAOD_2024).toModify(
(run3_scouting_2023 | run3_scouting_2024).toModify(
scoutingElectronTable.variables,
d0 = None, # replaced with trkd0 (std::vector)
dz = None, # replaced with trkdz (std::vector)
Expand All @@ -253,7 +253,7 @@
# scouting electron format changed for 2024 data-taking in https://github.com/cms-sw/cmssw/pull/43744
# https://github.com/cms-sw/cmssw/blob/CMSSW_14_0_X/DataFormats/Scouting/interface/Run3ScoutingElectron.h

run3_scouting_nanoAOD_2024.toModify(
run3_scouting_2024.toModify(
scoutingElectronTable.variables,
rawEnergy = Var("rawEnergy", "float", precision=10, doc="raw energy"),
preshowerEnergy = Var("preshowerEnergy", "float", precision=10, doc='preshower energy'),
Expand Down Expand Up @@ -301,7 +301,7 @@
# scouting photon format changed for 2024 data-taking in https://github.com/cms-sw/cmssw/pull/43744
# https://github.com/cms-sw/cmssw/blob/CMSSW_14_0_X/DataFormats/Scouting/interface/Run3ScoutingPhoton.h

run3_scouting_nanoAOD_2024.toModify(
run3_scouting_2024.toModify(
scoutingPhotonTable.variables,
rawEnergy = Var("rawEnergy", "float", precision=10, doc="raw energy"),
preshowerEnergy = Var("preshowerEnergy", "float", precision=10, doc='preshower energy'),
Expand Down Expand Up @@ -702,7 +702,7 @@
debugMode = cms.untracked.bool(False),
)

run3_scouting_nanoAOD_2024.toModify(
run3_scouting_2024.toModify(
scoutingFatPFJetReclusterGlobalParticleTransformerJetTags,
model_path = cms.FileInPath("RecoBTag/Combined/data/Run3Scouting/GlobalParticleTransformerAK8/General/V00/global-part_2024.onnx")
)
Expand Down