Merge pull request #76 from steggema/CMSSW_10_1_X_TauRecoMiniAODReview

Address additional RECO review comments
cms-tau-pog · Apr 18, 2018 · 80b90b2 · 80b90b2
2 parents f77ae6c + 75804b8
commit 80b90b2
Show file tree

Hide file tree

Showing 9 changed files with 202 additions and 478 deletions.
diff --git a/DataFormats/TauReco/interface/PFRecoTauChargedHadron.h b/DataFormats/TauReco/interface/PFRecoTauChargedHadron.h
@@ -8,9 +8,9 @@
 #include "DataFormats/Math/interface/Point3D.h"
 
 namespace reco { namespace tau {
+  template<class TrackClass>
+  class PFRecoTauChargedHadronFromGenericTrackPlugin;
   class PFRecoTauChargedHadronFromPFCandidatePlugin;
-  class PFRecoTauChargedHadronFromTrackPlugin;
-  class PFRecoTauChargedHadronFromLostTrackPlugin;
   class RecoTauConstructor;
   class PFRecoTauEnergyAlgorithmPlugin;
 }} 
@@ -72,8 +72,8 @@ class PFRecoTauChargedHadron : public CompositePtrCandidate
 
  private:
   friend class tau::PFRecoTauChargedHadronFromPFCandidatePlugin;
-  friend class tau::PFRecoTauChargedHadronFromTrackPlugin;
-  friend class tau::PFRecoTauChargedHadronFromLostTrackPlugin;
+  template<class TrackClass>
+  friend class tau::PFRecoTauChargedHadronFromGenericTrackPlugin;
   friend class tau::RecoTauConstructor;
   friend class tau::PFRecoTauEnergyAlgorithmPlugin;
   friend class ::PFRecoTauChargedHadronProducer;

diff --git a/RecoTauTag/Configuration/python/tools/adaptToRunAtMiniAOD.py b/RecoTauTag/Configuration/python/tools/adaptToRunAtMiniAOD.py
diff --git a/RecoTauTag/RecoTau/plugins/PFRecoTauChargedHadronFromLostTrackPlugin.cc b/RecoTauTag/RecoTau/plugins/PFRecoTauChargedHadronFromLostTrackPlugin.cc