Merge pull request #43329 from swagata87/calotower_cutsFromDB

Migrate calotower code to use HCAL thresholds from GT

RecoLocalCalo/CaloTowersCreator/python/calotowermaker_cfi.py

@@ -146,7 +146,10 @@
     AllowMissingInputs = cms.bool(False),
 
 # specify hcal upgrade phase - 0, 1, 2	
-	HcalPhase = cms.int32(0)
+    HcalPhase = cms.int32(0),
+
+# Read HBHE thresholds from Global Tag
+    usePFThresholdsFromDB = cms.bool(False)
 
 )
 
@@ -175,3 +178,8 @@
     HBThreshold2 = 0.2,
     HBThreshold = 0.3,
 )
+
+#--- Use DB conditions for HBHE thresholds for Run3 and phase2
+from Configuration.Eras.Modifier_hcalPfCutsFromDB_cff import hcalPfCutsFromDB
+hcalPfCutsFromDB.toModify( calotowermaker,
+                           usePFThresholdsFromDB = True)

RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.cc

@@ -353,6 +353,8 @@ CaloTowersCreationAlgo::CaloTowersCreationAlgo(double EBthreshold,
   // nalgo=N;
 }
 
+void CaloTowersCreationAlgo::setThresFromDB(const HcalPFCuts* cuts) { hcalCuts = cuts; }
+
 void CaloTowersCreationAlgo::setGeometry(const CaloTowerTopology* cttopo,
                                          const CaloTowerConstituentsMap* ctmap,
                                          const HcalTopology* htopo,
@@ -1271,7 +1273,12 @@ void CaloTowersCreationAlgo::getThresholdAndWeight(const DetId& detId, double& t
     int depth = hcalDetId.depth();
 
     if (subdet == HcalBarrel) {
-      threshold = (depth == 1) ? theHBthreshold1 : (depth == 2) ? theHBthreshold2 : theHBthreshold;
+      if (hcalCuts == nullptr) {  // this means cutsFromDB is false
+        threshold = (depth == 1) ? theHBthreshold1 : (depth == 2) ? theHBthreshold2 : theHBthreshold;
+      } else {  // hcalCuts is not nullptr, i.e. cutsFromDB is true
+        const HcalPFCut* item = hcalCuts->getValues(hcalDetId.rawId());
+        threshold = item->noiseThreshold();
+      }
       weight = theHBweight;
       if (weight <= 0.) {
         ROOT::Math::Interpolator my(theHBGrid, theHBWeights, ROOT::Math::Interpolation::kAKIMA);
@@ -1282,14 +1289,24 @@ void CaloTowersCreationAlgo::getThresholdAndWeight(const DetId& detId, double& t
     else if (subdet == HcalEndcap) {
       // check if it's single or double tower
       if (hcalDetId.ietaAbs() < theHcalTopology->firstHEDoublePhiRing()) {
-        threshold = (depth == 1) ? theHESthreshold1 : theHESthreshold;
+        if (hcalCuts == nullptr) {  // this means cutsFromDB is false
+          threshold = (depth == 1) ? theHESthreshold1 : theHESthreshold;
+        } else {  // hcalCuts is not nullptr, i.e. cutsFromDB is true
+          const HcalPFCut* item = hcalCuts->getValues(hcalDetId.rawId());
+          threshold = item->noiseThreshold();
+        }
         weight = theHESweight;
         if (weight <= 0.) {
           ROOT::Math::Interpolator my(theHESGrid, theHESWeights, ROOT::Math::Interpolation::kAKIMA);
           weight = my.Eval(theHESEScale);
         }
       } else {
-        threshold = (depth == 1) ? theHEDthreshold1 : theHEDthreshold;
+        if (hcalCuts == nullptr) {  // this means cutsFromDB is false
+          threshold = (depth == 1) ? theHEDthreshold1 : theHEDthreshold;
+        } else {  // hcalCuts is not nullptr, i.e. cutsFromDB is true
+          const HcalPFCut* item = hcalCuts->getValues(hcalDetId.rawId());
+          threshold = item->noiseThreshold();
+        }
         weight = theHEDweight;
         if (weight <= 0.) {
           ROOT::Math::Interpolator my(theHEDGrid, theHEDWeights, ROOT::Math::Interpolation::kAKIMA);

RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreationAlgo.h

@@ -26,6 +26,10 @@
 #include <tuple>
 
 #include <map>
+
+#include "CondFormats/DataRecord/interface/HcalPFCutsRcd.h"
+#include "CondTools/Hcal/interface/HcalPFCutsHandler.h"
+
 class CaloTowerTopology;
 class HcalTopology;
 class CaloGeometry;
@@ -158,6 +162,7 @@ class CaloTowersCreationAlgo {
                    const HcalTopology* htopo,
                    const CaloGeometry* geo);
 
+  void setThresFromDB(const HcalPFCuts* cuts);
   // pass the containers of channels status from the event record (stored in DB)
   // these are called in  CaloTowersCreator
   void setHcalChStatusFromDB(const HcalChannelQuality* s) { theHcalChStatus = s; }
@@ -317,6 +322,7 @@ class CaloTowersCreationAlgo {
   double theHOEScale;
   double theHF1EScale;
   double theHF2EScale;
+  const HcalPFCuts* hcalCuts;
   const CaloTowerTopology* theTowerTopology;
   const HcalTopology* theHcalTopology;
   const CaloGeometry* theGeometry;

RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreator.cc

@@ -6,7 +6,6 @@
 // Now we allow for the creation of towers from
 // rejected hists as well: requested by the MET group
 // for studies of the effect of noise clean up.
-
 #include "CaloTowersCreationAlgo.h"
 #include "EScales.h"
 
@@ -25,12 +24,15 @@
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgoRcd.h"
+#include "CondFormats/DataRecord/interface/HcalPFCutsRcd.h"
+#include "CondTools/Hcal/interface/HcalPFCutsHandler.h"
 
 class CaloTowersCreator : public edm::stream::EDProducer<> {
 public:
   explicit CaloTowersCreator(const edm::ParameterSet& ps);
   ~CaloTowersCreator() override {}
   void produce(edm::Event& e, const edm::EventSetup& c) override;
+  void beginRun(edm::Run const&, edm::EventSetup const&) override;
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
   double EBEScale, EEEScale, HBEScale, HESEScale;
   double HEDEScale, HOEScale, HF1EScale, HF2EScale;
@@ -84,6 +86,10 @@ class CaloTowersCreator : public edm::stream::EDProducer<> {
   edm::ESWatcher<IdealGeometryRecord> caloTowerConstituentsWatcher_;
   edm::ESWatcher<EcalSeverityLevelAlgoRcd> ecalSevLevelWatcher_;
   EScales eScales_;
+
+  edm::ESGetToken<HcalPFCuts, HcalPFCutsRcd> hcalCutsToken_;
+  bool cutsFromDB;
+  HcalPFCuts const* paramPF = nullptr;
 };
 
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -165,7 +171,8 @@ CaloTowersCreator::CaloTowersCreator(const edm::ParameterSet& conf)
           conf.getParameter<unsigned int>("HcalAcceptSeverityLevelForRejectedHit")),
 
       useRejectedRecoveredHcalHits_(conf.getParameter<bool>("UseRejectedRecoveredHcalHits")),
-      useRejectedRecoveredEcalHits_(conf.getParameter<bool>("UseRejectedRecoveredEcalHits"))
+      useRejectedRecoveredEcalHits_(conf.getParameter<bool>("UseRejectedRecoveredEcalHits")),
+      cutsFromDB(conf.getParameter<bool>("usePFThresholdsFromDB"))
 
 {
   algo_.setMissingHcalRescaleFactorForEcal(conf.getParameter<double>("missingHcalRescaleFactorForEcal"));
@@ -183,6 +190,9 @@ CaloTowersCreator::CaloTowersCreator(const edm::ParameterSet& conf)
   tok_hcalSevComputer_ = esConsumes<HcalSeverityLevelComputer, HcalSeverityLevelComputerRcd>();
   tok_ecalSevAlgo_ = esConsumes<EcalSeverityLevelAlgo, EcalSeverityLevelAlgoRcd>();
 
+  if (cutsFromDB) {
+    hcalCutsToken_ = esConsumes<HcalPFCuts, HcalPFCutsRcd, edm::Transition::BeginRun>(edm::ESInputTag("", "withTopo"));
+  }
   const unsigned nLabels = ecalLabels_.size();
   for (unsigned i = 0; i != nLabels; i++)
     toks_ecal_.push_back(consumes<EcalRecHitCollection>(ecalLabels_[i]));
@@ -217,6 +227,13 @@ CaloTowersCreator::CaloTowersCreator(const edm::ParameterSet& conf)
 #endif
 }
 
+void CaloTowersCreator::beginRun(const edm::Run& run, const edm::EventSetup& es) {
+  if (cutsFromDB) {
+    paramPF = &es.getData(hcalCutsToken_);
+  }
+  algo_.setThresFromDB(paramPF);
+}
+
 void CaloTowersCreator::produce(edm::Event& e, const edm::EventSetup& c) {
   // get the necessary event setup objects...
   edm::ESHandle<CaloGeometry> pG = c.getHandle(tok_geom_);
@@ -452,6 +469,7 @@ void CaloTowersCreator::fillDescriptions(edm::ConfigurationDescriptions& descrip
   desc.add<unsigned int>("HcalAcceptSeverityLevelForRejectedHit", 9999);
   desc.add<std::vector<std::string> >("EcalSeveritiesToBeUsedInBadTowers", {});
   desc.add<int>("HcalPhase", 0);
+  desc.add<bool>("usePFThresholdsFromDB", true);
 
   descriptions.addDefault(desc);
 }