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.28 by ahart, Wed May 1 19:49:33 2013 UTC vs.
Revision 1.29 by ahart, Fri May 3 20:10:07 2013 UTC

# Line 9 | Line 9
9   #include <fstream>
10   #include <iostream>
11   #include <algorithm>
12 + #include <regex>
13   #include "TH1.h"
14   #include "TH2.h"
15   #include "TH1D.h"
# Line 42 | Line 43
43   #include "ProductArea/BNcollections/interface/BNtrigobj.h"
44   #include "ProductArea/BNcollections/interface/BNtau.h"
45   #include "ProductArea/BNcollections/interface/BNgenjet.h"
45 – #include "ProductArea/BNcollections/interface/BNstop.h"
46  
47  
48   #include "OSUT3Analysis/AnaTools/interface/CutFlow.h"
49   #include "OSUT3Analysis/AnaTools/interface/PUWeight.h"
50   #include "OSUT3Analysis/AnaTools/interface/SFWeight.h"
51  
52 < #ifdef DISPLACED_SUSY
53 < #include "DisplacedSUSY/Configuration/interface/CTauWeight.h"
54 < #endif
52 > #include "OSUT3Analysis/AnaTools/interface/StopCTauWeight.h"
53  
54   using namespace std;
55  
# Line 229 | Line 227 | class OSUAnalysis : public edm::EDAnalyz
227        PUWeight *puWeight_;
228        MuonSFWeight *muonSFWeight_;
229        ElectronSFWeight *electronSFWeight_;
230 < #ifdef DISPLACED_SUSY
231 <      CTauWeight *cTauWeight_;
232 < #endif
235 <      double cTauScaleFactor_;
230 >
231 >      StopCTauWeight *stopCTauWeight_;
232 >      double stopCTauScaleFactor_;
233  
234        template <class InputCollection> void setObjectFlags(cut &, uint, flagMap &, flagMap &, InputCollection, string);
235        template <class InputCollection1, class InputCollection2> void setObjectFlags(cut &, uint, flagMap &, flagMap &, InputCollection1, InputCollection2, vector<bool>, vector<bool>, string);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines