remaining changes to adopt trailing underscores in the data members. …

…also clean up unnecessary commented line.
cms-sw · Dec 17, 2019 · b07fda1 · b07fda1
1 parent b4d88a8
commit b07fda1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/RecoParticleFlow/PFProducer/plugins/linkers/TrackAndGSFLinker.cc b/RecoParticleFlow/PFProducer/plugins/linkers/TrackAndGSFLinker.cc
@@ -9,13 +9,13 @@ class TrackAndGSFLinker : public BlockElementLinkerBase {
   TrackAndGSFLinker(const edm::ParameterSet& conf)
       : BlockElementLinkerBase(conf),
         useKDTree_(conf.getParameter<bool>("useKDTree")),
-        _useConvertedBrems(conf.getParameter<bool>("useConvertedBrems")),
+        useConvertedBrems_(conf.getParameter<bool>("useConvertedBrems")),
         debug_(conf.getUntrackedParameter<bool>("debug", false)) {}
 
   double testLink(const reco::PFBlockElement*, const reco::PFBlockElement*) const override;
 
 private:
-  bool useKDTree_, _useConvertedBrems, debug_;
+  bool useKDTree_, useConvertedBrems_, debug_;
 };
 
 DEFINE_EDM_PLUGIN(BlockElementLinkerFactory, TrackAndGSFLinker, "TrackAndGSFLinker");
@@ -46,7 +46,7 @@ double TrackAndGSFLinker::testLink(const reco::PFBlockElement* elem1, const reco
   }
 
   //override for converted brems
-  if (_useConvertedBrems) {
+  if (useConvertedBrems_) {
     if (tkelem->isLinkedToDisplacedVertex()) {
       const std::vector<reco::PFRecTrackRef>& convbrems = gsfref->convBremPFRecTrackRef();
       for (const auto& convbrem : convbrems) {

diff --git a/RecoParticleFlow/PFProducer/plugins/linkers/TrackAndHCALLinker.cc b/RecoParticleFlow/PFProducer/plugins/linkers/TrackAndHCALLinker.cc
@@ -27,7 +27,6 @@ class TrackAndHCALLinker : public BlockElementLinkerBase {
             trajectoryLayerExit_ == reco::PFTrajectoryPoint::Unknown));
     // flag if exit layer should be checked or not
     checkExit_ = trajectoryLayerExit_ != reco::PFTrajectoryPoint::Unknown;
-    //_checkExit = (_trajectoryLayerExit == reco::PFTrajectoryPoint::Unknown) ? false : true;
   }
 
   double testLink(const reco::PFBlockElement*, const reco::PFBlockElement*) const override;