Merge pull request #44707 from hqucms/pr/backport-44335

[14_0_X] backport of 44335 (slimmedMETsNoHF and possible cleanup)
cms-sw · Apr 18, 2024 · f3de8c4 · f3de8c4
2 parents a682e37 + ba9712d
commit f3de8c4
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 26 deletions.
diff --git a/DQM/Physics/python/singleTopDQM_miniAOD_cfi.py b/DQM/Physics/python/singleTopDQM_miniAOD_cfi.py
@@ -30,7 +30,7 @@
       muons = cms.InputTag("slimmedMuons"),
       elecs = cms.InputTag("slimmedElectrons"),
       jets  = cms.InputTag("slimmedJets"),
-      mets  = cms.VInputTag("slimmedMETs", "slimmedMETsNoHF", "slimmedMETsPuppi"),
+      mets  = cms.VInputTag("slimmedMETs", "slimmedMETsPuppi"),
       pvs   = cms.InputTag("offlineSlimmedPrimaryVertices")
     ),
 
@@ -118,7 +118,7 @@
       muons = cms.InputTag("slimmedMuons"),
       elecs = cms.InputTag("slimmedElectrons"),
       jets  = cms.InputTag("slimmedJets"),
-      mets  = cms.VInputTag("slimmedMETs", "slimmedMETsNoHF", "slimmedMETsPuppi"),
+      mets  = cms.VInputTag("slimmedMETs", "slimmedMETsPuppi"),
       pvs   = cms.InputTag("offlineSlimmedPrimaryVertices")
 
     ),

diff --git a/DQM/Physics/python/topSingleLeptonDQM_miniAOD_cfi.py b/DQM/Physics/python/topSingleLeptonDQM_miniAOD_cfi.py
@@ -29,7 +29,7 @@
       muons = cms.InputTag("slimmedMuons"),
       elecs = cms.InputTag("slimmedElectrons"),
       jets  = cms.InputTag("slimmedJets"),
-      mets  = cms.VInputTag("slimmedMETs", "slimmedMETsNoHF", "slimmedMETsPuppi"),
+      mets  = cms.VInputTag("slimmedMETs", "slimmedMETsPuppi"),
       pvs   = cms.InputTag("offlineSlimmedPrimaryVertices")
 
     ),
@@ -126,7 +126,7 @@
       muons = cms.InputTag("slimmedMuons"),
       elecs = cms.InputTag("slimmedElectrons"),
       jets  = cms.InputTag("slimmedJets"),
-      mets  = cms.VInputTag("slimmedMETs", "slimmedMETsNoHF", "slimmedMETsPuppi"),
+      mets  = cms.VInputTag("slimmedMETs", "slimmedMETsPuppi"),
       pvs   = cms.InputTag("offlineSlimmedPrimaryVertices")
 
     ),

diff --git a/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.cc b/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.cc
@@ -268,7 +268,6 @@ namespace SingleTopTChannelLepton_miniAOD {
     // pt of the 4. leading jet (corrected to L2+L3)
     //hists_["jet4Pt_"] = ibooker.book1D("Jet4Pt", "pt_{30,loose}(jet4)", 60, 0., 300.);
     // MET (tc)
-    hists_["slimmedMETsNoHF_"] = ibooker.book1D("slimmedMETsNoHF", "MET_{slimmedNoHF}", 40, 0., 200.);
     // MET (pflow)
     hists_["slimmedMETsPuppi_"] = ibooker.book1D("slimmedMETsPuppi", "MET_{slimmedPuppi}", 40, 0., 200.);
     // dz for muons (to suppress cosmis)
@@ -666,8 +665,6 @@ namespace SingleTopTChannelLepton_miniAOD {
         unsigned int idx = met_ - mets_.begin();
         if (idx == 0)
           fill("slimmedMETs_", met->begin()->et());
-        if (idx == 1)
-          fill("slimmedMETsNoHF_", met->begin()->et());
         if (idx == 2)
           fill("slimmedMETsPuppi_", met->begin()->et());
       }

diff --git a/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.cc b/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.cc
@@ -258,7 +258,6 @@ namespace TopSingleLepton_miniAOD {
     // pt of the 4. leading jet (corrected to L2+L3)
     hists_["jet4Pt_"] = ibooker.book1D("Jet4Pt", "pt_{30,loose}(jet4)", 60, 0., 300.);
     // MET (tc)
-    hists_["slimmedMETsNoHF_"] = ibooker.book1D("slimmedMETsNoHF", "MET_{slimmedNoHF}", 40, 0., 200.);
     // MET (pflow)
     hists_["slimmedMETsPuppi_"] = ibooker.book1D("slimmedMETsPuppi", "MET_{slimmedPuppi}", 40, 0., 200.);
     // dz for muons (to suppress cosmis)
@@ -639,8 +638,6 @@ namespace TopSingleLepton_miniAOD {
         unsigned int idx = met_ - mets_.begin();
         if (idx == 0)
           fill("slimmedMETs_", met->begin()->et());
-        if (idx == 1)
-          fill("slimmedMETsNoHF_", met->begin()->et());
         if (idx == 2)
           fill("slimmedMETsPuppi_", met->begin()->et());
       }

diff --git a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py
@@ -22,7 +22,6 @@
         'drop recoBaseTagInfosOwned_slimmedJetsAK8_*_*',
         'keep *_slimmedJetsPuppi_*_*',
         'keep *_slimmedMETs_*_*',
-        'keep *_slimmedMETsNoHF_*_*',
         'keep *_slimmedMETsPuppi_*_*',
         'keep *_slimmedSecondaryVertices_*_*',
         'keep *_slimmedLambdaVertices_*_*',

diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
@@ -184,20 +184,6 @@ def _applySubstructure(process):
     task.add(process.slimmedMETs)
     (~pp_on_AA).toModify(process.slimmedMETs, addDeepMETs = True)
 
-    def _add_slimmedMETsNoHF(process):
-        addToProcessAndTask('slimmedMETsNoHF', process.slimmedMETs.clone(), process, task)
-        process.slimmedMETsNoHF.src = cms.InputTag("patMETsNoHF")
-        process.slimmedMETsNoHF.rawVariation =  cms.InputTag("patPFMetNoHF")
-        process.slimmedMETsNoHF.t1Uncertainties = cms.InputTag("patPFMetT1%sNoHF") 
-        process.slimmedMETsNoHF.t01Variation = cms.InputTag("patPFMetT0pcT1NoHF")
-        process.slimmedMETsNoHF.t1SmearedVarsAndUncs = cms.InputTag("patPFMetT1Smear%sNoHF")
-        process.slimmedMETsNoHF.tXYUncForRaw = cms.InputTag("patPFMetTxyNoHF")
-        process.slimmedMETsNoHF.tXYUncForT1 = cms.InputTag("patPFMetT1TxyNoHF")
-        process.slimmedMETsNoHF.tXYUncForT01 = cms.InputTag("patPFMetT0pcT1TxyNoHF")
-        process.slimmedMETsNoHF.tXYUncForT1Smear = cms.InputTag("patPFMetT1SmearTxyNoHF")
-        process.slimmedMETsNoHF.tXYUncForT01Smear = cms.InputTag("patPFMetT0pcT1SmearTxyNoHF")
-        del process.slimmedMETsNoHF.caloMET
-    (~pp_on_AA).toModify(process, _add_slimmedMETsNoHF)
     # ================== NoHF pfMET
 
     #  ==================  CHSMET 

diff --git a/PhysicsTools/PatAlgos/test/corMETFromMiniAOD.py b/PhysicsTools/PatAlgos/test/corMETFromMiniAOD.py
@@ -135,7 +135,6 @@
     compressionAlgorithm = cms.untracked.string('LZMA'),
     eventAutoFlushCompressedSize = cms.untracked.int32(15728640),
     outputCommands = cms.untracked.vstring( "keep *_slimmedMETs_*_*",
-                                            "keep *_slimmedMETsNoHF_*_*",
                                             "keep *_patPFMet_*_*",
                                             "keep *_patPFMetT1_*_*",
                                             "keep *_patPFMetT1JetResDown_*_*",