V15-Lite reNANO for 2022/2023.

Author: hqucms

PhysicsTools/NanoAOD/python/jetsAK4_Puppi_cff.py

@@ -116,12 +116,6 @@
     )
 )
 
-run3_nanoAOD_pre142X.toModify(
-    jetPuppiTable.variables,
-    puIdDisc = None,
-)
-
-
 #jets are not as precise as muons
 jetPuppiTable.variables.pt.precision=10
 

PhysicsTools/NanoAOD/python/jetsAK8_cff.py

@@ -221,19 +221,6 @@ def nanoAOD_addDeepInfoAK8(process, addDeepBTag, addDeepBoostedJet, addDeepDoubl
     )
 )
 
-run3_nanoAOD_pre142X.toModify(
-    subJetTable.variables,
-    btagDeepFlavB = None,
-    btagUParTAK4B = None,
-    UParTAK4RegPtRawCorr = None,
-    UParTAK4RegPtRawCorrNeutrino = None,
-    UParTAK4RegPtRawRes = None,
-    UParTAK4V1RegPtRawCorr = None,
-    UParTAK4V1RegPtRawCorrNeutrino = None,
-    UParTAK4V1RegPtRawRes = None,
-    btagDeepB = Var("bDiscriminator('pfDeepCSVJetTags:probb')+bDiscriminator('pfDeepCSVJetTags:probbb')",float,doc="DeepCSV b+bb tag discriminator",precision=10),
-)
-
 #jets are not as precise as muons
 fatJetTable.variables.pt.precision=10
 subJetTable.variables.pt.precision=10

PhysicsTools/NanoAOD/python/nanoDQM_cff.py

@@ -188,43 +188,6 @@ def _match(name):
     Plot1D('btagDeepCvB', 'btagDeepCvB', 20, -1, 1, 'DeepCSV c vs b+bb discriminator'),
     Plot1D('btagDeepCvL', 'btagDeepCvL', 20, -1, 1, 'DeepCSV c vs udsg discriminator')
 ])
-_Jet_pre142X_plots = cms.VPSet()
-for plot in nanoDQM.vplots.Jet.plots:
-    if 'puIdDisc' not in plot.name.value():
-        _Jet_pre142X_plots.append(plot)
-
-_SubJet_Run2_plots = cms.VPSet()
-for plot in nanoDQM.vplots.SubJet.plots:
-    _SubJet_Run2_plots.append(plot)
-_SubJet_Run2_plots.extend([
-    Plot1D('btagCSVV2', 'btagCSVV2', 20, -1, 1, ' pfCombinedInclusiveSecondaryVertexV2 b-tag discriminator (aka CSVV2)'),
-])
-
-_SubJet_pre142X_plots = cms.VPSet()
-for plot in nanoDQM.vplots.SubJet.plots:
-    if ('btagDeepFlavB' not in plot.name.value()) and ('btagUParTAK4B' not in plot.name.value()) and ('UParTAK4Reg' not in plot.name.value()):
-        _SubJet_pre142X_plots.append(plot)
-_SubJet_pre142X_plots.extend([
-    Plot1D('btagDeepB', 'btagDeepB', 20, -1, 1, 'Deep B+BB btag discriminator'),
-])
-
-run2_nanoAOD_ANY.toModify(
-    nanoDQM.vplots.FatJet,
-    plots = _FatJet_Run2_plots
-).toModify(
-    nanoDQM.vplots.Jet,
-    plots = _Jet_Run2_plots
-).toModify(
-    nanoDQM.vplots.SubJet,
-    plots = _SubJet_Run2_plots
-)
-run3_nanoAOD_pre142X.toModify(
-    nanoDQM.vplots.Jet,
-    plots = _Jet_pre142X_plots
-).toModify(
-    nanoDQM.vplots.SubJet,
-    plots = _SubJet_pre142X_plots
-)
 
 _Pileup_pre13X_plots = cms.VPSet()
 for plot in nanoDQM.vplots.Pileup.plots:

PhysicsTools/NanoAOD/python/nano_cff.py

@@ -208,7 +208,7 @@ def nanoAOD_customizeCommon(process):
     process = nanoAOD_activateVID(process)
 
     # recompute Puppi weights and remake AK4, AK8 Puppi jets and PuppiMET
-    run2_nanoAOD_106Xv2.toModify(
+    (run2_nanoAOD_106Xv2 | run3_nanoAOD_pre142X).toModify(
         process, lambda p: RecomputePuppiWeightsALL(p)
     )
 
@@ -255,13 +255,8 @@ def nanoAOD_customizeCommon(process):
         process, lambda p : nanoAOD_addTauIds(p, nanoAOD_tau_switch.idsToAdd.value())
     )
 
-    # Add Unified Tagger for Run 2 era
-    (run2_nanoAOD_106Xv2).toModify(
-        nanoAOD_tau_switch, addPNet = True, addUParTInfo = True
-    )
-    # Add Unified Taggers for Run 3 pre 142X (pre v15) era (Unified taggers 
-    # are already added to slimmedTaus in miniAOD for newer eras)
-    run3_nanoAOD_pre142X.toModify(
+    # Add Unified Tagger for Run2 and Run3 pre-142X
+    (run2_nanoAOD_106Xv2 | run3_nanoAOD_pre142X).toModify(
         nanoAOD_tau_switch, addPNet = True, addUParTInfo = True
     )
 
@@ -273,8 +268,8 @@ def nanoAOD_customizeCommon(process):
 
     # Add Unified Tagger For PUPPI Jets (UParT 2024)
     nanoAOD_addUTagToTaus(process,
-                        addUTagInfo = nanoAOD_tau_switch.addUParTInfo.value(),
-                        usePUPPIjets = True
+                          addUTagInfo = nanoAOD_tau_switch.addUParTInfo.value(),
+                          usePUPPIjets = True
     )
 
     nanoAOD_boostedTau_switch = cms.PSet(