Deprecate hbhe noise filter

CommonTools/RecoAlgos/python/HBHENoiseFilter_cfi.py

@@ -1,25 +1,24 @@
+#
+# This is a replacement for the original HBHENoiseFilter configuration.
+# See https://twiki.cern.ch/twiki/bin/viewauth/CMS/HCALNoiseFilterRecipe.
+# Note that this replacement relies on having the HcalNoiseSummary in the
+# event record but not necessarily HBHENoiseFilterResult.
+#
 import FWCore.ParameterSet.Config as cms
 
+# Module which will remake HBHENoiseFilterResult
+from CommonTools.RecoAlgos.HBHENoiseFilterResultProducer_cfi import HBHENoiseFilterResultProducer
+MakeHBHENoiseFilterResult = HBHENoiseFilterResultProducer.clone()
+
+# Filter on the standard HCAL noise decision
 HBHENoiseFilter = cms.EDFilter(
-    'HBHENoiseFilter',
-    noiselabel = cms.InputTag('hcalnoise'),
-    minRatio = cms.double(-999.0),
-    maxRatio = cms.double(999.0),
-    minHPDHits = cms.int32(17),
-    minRBXHits = cms.int32(999),
-    minHPDNoOtherHits = cms.int32(10),
-    minZeros = cms.int32(10),
-    minHighEHitTime = cms.double(-9999.0),
-    maxHighEHitTime = cms.double(9999.0),
-    maxRBXEMF = cms.double(-999.0),
-    minNumIsolatedNoiseChannels = cms.int32(10),
-    minIsolatedNoiseSumE = cms.double(50.0),
-    minIsolatedNoiseSumEt = cms.double(25.0),
-    useTS4TS5 = cms.bool(False),
-    useRBXRechitR45Loose = cms.bool(False),
-    useRBXRechitR45Tight = cms.bool(False),
-    IgnoreTS4TS5ifJetInLowBVRegion=cms.bool(True),
-    jetlabel = cms.InputTag('ak4PFJets'),
-    maxjetindex = cms.int32(0), # maximum jet index that will be checked for 'IgnoreTS4TS5ifJetInLowBVRegion'
-    maxNHF = cms.double(0.9) # maximum allowed jet->neutralHadronEnergyFraction()
-    )
+    'BooleanFlagFilter',
+    inputLabel = cms.InputTag('MakeHBHENoiseFilterResult','HBHENoiseFilterResult'),
+    reverseDecision = cms.bool(False)
+)
+
+# Customize MakeHBHENoiseFilterResult in the same manner
+# as HBHENoiseFilterResultProducer
+from Configuration.StandardSequences.Eras import eras
+eras.run2_common.toModify(MakeHBHENoiseFilterResult, IgnoreTS4TS5ifJetInLowBVRegion=False)
+eras.run2_25ns_specific.toModify(MakeHBHENoiseFilterResult, defaultDecision="HBHENoiseFilterResultRun2Loose")

DQMOffline/JetMET/interface/CaloTowerAnalyzer.h

@@ -15,7 +15,6 @@
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/CaloTowers/interface/CaloTower.h"
 #include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
-#include "CommonTools/RecoAlgos/interface/HBHENoiseFilter.h"
 
 #include <string>
 #include <map>

DQMOffline/JetMET/interface/METAnalyzer.h

@@ -73,7 +73,6 @@
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 
 #include "DQMOffline/JetMET/interface/JetMETDQMDCSFilter.h"
-#include "CommonTools/RecoAlgos/interface/HBHENoiseFilter.h"
 #include "PhysicsTools/SelectorUtils/interface/JetIDSelectionFunctor.h"
 #include "PhysicsTools/SelectorUtils/interface/PFJetIDSelectionFunctor.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"

DQMOffline/JetMET/src/CaloTowerAnalyzer.cc

@@ -54,7 +54,6 @@
 #include <cmath>
 #include <memory>
 #include <TLorentzVector.h>
-#include "CommonTools/RecoAlgos/interface/HBHENoiseFilter.h"
 
 using namespace reco;
 using namespace edm;

PhysicsTools/PatAlgos/python/slimming/metFilterPaths_cff.py

@@ -2,12 +2,12 @@
 
 ## We don't use "import *" because the cff contains some modules for which the C++ class doesn't exist
 ## and this triggers an error under unscheduled mode
-from RecoMET.METFilters.metFilters_cff import HBHENoiseFilter, CSCTightHaloFilter, hcalLaserEventFilter, EcalDeadCellTriggerPrimitiveFilter, eeBadScFilter, ecalLaserCorrFilter
+from RecoMET.METFilters.metFilters_cff import MakeHBHENoiseFilterResult, HBHENoiseFilter, CSCTightHaloFilter, hcalLaserEventFilter, EcalDeadCellTriggerPrimitiveFilter, eeBadScFilter, ecalLaserCorrFilter
 from RecoMET.METFilters.metFilters_cff import goodVertices, trackingFailureFilter, trkPOGFilters, manystripclus53X, toomanystripclus53X, logErrorTooManyClusters
 from RecoMET.METFilters.metFilters_cff import metFilters
 
 # individual filters
-Flag_HBHENoiseFilter = cms.Path(HBHENoiseFilter)
+Flag_HBHENoiseFilter = cms.Path(MakeHBHENoiseFilterResult * HBHENoiseFilter)
 Flag_CSCTightHaloFilter = cms.Path(CSCTightHaloFilter)
 Flag_hcalLaserEventFilter = cms.Path(hcalLaserEventFilter)
 Flag_EcalDeadCellTriggerPrimitiveFilter = cms.Path(EcalDeadCellTriggerPrimitiveFilter)
@@ -27,7 +27,7 @@
 
 def miniAOD_customizeMETFiltersFastSim(process):
     """Replace some MET filters that don't work in FastSim with trivial bools"""
-    for X in 'CSCTightHaloFilter', 'HBHENoiseFilter':
+    for X in 'CSCTightHaloFilter', 'HBHENoiseFilter', 'MakeHBHENoiseFilterResult':
         process.globalReplace(X, cms.EDFilter("HLTBool", result=cms.bool(True)))
     for X in 'manystripclus53X', 'toomanystripclus53X', 'logErrorTooManyClusters':
         process.globalReplace(X, cms.EDFilter("HLTBool", result=cms.bool(False)))

RecoJets/JetAnalyzers/src/myFilter.cc

@@ -37,7 +37,6 @@
 
 
 // include files
-#include "CommonTools/RecoAlgos/interface/HBHENoiseFilter.h"
 #include "DataFormats/METReco/interface/HcalNoiseSummary.h"
 
 

RecoJets/JetAnalyzers/src/myJetAna.cc

@@ -67,7 +67,6 @@
 // #include "DataFormats/Scalers/interface/DcsStatus.h"
 
 // include files
-#include "CommonTools/RecoAlgos/interface/HBHENoiseFilter.h"
 #include "DataFormats/METReco/interface/HcalNoiseSummary.h"
 
 #include "DataFormats/METReco/interface/HcalCaloFlagLabels.h"  

RecoMET/METFilters/python/metFilters_cff.py

@@ -43,6 +43,7 @@
 ## good events.
 
 metFilters = cms.Sequence(
+   MakeHBHENoiseFilterResult *
    HBHENoiseFilter *
    CSCTightHaloFilter *
    hcalLaserEventFilter *

SLHCUpgradeSimulations/Configuration/python/postLS1Customs.py

@@ -120,13 +120,17 @@ def customise_DQM(process):
     # Turn off "low bias voltage" region in HCAL noise filters
     if hasattr(process,'HBHENoiseFilterResultProducer'):
         process.HBHENoiseFilterResultProducer.IgnoreTS4TS5ifJetInLowBVRegion = cms.bool(False)
+    if hasattr(process,'MakeHBHENoiseFilterResult'):
+        process.MakeHBHENoiseFilterResult.IgnoreTS4TS5ifJetInLowBVRegion = cms.bool(False)
     return process
 
 
 def customise_DQM_25ns(process):
     # Switch the default decision of the HCAL noise filter
     if hasattr(process,'HBHENoiseFilterResultProducer'):
         process.HBHENoiseFilterResultProducer.defaultDecision = cms.string("HBHENoiseFilterResultRun2Loose")
+    if hasattr(process,'MakeHBHENoiseFilterResult'):
+        process.MakeHBHENoiseFilterResult.defaultDecision = cms.string("HBHENoiseFilterResultRun2Loose")
     return process