Merged run3_muon_YEAR into one single run3_muon modifier. Addressed r…

…emaining comments from PR
cms-sw · Mar 9, 2024 · f8ae986 · f8ae986
1 parent 63f02c4
commit f8ae986
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/Configuration/Eras/python/Era_Run3_cff.py b/Configuration/Eras/python/Era_Run3_cff.py
@@ -16,9 +16,8 @@
 from Configuration.Eras.Modifier_run3_RPC_cff import run3_RPC
 from Configuration.Eras.Modifier_run3_ecal_cff import run3_ecal
 from Configuration.Eras.Modifier_hcalPfCutsFromDB_cff import hcalPfCutsFromDB
-from Configuration.Eras.Modifier_run3_muon_2022_cff import run3_muon_2022
-from Configuration.Eras.Modifier_run3_muon_2023_cff import run3_muon_2023
+from Configuration.Eras.Modifier_run3_muon_cff import run3_muon
 
 Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018, run2_egamma_2018, run2_HLTconditions_2018]),
-                         run3_common, run3_egamma, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2022, dd4hep, run3_RPC, run3_ecal, hcalPfCutsFromDB, run3_muon_2022, run3_muon_2023)
+                         run3_common, run3_egamma, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2022, dd4hep, run3_RPC, run3_ecal, hcalPfCutsFromDB, run3_muon)
 
diff --git a/Configuration/Eras/python/Modifier_run3_muon_2023_cff.py b/Configuration/Eras/python/Modifier_run3_muon_2023_cff.py
diff --git a/...ras/python/Modifier_run3_muon_2022_cff.py → ...ion/Eras/python/Modifier_run3_muon_cff.py b/...ras/python/Modifier_run3_muon_2022_cff.py → ...ion/Eras/python/Modifier_run3_muon_cff.py
@@ -1,3 +1,3 @@
 import FWCore.ParameterSet.Config as cms
 
-run3_muon_2022=cms.Modifier()
+run3_muon=cms.Modifier()
diff --git a/PhysicsTools/NanoAOD/python/electrons_cff.py b/PhysicsTools/NanoAOD/python/electrons_cff.py
@@ -359,7 +359,7 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
         jetNDauCharged = Var("?userCand('jetForLepJetVar').isNonnull()?userFloat('jetNDauChargedMVASel'):0", "uint8", doc="number of charged daughters of the closest jet"),
     ),
     externalVariables = cms.PSet(
-        promptMVA = ExtVar(cms.InputTag("muonPROMPTMVA"),float, doc="Prompt MVA lepton ID score. Corresponds to the previous mvaTTH",precision=14),
+        promptMVA = ExtVar(cms.InputTag("electronPROMPTMVA"),float, doc="Prompt MVA lepton ID score. Corresponds to the previous mvaTTH",precision=14),
         fsrPhotonIdx = ExtVar(cms.InputTag("leptonFSRphotons:eleFsrIndex"), "int16", doc="Index of the lowest-dR/ET2 among associated FSR photons"),
     ),
 )

diff --git a/PhysicsTools/NanoAOD/python/muons_cff.py b/PhysicsTools/NanoAOD/python/muons_cff.py
@@ -135,7 +135,7 @@
     weightFile = "PhysicsTools/NanoAOD/data/mu_BDTG_2016.weights.xml",
 )
 
-~run3_muon.toModify(
+(run2_muon_2017 | run2_muon_2018).toModify(
     muonPROMPTMVA,
     weightFile =  cms.FileInPath("PhysicsTools/NanoAOD/data/mu_BDTG_2017.weights.xml"),
     variablesOrder = cms.vstring(["LepGood_pt","LepGood_eta","LepGood_jetNDauChargedMVASel","LepGood_miniRelIsoCharged","LepGood_miniRelIsoNeutral","LepGood_jetPtRelv2","LepGood_jetDF","LepGood_jetPtRatio","LepGood_dxy","LepGood_sip3d","LepGood_dz","LepGood_segmentComp"]),

diff --git a/PhysicsTools/NanoAOD/python/nano_eras_cff.py b/PhysicsTools/NanoAOD/python/nano_eras_cff.py
@@ -5,9 +5,9 @@
 from Configuration.Eras.Modifier_run2_jme_2017_cff import run2_jme_2017
 from Configuration.Eras.Modifier_run2_jme_2018_cff import run2_jme_2018
 from Configuration.Eras.Modifier_run2_muon_2016_cff import run2_muon_2016
+from Configuration.Eras.Modifier_run2_muon_2017_cff import run2_muon_2017
 from Configuration.Eras.Modifier_run2_muon_2018_cff import run2_muon_2018
-from Configuration.Eras.Modifier_run3_muon_2022_cff import run3_muon_2022
-from Configuration.Eras.Modifier_run3_muon_2023_cff import run3_muon_2023
+from Configuration.Eras.Modifier_run3_muon_cff import run3_muon
 
 from Configuration.Eras.Modifier_run2_HLTconditions_2016_cff import run2_HLTconditions_2016
 from Configuration.Eras.Modifier_run2_HLTconditions_2017_cff import run2_HLTconditions_2017
@@ -25,4 +25,3 @@
 )
 
 run2_egamma = (run2_egamma_2016 | run2_egamma_2017 | run2_egamma_2018)
-run3_muon = (run3_muon_2022 | run3_muon_2023)