Merge pull request #16540 from jlagram/StripHitEff_lumi

Strip hit eff lumi
cms-sw · Nov 10, 2016 · d536c92 · d536c92
2 parents 72bb4f3 + 60b7321
commit d536c92
Show file tree

Hide file tree

Showing 5 changed files with 419 additions and 225 deletions.
diff --git a/CalibTracker/SiStripHitEfficiency/interface/HitEff.h b/CalibTracker/SiStripHitEfficiency/interface/HitEff.h
@@ -27,6 +27,8 @@
 #include "RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h"
 #include "DataFormats/DetId/interface/DetIdCollection.h"
 
+#include "DataFormats/Scalers/interface/LumiScalers.h"
+#include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h"
 
 #include "TROOT.h"
 #include "TFile.h"
@@ -58,6 +60,12 @@ class HitEff : public edm::EDAnalyzer {
 
         // ----------member data ---------------------------
 
+  const edm::EDGetTokenT<LumiScalersCollection> scalerToken_;
+  const edm::EDGetTokenT<edm::DetSetVector<SiStripRawDigi> > commonModeToken_;
+
+  bool addLumi_;
+  bool addCommonMode_;
+
   const edm::EDGetTokenT< reco::TrackCollection > combinatorialTracks_token_;
   const edm::EDGetTokenT< std::vector<Trajectory> > trajectories_token_;
   const edm::EDGetTokenT< edmNew::DetSetVector<SiStripCluster> > clusters_token_;
@@ -89,6 +97,8 @@ class HitEff : public edm::EDAnalyzer {
   int dedxNOM;
   int tquality;
   int istep;
+  float instLumi, PU;
+  float commonMode;
 };