Cleanup of PRRecHit producer update for HCAL

cms-sw · Feb 26, 2020 · b73f9f8 · b73f9f8
1 parent 6b156b8
commit b73f9f8
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 200 deletions.
diff --git a/RecoParticleFlow/PFClusterProducer/interface/PFHCALDenseIdNavigator.h b/RecoParticleFlow/PFClusterProducer/interface/PFHCALDenseIdNavigator.h
@@ -35,17 +35,17 @@ class PFHCALDenseIdNavigator : public PFRecHitNavigatorBase {
   }
 
   void init(const edm::EventSetup& iSetup) override {
-
     /*
     if (!neighboursHcal_.empty())
       return;  // neighboursHcal_ is already defined. No need to redefine it.
     */
     bool check = theRecNumberWatcher_.check(iSetup);
     std::cout << "check: " << check << " " << neighboursHcal_.size() << std::endl;
-    if (!check) return;
+    if (!check)
+      return;
 
     //std::cout << "checking" << std::endl;
-    
+
     edm::ESHandle<HcalTopology> hcalTopology;
     iSetup.get<HcalRecNumberingRecord>().get(hcalTopology);
     topology_.release();

diff --git a/RecoParticleFlow/PFClusterProducer/interface/PFRecHitHCALCachedNavigator.h b/RecoParticleFlow/PFClusterProducer/interface/PFRecHitHCALCachedNavigator.h
diff --git a/RecoParticleFlow/PFClusterProducer/plugins/Navigators.cc b/RecoParticleFlow/PFClusterProducer/plugins/Navigators.cc
@@ -6,7 +6,7 @@
 #include "RecoParticleFlow/PFClusterProducer/interface/PFRecHitDualNavigator.h"
 #include "RecoParticleFlow/PFClusterProducer/interface/PFRecHitCaloNavigator.h"
 #include "RecoParticleFlow/PFClusterProducer/interface/PFRecHitCaloNavigatorWithTime.h"
-#include "RecoParticleFlow/PFClusterProducer/interface/PFRecHitHCALCachedNavigator.h"
+#include "RecoParticleFlow/PFClusterProducer/interface/PFHCALDenseIdNavigator.h"
 #include "RecoParticleFlow/PFClusterProducer/interface/PFECALHashNavigator.h"
 #include "RecoParticleFlow/PFClusterProducer/interface/HGCRecHitNavigator.h"
 
@@ -61,9 +61,21 @@ class PFRecHitPreshowerNavigator final : public PFRecHitCaloNavigator<ESDetId, E
   void init(const edm::EventSetup& iSetup) override { topology_ = std::make_unique<EcalPreshowerTopology>(); }
 };
 
-class PFRecHitHCALNavigator final : public PFRecHitHCALCachedNavigator<HcalDetId, HcalTopology, false> {
+class PFRecHitHCALDenseIdNavigator final : public PFHCALDenseIdNavigator<HcalDetId, HcalTopology, false> {
 public:
-  PFRecHitHCALNavigator(const edm::ParameterSet& iConfig) : PFRecHitHCALCachedNavigator(iConfig) {}
+  PFRecHitHCALDenseIdNavigator(const edm::ParameterSet& iConfig) : PFHCALDenseIdNavigator(iConfig) {}
+};
+
+class PFRecHitHCALNavigator : public PFRecHitCaloNavigator<HcalDetId, HcalTopology, false> {
+public:
+  PFRecHitHCALNavigator(const edm::ParameterSet& iConfig) {}
+
+  void init(const edm::EventSetup& iSetup) override {
+    edm::ESHandle<HcalTopology> hcalTopology;
+    iSetup.get<HcalRecNumberingRecord>().get(hcalTopology);
+    topology_.release();
+    topology_.reset(hcalTopology.product());
+  }
 };
 
 class PFRecHitHCALNavigatorWithTime : public PFRecHitCaloNavigatorWithTime<HcalDetId, HcalTopology, false> {
@@ -145,6 +157,7 @@ DEFINE_EDM_PLUGIN(PFRecHitNavigationFactory, PFRecHitECALNavigator, "PFRecHitECA
 DEFINE_EDM_PLUGIN(PFRecHitNavigationFactory, PFRecHitECALNavigatorWithTime, "PFRecHitECALNavigatorWithTime");
 DEFINE_EDM_PLUGIN(PFRecHitNavigationFactory, PFRecHitCaloTowerNavigator, "PFRecHitCaloTowerNavigator");
 DEFINE_EDM_PLUGIN(PFRecHitNavigationFactory, PFRecHitPreshowerNavigator, "PFRecHitPreshowerNavigator");
+DEFINE_EDM_PLUGIN(PFRecHitNavigationFactory, PFRecHitHCALDenseIdNavigator, "PFRecHitHCALDenseIdNavigator");
 DEFINE_EDM_PLUGIN(PFRecHitNavigationFactory, PFRecHitHCALNavigator, "PFRecHitHCALNavigator");
 DEFINE_EDM_PLUGIN(PFRecHitNavigationFactory, PFRecHitHCALNavigatorWithTime, "PFRecHitHCALNavigatorWithTime");
 DEFINE_EDM_PLUGIN(PFRecHitNavigationFactory, PFRecHitHGCEENavigator, "PFRecHitHGCEENavigator");

diff --git a/RecoParticleFlow/PFClusterProducer/plugins/PFRecHitProducer.cc b/RecoParticleFlow/PFClusterProducer/plugins/PFRecHitProducer.cc
@@ -30,14 +30,14 @@ PFRecHitProducer::~PFRecHitProducer() = default;
 // member functions
 //
 
-void PFRecHitProducer::beginRun(const edm::Run&, const edm::EventSetup& iSetup) {
+void PFRecHitProducer::beginLuminosityBlock(edm::LuminosityBlock const& iLumi, const edm::EventSetup& iSetup) {
   for (const auto& creator : creators_) {
     creator->init(iSetup);
   }
   navigator_->init(iSetup);
 }
 
-void PFRecHitProducer::endRun(const edm::Run&, const edm::EventSetup&) {}
+void PFRecHitProducer::endLuminosityBlock(edm::LuminosityBlock const& iLumi, const edm::EventSetup&) {}
 
 // ------------ method called to produce the data  ------------
 void PFRecHitProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {

diff --git a/RecoParticleFlow/PFClusterProducer/plugins/PFRecHitProducer.h b/RecoParticleFlow/PFClusterProducer/plugins/PFRecHitProducer.h
@@ -27,8 +27,8 @@ class PFRecHitProducer final : public edm::stream::EDProducer<> {
 
 private:
   void produce(edm::Event&, const edm::EventSetup&) override;
-  void beginRun(const edm::Run&, const edm::EventSetup&) override;
-  void endRun(const edm::Run&, const edm::EventSetup&) override;
+  void beginLuminosityBlock(edm::LuminosityBlock const&, const edm::EventSetup&) override;
+  void endLuminosityBlock(edm::LuminosityBlock const&, const edm::EventSetup&) override;
   std::vector<std::unique_ptr<PFRecHitCreatorBase> > creators_;
   std::unique_ptr<PFRecHitNavigatorBase> navigator_;
   bool init_;

diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py
@@ -9,7 +9,7 @@
 
 particleFlowRecHitHBHE = cms.EDProducer("PFRecHitProducer",
     navigator = cms.PSet(
-            name = cms.string("PFRecHitHCALNavigator"),
+            name = cms.string("PFRecHitHCALDenseIdNavigator"),
             detectorEnums = cms.vint32(1,2)
     ),
     producers = cms.VPSet(

diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHF_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHF_cfi.py
@@ -5,7 +5,7 @@
 particleFlowRecHitHF = cms.EDProducer("PFRecHitProducer",
 
     navigator = cms.PSet(
-        name = cms.string("PFRecHitHCALNavigator"),
+        name = cms.string("PFRecHitHCALDenseIdNavigator"),
         detectorEnums = cms.vint32(4)
     ),
     producers = cms.VPSet(
@@ -36,9 +36,9 @@
                                  detectorEnum = cms.int32(4))
                       )
                   )
-                      
+
           )
-    )             
+    )
   )
 
 )
diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHO_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHO_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 particleFlowRecHitHO = cms.EDProducer("PFRecHitProducer",
     navigator = cms.PSet(
-        name = cms.string("PFRecHitHCALNavigator"),
+        name = cms.string("PFRecHitHCALDenseIdNavigator"),
         detectorEnums = cms.vint32(3)
     ),
     producers = cms.VPSet(