Merge pull request #11789 from dertexaner/Switch-default-HBHENoiseFil…

…ter-to-25ns-V2 Switch default HBHENoiseFilter settings to Run2-25ns configuration V2 - 76X
cms-sw · Oct 23, 2015 · ec3ff71 · ec3ff71
2 parents af34182 + 9acf9a8
commit ec3ff71
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/CommonTools/RecoAlgos/plugins/HBHENoiseFilterResultProducer.cc b/CommonTools/RecoAlgos/plugins/HBHENoiseFilterResultProducer.cc
@@ -61,6 +61,9 @@ class HBHENoiseFilterResultProducer : public edm::stream::EDProducer<> {
       double minIsolatedNoiseSumE_;
       double minIsolatedNoiseSumEt_;
 
+      edm::EDGetTokenT<unsigned int> bunchSpacing_;
+      bool useBunchSpacingProducer_;
+
       // other members
       std::map<std::string, bool> decisionMap_;
 };
@@ -85,6 +88,10 @@ HBHENoiseFilterResultProducer::HBHENoiseFilterResultProducer(const edm::Paramete
   minIsolatedNoiseSumE_ = iConfig.getParameter<double>("minIsolatedNoiseSumE");
   minIsolatedNoiseSumEt_ = iConfig.getParameter<double>("minIsolatedNoiseSumEt");
 
+  // parameters needed for bunch-spacing check 
+  bunchSpacing_ = consumes<unsigned int>(edm::InputTag("bunchSpacingProducer"));
+  useBunchSpacingProducer_ = iConfig.getParameter<bool>("useBunchSpacingProducer");
+
   produces<bool>("HBHENoiseFilterResult");
   produces<bool>("HBHENoiseFilterResultRun1");
   produces<bool>("HBHENoiseFilterResultRun2Loose");
@@ -147,6 +154,21 @@ HBHENoiseFilterResultProducer::produce(edm::Event& iEvent, const edm::EventSetup
       iEvent.put(pOut, it->first);
   }
 
+  // Overwrite defaultDecision_ dynamically based on bunchSpacingProducer
+  if( useBunchSpacingProducer_ ){
+    edm::Handle<unsigned int> bunchSpacingH;
+    iEvent.getByToken(bunchSpacing_,bunchSpacingH);
+    unsigned int bunchspacing = 0;
+    if( bunchSpacingH.isValid() ){
+      bunchspacing = *bunchSpacingH;
+      if( bunchspacing == 50 ){
+	defaultDecision_ = "HBHENoiseFilterResultRun1";
+      } else{
+	defaultDecision_ = "HBHENoiseFilterResultRun2Loose";
+      } 
+    }
+  }
+
   // Write out the default flag
   std::map<std::string, bool>::const_iterator it = decisionMap_.find(defaultDecision_);
   if (it == decisionMap_.end())

diff --git a/CommonTools/RecoAlgos/python/HBHENoiseFilterResultProducer_cfi.py b/CommonTools/RecoAlgos/python/HBHENoiseFilterResultProducer_cfi.py
@@ -7,12 +7,12 @@
     minHPDNoOtherHits = cms.int32(10),
     minZeros = cms.int32(9999),
     IgnoreTS4TS5ifJetInLowBVRegion = cms.bool(True),
-    defaultDecision = cms.string("HBHENoiseFilterResultRun1"),
+    defaultDecision = cms.string("HBHENoiseFilterResultRun2Loose"),
     minNumIsolatedNoiseChannels = cms.int32(10),
     minIsolatedNoiseSumE = cms.double(50.0),
-    minIsolatedNoiseSumEt = cms.double(25.0)
+    minIsolatedNoiseSumEt = cms.double(25.0),
+    useBunchSpacingProducer = cms.bool(True)
 )
 
 from Configuration.StandardSequences.Eras import eras
 eras.run2_common.toModify(HBHENoiseFilterResultProducer, IgnoreTS4TS5ifJetInLowBVRegion=False)
-eras.run2_25ns_specific.toModify(HBHENoiseFilterResultProducer, defaultDecision="HBHENoiseFilterResultRun2Loose")
diff --git a/SLHCUpgradeSimulations/Configuration/python/postLS1Customs.py b/SLHCUpgradeSimulations/Configuration/python/postLS1Customs.py
@@ -191,9 +191,7 @@ def customise_DQM(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")
+    #Empty place-holder
     return process