Merge pull request #22932 from jlagram/StripHitEff_update_10_2_X

Strip hit eff update 10_2_x
cms-sw · Apr 19, 2018 · 4d64b0e · 4d64b0e
2 parents 2759d59 + f592fa2
commit 4d64b0e
Show file tree

Hide file tree

Showing 5 changed files with 276 additions and 76 deletions.
diff --git a/CalibTracker/SiStripHitEfficiency/interface/HitEff.h b/CalibTracker/SiStripHitEfficiency/interface/HitEff.h
@@ -17,6 +17,7 @@
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h"
 #include "TrackingTools/TrackFitters/interface/KFTrajectorySmoother.h"
+#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" 
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
@@ -67,9 +68,13 @@ class HitEff : public edm::EDAnalyzer {
   bool addCommonMode_;
   bool cutOnTracks_;
   unsigned int trackMultiplicityCut_;
+  bool useFirstMeas_;
+  bool useLastMeas_;
+  bool useAllHitsFromTracksWithMissingHits_;  
 
   const edm::EDGetTokenT< reco::TrackCollection > combinatorialTracks_token_;
   const edm::EDGetTokenT< std::vector<Trajectory> > trajectories_token_;
+  const edm::EDGetTokenT< TrajTrackAssociationCollection > trajTrackAsso_token_;
   const edm::EDGetTokenT< edmNew::DetSetVector<SiStripCluster> > clusters_token_;
   const edm::EDGetTokenT<DetIdCollection> digis_token_;
   const edm::EDGetTokenT<MeasurementTrackerEvent> trackerEvent_token_;
@@ -92,6 +97,7 @@ class HitEff : public edm::EDAnalyzer {
   unsigned int ModIsBad; unsigned int Id; unsigned int SiStripQualBad; bool withinAcceptance;
   int nHits, nLostHits; 
   float p, pT, chi2;
+  bool highPurity;
   unsigned int trajHitValid, run, event, bunchx;
   float timeDT, timeDTErr;
   int timeDTDOF;