Merge pull request #43681 from swagata87/fix2017

Use HCAL noise cuts from DB only for Run3 and Phase2
cms-sw · Jan 10, 2024 · f5cbbf1 · f5cbbf1
2 parents 7924ce4 + 534bb08
commit f5cbbf1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBlock_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowBlock_cfi.py
@@ -13,6 +13,7 @@
             hbheRecHitsTag = cms.InputTag("hltHbhereco"),
             maxSeverityHB = cms.int32(9),
             maxSeverityHE = cms.int32(9),
+            usePFThresholdsFromDB = cms.bool(True),
             superClustersArePF = cms.bool(True)
         ),
         cms.PSet(

diff --git a/RecoHI/Configuration/python/Reconstruction_hiPF_cff.py b/RecoHI/Configuration/python/Reconstruction_hiPF_cff.py
@@ -54,6 +54,7 @@
                   hbheRecHitsTag = cms.InputTag("hbhereco"),
                   maxSeverityHB = cms.int32(9),
                   maxSeverityHE = cms.int32(9),
+                  usePFThresholdsFromDB = cms.bool(True),
                   superClustersArePF = cms.bool(True) ),
     # all secondary track importers
     cms.PSet( importerName = cms.string("GeneralTracksImporter"),

diff --git a/RecoParticleFlow/PFProducer/plugins/importers/SuperClusterImporter.cc b/RecoParticleFlow/PFProducer/plugins/importers/SuperClusterImporter.cc
@@ -40,6 +40,7 @@ class SuperClusterImporter : public BlockElementImporterBase {
   const edm::EDGetTokenT<HBHERecHitCollection> hbheRecHitsTag_;
   const int maxSeverityHB_;
   const int maxSeverityHE_;
+  bool cutsFromDB;
   CaloTowerConstituentsMap const* towerMap_;
   CaloGeometry const* caloGeom_;
   HcalTopology const* hcalTopo_;
@@ -71,19 +72,24 @@ SuperClusterImporter::SuperClusterImporter(const edm::ParameterSet& conf, edm::C
       hbheRecHitsTag_(cc.consumes(conf.getParameter<edm::InputTag>("hbheRecHitsTag"))),
       maxSeverityHB_(conf.getParameter<int>("maxSeverityHB")),
       maxSeverityHE_(conf.getParameter<int>("maxSeverityHE")),
+      cutsFromDB(conf.getParameter<bool>("usePFThresholdsFromDB")),
       _superClustersArePF(conf.getParameter<bool>("superClustersArePF")),
       _ctmapToken(cc.esConsumes<edm::Transition::BeginLuminosityBlock>()),
       caloGeometryToken_{cc.esConsumes<edm::Transition::BeginLuminosityBlock>()},
       hcalTopologyToken_{cc.esConsumes<edm::Transition::BeginLuminosityBlock>()},
       hcalChannelQualityToken_{cc.esConsumes<edm::Transition::BeginLuminosityBlock>(edm::ESInputTag("", "withTopo"))},
       hcalSevLvlComputerToken_{cc.esConsumes<edm::Transition::BeginLuminosityBlock>()} {
-  hcalCutsToken_ =
-      cc.esConsumes<HcalPFCuts, HcalPFCutsRcd, edm::Transition::BeginLuminosityBlock>(edm::ESInputTag("", "withTopo"));
+  if (cutsFromDB) {
+    hcalCutsToken_ = cc.esConsumes<HcalPFCuts, HcalPFCutsRcd, edm::Transition::BeginLuminosityBlock>(
+        edm::ESInputTag("", "withTopo"));
+  }
 }
 
 void SuperClusterImporter::updateEventSetup(const edm::EventSetup& es) {
   towerMap_ = &es.getData(_ctmapToken);
-  hcalCuts = &es.getData(hcalCutsToken_);
+  if (cutsFromDB) {
+    hcalCuts = &es.getData(hcalCutsToken_);
+  }
   caloGeom_ = &es.getData(caloGeometryToken_);
   hcalTopo_ = &es.getData(hcalTopologyToken_);
   hcalChannelQual_ = &es.getData(hcalChannelQualityToken_);

diff --git a/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py b/RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py
@@ -30,6 +30,7 @@
                   hbheRecHitsTag = cms.InputTag('hbhereco'),
                   maxSeverityHB = cms.int32(9),
                   maxSeverityHE = cms.int32(9),
+                  usePFThresholdsFromDB = cms.bool(False),
                   superClustersArePF = cms.bool(True) ),
         cms.PSet( importerName = cms.string("ConversionTrackImporter"),
                   source = cms.InputTag("pfConversions"),
@@ -248,3 +249,8 @@ def _findIndicesByModule(name):
     particleFlowBlock,
     elementImporters = _addTimingLayer
 )
+
+#--- Use DB conditions for cuts&seeds for Run3 and phase2
+from Configuration.Eras.Modifier_hcalPfCutsFromDB_cff import hcalPfCutsFromDB
+hcalPfCutsFromDB.toModify( _scImporter,
+                           usePFThresholdsFromDB = True)