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

fix dump of nano + add modifier for 122 mini #38749

Closed
wants to merge 2 commits into from
Closed

fix dump of nano + add modifier for 122 mini #38749

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
651ea92
fix dump of nano
mariadalfonso Jul 14, 2022
52aa2f4
add modifier to run nano from 122 mini
mariadalfonso Jul 21, 2022
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
3 changes: 3 additions & 0 deletions Configuration/Eras/python/Modifier_run3_nanoAOD_122_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_nanoAOD_122 = cms.Modifier()
3 changes: 2 additions & 1 deletion Configuration/StandardSequences/python/Eras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ def __init__(self):
'trackingLowPU', 'trackingPhase1', 'ctpps', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'ctpps_2021', 'trackingPhase2PU140','highBetaStar_2018',
'tracker_apv_vfp30_2016', 'pf_badHcalMitigationOff', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X',
'run2_nanoAOD_94XMiniAODv1', 'run2_nanoAOD_94XMiniAODv2', 'run2_nanoAOD_94X2016',
'run2_miniAOD_devel', 'run2_nanoAOD_102Xv1', 'run2_nanoAOD_106Xv1', 'run2_nanoAOD_106Xv2', 'run3_nanoAOD_devel',
'run2_miniAOD_devel', 'run2_nanoAOD_102Xv1', 'run2_nanoAOD_106Xv1', 'run2_nanoAOD_106Xv2',
'run3_nanoAOD_devel', 'run3_nanoAOD_122',
'hcalHardcodeConditions', 'hcalSkipPacker',
'run2_HLTconditions_2016','run2_HLTconditions_2017','run2_HLTconditions_2018',
'bParking']
Expand Down
8 changes: 4 additions & 4 deletions PhysicsTools/NanoAOD/python/nano_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,23 +219,23 @@ def nanoAOD_recalibrateMETs(process,isData):
from PhysicsTools.SelectorUtils.tools.vid_id_tools import *
def nanoAOD_activateVID(process):

switchOnVIDElectronIdProducer(process,DataFormat.MiniAOD,electronTask)
switchOnVIDElectronIdProducer(process,DataFormat.MiniAOD)
for modname in electron_id_modules_WorkingPoints_nanoAOD.modules:
setupAllVIDIdsInModule(process,modname,setupVIDElectronSelection)

electronTask_ = process.egmGsfElectronIDTask.copy()
electronTask_.add(electronTask.copy())
electronTask_.add(process.electronTask)
process.electronTask = electronTask_.copy()
for modifier in run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
modifier.toModify(process.electronMVAValueMapProducer, src = "slimmedElectronsUpdated")
modifier.toModify(process.egmGsfElectronIDs, physicsObjectSrc = "slimmedElectronsUpdated")

switchOnVIDPhotonIdProducer(process,DataFormat.MiniAOD,photonTask) # do not call this to avoid resetting photon IDs in VID, if called before inside makePuppiesFromMiniAOD
switchOnVIDPhotonIdProducer(process,DataFormat.MiniAOD) # do not call this to avoid resetting photon IDs in VID, if called before inside makePuppiesFromMiniAOD
for modname in photon_id_modules_WorkingPoints_nanoAOD.modules:
setupAllVIDIdsInModule(process,modname,setupVIDPhotonSelection)

photonTask_ = process.egmPhotonIDTask.copy()
photonTask_.add(photonTask.copy())
photonTask_.add(process.photonTask)
process.photonTask = photonTask_.copy()
for modifier in run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1:
modifier.toModify(process.photonMVAValueMapProducer, src = "slimmedPhotonsTo106X")
Expand Down
1 change: 1 addition & 0 deletions PhysicsTools/NanoAOD/python/nano_eras_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016

from Configuration.Eras.Modifier_run3_nanoAOD_devel_cff import run3_nanoAOD_devel
from Configuration.Eras.Modifier_run3_nanoAOD_122_cff import run3_nanoAOD_122

run2_nanoAOD_ANY = (
run2_miniAOD_80XLegacy | run2_nanoAOD_92X | run2_nanoAOD_94X2016 | run2_nanoAOD_94XMiniAODv1 | run2_nanoAOD_94XMiniAODv2 | run2_nanoAOD_102Xv1 | run2_nanoAOD_106Xv1 | run2_nanoAOD_106Xv2
Expand Down