Merge pull request #27901 from jpata/pfalgo_elementloop_factorize

simplify elementLoop flow, add comments
cms-sw · Sep 6, 2019 · 00da9f8 · 00da9f8
2 parents ab7fd3f + 69c32c6
commit 00da9f8
Show file tree

Hide file tree

Showing 2 changed files with 201 additions and 200 deletions.
diff --git a/RecoParticleFlow/PFProducer/interface/PFAlgo.h b/RecoParticleFlow/PFProducer/interface/PFAlgo.h
@@ -122,6 +122,18 @@ class PFAlgo {
 private:
   void egammaFilters(const reco::PFBlockRef& blockref, std::vector<bool>& active, PFEGammaFilters const* pfegamma);
   void conversionAlgo(const edm::OwnVector<reco::PFBlockElement>& elements, std::vector<bool>& active);
+  bool checkAndReconstructSecondaryInteraction(const reco::PFBlockRef& blockref,
+                                               const edm::OwnVector<reco::PFBlockElement>& elements,
+                                               bool isActive,
+                                               int iElement);
+  bool checkHasDeadHcal(const std::multimap<double, unsigned>& hcalElems, const std::vector<bool>& deadArea);
+  void relinkTrackToHcal(const reco::PFBlock& block,
+                         std::multimap<double, unsigned>& ecalElems,
+                         std::multimap<double, unsigned>& hcalElems,
+                         const std::vector<bool>& active,
+                         reco::PFBlock::LinkData& linkData,
+                         unsigned int iTrack);
+  bool checkGoodTrackDeadHcal(const reco::TrackRef& trackRef, bool hasDeadHcal);
   void elementLoop(const reco::PFBlock& block,
                    reco::PFBlock::LinkData& linkData,
                    const edm::OwnVector<reco::PFBlockElement>& elements,