ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/OSUT3Analysis/AnaTools/plugins/OSUAnalysis.h
(Generate patch)

Comparing UserCode/OSUT3Analysis/AnaTools/plugins/OSUAnalysis.h (file contents):
Revision 1.8 by lantonel, Wed Feb 13 10:05:48 2013 UTC vs.
Revision 1.9 by lantonel, Wed Feb 13 12:51:21 2013 UTC

# Line 7 | Line 7
7   #include <vector>
8  
9   #include "TH1.h"
10 + #include "TH2.h"
11   #include "TH1D.h"
12   #include "TH2D.h"
13   #include "TLorentzVector.h"
# Line 38 | Line 39
39   #include "ProductArea/BNcollections/interface/BNgenjet.h"
40  
41   #include "OSUT3Analysis/AnaTools/interface/CutFlow.h"
42 + #include "OSUT3Analysis/AnaTools/interface/PUWeight.h"
43  
44  
45  
# Line 104 | Line 106 | class OSUAnalysis : public edm::EDAnalyz
106        edm::InputTag photons_;
107        edm::InputTag superclusters_;
108        edm::InputTag triggers_;
109 <
110 <      BNprimaryvertex *primaryVertex_;
111 <
109 >      std::string puFile_;
110 >      std::string dataPU_;
111 >      std::string dataset_;
112 >      std::string datasetType_;
113        vector<edm::ParameterSet> channels_;
114        vector<edm::ParameterSet> histogramSets_;
115 +      bool plotAllObjectsInPassingEvents_;
116  
117 <      bool plotAllObjectsInPassingEvents;
117 >      BNprimaryvertex *primaryVertex_;
118  
119        vector<map<string, TH1D*> > oneDHists_;
120        vector<map<string, TH2D*> > twoDHists_;
# Line 151 | Line 155 | class OSUAnalysis : public edm::EDAnalyz
155        vector<channel> channels;
156        vector<histogram> histograms;
157  
158 +      PUWeight *puWeight_;
159 +
160        template <class InputCollection> void setObjectFlags(cut &, uint, flagMap &, flagMap &, InputCollection, string);
161 <      template <class InputCollection>  void fillHistogram(TH1*, histogram, InputCollection, vector<bool>);
161 >      template <class InputCollection>  void fill1DHistogram(TH1*, histogram, InputCollection, vector<bool>, double);
162 >      template <class InputCollection>  void fill2DHistogram(TH2*, histogram, InputCollection, vector<bool>, double);
163  
164  
165  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines