Merge pull request #17859 from knash/HFchanges

Spike cleaner fix
cms-sw · Aug 4, 2017 · dd94c88 · dd94c88
2 parents 4b4fc06 + 88c30ee
commit dd94c88
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 6 deletions.
diff --git a/RecoParticleFlow/PFClusterProducer/plugins/SpikeAndDoubleSpikeCleaner.cc b/RecoParticleFlow/PFClusterProducer/plugins/SpikeAndDoubleSpikeCleaner.cc
@@ -117,19 +117,53 @@ clean(const edm::Handle<reco::PFRecHitCollection>& input,
     }    
     const spike_cleaning& clean = _thresholds.find(hitlayer)->second;    
     if( rechit.energy() < clean._singleSpikeThresh ) continue;
+
+    //Fix needed for HF.  Here, we find the (up to) five companion rechits 
+    //to work in conjunction with the neighbours4() implementation below for the full HF surrounding energy
+    float compsumE = 0.0;
+    if ((hitlayer==PFLayer::HF_EM || hitlayer==PFLayer::HF_HAD)) {
+      int comp = 1;
+      if (hitlayer==PFLayer::HF_EM) comp = 2;
+      const HcalDetId& detid = (HcalDetId)rechit.detId();
+      int heta = detid.ieta();
+      int hphi = detid.iphi();
+
+      //At eta>39, phi segmentation changes 
+      int predphi =2;
+      if (std::abs(heta)>39) predphi=4;
+
+      int curphiL = hphi-predphi;
+      int curphiH = hphi+predphi;
+
+      //HcalDetId valid phi range (0-72)
+      while (curphiL<0) curphiL+=72;
+      while (curphiH>72) curphiH-=72;
+
+      std::pair<std::vector<int>, std::vector<int>>  phietas({heta,heta+1,heta-1,heta,heta},{hphi,hphi,hphi,curphiL,curphiH});
+
+      std::vector<uint32_t> rawDetIds;
+      for(unsigned in=0;in<phietas.first.size();in++) {
+        HcalDetId tempID (HcalForward, phietas.first[in], phietas.second[in], comp);
+        rawDetIds.push_back(tempID.rawId());
+      }
+
+      for( const auto& jdx : ordered_hits ) {
+        const unsigned j = jdx;
+        const reco::PFRecHit& matchrechit = hits[j];
+        for( const auto& iID : rawDetIds ) if (iID==matchrechit.detId())compsumE+=matchrechit.energy();  
+      }
+    }
+    //End of fix needed for HF
+
     const double rhenergy = rechit.energy();
     // single spike cleaning
     auto const & neighbours4 = rechit.neighbours4();
-    double surroundingEnergy = rechit.energy();
-    double neighbourEnergy = 0.0;
-    double layerEnergy = 0.0;
+    double surroundingEnergy = compsumE;
     for( auto k : neighbours4 ) {
       if( !mask[k] ) continue;
       auto const & neighbour = hits[k];
       const double sum = neighbour.energy(); //energyUp is just rechit energy?
       surroundingEnergy += sum;
-      neighbourEnergy   += sum;
-      layerEnergy       += neighbour.energy();
     }    
     //   wannaBeSeed.energyUp()/wannaBeSeed.energy() : 1.;
     // Fraction 1 is the balance between the hit and its neighbours 

diff --git a/RecoParticleFlow/PFClusterProducer/plugins/SpikeAndDoubleSpikeCleaner.h b/RecoParticleFlow/PFClusterProducer/plugins/SpikeAndDoubleSpikeCleaner.h
@@ -2,6 +2,7 @@
 #define __SpikeAndDoubleSpikeCleaner_H__
 
 #include "RecoParticleFlow/PFClusterProducer/interface/RecHitTopologicalCleanerBase.h"
+#include "DataFormats/HcalRecHit/interface/HFRecHit.h"
 
 #include <unordered_map>
 

diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHF_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHF_cfi.py
@@ -104,7 +104,7 @@
 particleFlowClusterHF = cms.EDProducer(
     "PFClusterProducer",
     recHitsSource = cms.InputTag("particleFlowRecHitHF"),
-    recHitCleaners = cms.VPSet(_spikeAndDoubleSpikeCleaner_HF),
+    recHitCleaners = cms.VPSet(),
     seedFinder = _localMaxSeeds_HF,
     initialClusteringStep = _topoClusterizer_HF,
     pfClusterBuilder = _pfClusterizer_HF,