Finalise move to RecHitTools for HGCalRecHit algorithms

cms-sw · Jun 20, 2019 · 68b182e · 68b182e
1 parent bec6bb7
commit 68b182e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/RecoLocalCalo/HGCalRecAlgos/interface/HGCalRecHitAbsAlgo.h b/RecoLocalCalo/HGCalRecAlgos/interface/HGCalRecHitAbsAlgo.h
@@ -22,7 +22,7 @@ class HGCalRecHitAbsAlgo {
   /// Destructor
   virtual ~HGCalRecHitAbsAlgo(){};
 
-  inline void getEventSetup(const edm::EventSetup& es) { rhtools_.getEventSetup(es); }
+  inline void set(const edm::EventSetup& es) { rhtools_.getEventSetup(es); }
 
   /// make rechits from dataframes
   virtual void setLayerWeights(const std::vector<float>& weights){};

diff --git a/RecoLocalCalo/HGCalRecAlgos/interface/HGCalRecHitSimpleAlgo.h b/RecoLocalCalo/HGCalRecAlgos/interface/HGCalRecHitSimpleAlgo.h
@@ -47,10 +47,7 @@ class HGCalRecHitSimpleAlgo : public HGCalRecHitAbsAlgo {
 
     DetId baseid = uncalibRH.id();
     unsigned layer = rhtools_.getLayerWithOffset(baseid);
-    bool hfnose(false);
-
-    if (DetId::Forward == baseid.det() && HFNose == baseid.subdetId())
-      hfnose = true;
+    bool hfnose = DetId::Forward == baseid.det() && HFNose == baseid.subdetId();
 
     //    float clockToNsConstant = 25;
     float energy = (hfnose ? (uncalibRH.amplitude() * weightsNose_[layer] * 0.001f)

diff --git a/RecoLocalCalo/HGCalRecProducers/plugins/HGCalRecHitWorkerSimple.cc b/RecoLocalCalo/HGCalRecProducers/plugins/HGCalRecHitWorkerSimple.cc
@@ -70,6 +70,7 @@ HGCalRecHitWorkerSimple::HGCalRecHitWorkerSimple(const edm::ParameterSet& ps) :
 
 void HGCalRecHitWorkerSimple::set(const edm::EventSetup& es) {
   tools_->getEventSetup(es);
+  rechitMaker_->set(es);
   if (hgcEE_isSiFE_) {
     edm::ESHandle<HGCalGeometry> hgceeGeoHandle;
     es.get<IdealGeometryRecord>().get("HGCalEESensitive", hgceeGeoHandle);