ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/MitPhysics/Utils/interface/ElectronTools.h
(Generate patch)

Comparing UserCode/MitPhysics/Utils/interface/ElectronTools.h (file contents):
Revision 1.31 by anlevin, Wed Jun 6 15:05:39 2012 UTC vs.
Revision 1.35 by sixie, Fri Dec 14 14:12:15 2012 UTC

# Line 18 | Line 18
18   #include "MitAna/DataTree/interface/TriggerObjectCol.h"
19   #include "MitCommon/MathTools/interface/MathUtils.h"
20   #include "MitPhysics/ElectronLikelihood/interface/ElectronLikelihood.h"
21 + #include <utility>
22  
23   namespace mithep {
24    class ElectronTools {
# Line 44 | Line 45 | namespace mithep {
45          kMVAID_BDTG_WithIPInfo,
46          kMVAID_BDTG_IDIsoCombined,
47          kHggLeptonTagId,
48 <        kMVAID_BDTG_IDHWW2012TrigV0
48 >        kHggLeptonTagId2012,
49 >        kHggLeptonTagId2012HCP,
50 >        kMVAID_BDTG_IDHWW2012TrigV0,
51 >        kMVAID_BDTG_IDIsoCombinedHWW2012TrigV4
52        };
53  
54        enum EElIsoType {
# Line 66 | Line 70 | namespace mithep {
70          kVBTFWorkingPoint80Iso,
71          kVBTFWorkingPoint70Iso,
72          kMVAIso_BDTG_IDIsoCombined,
73 <        kPFIso_HWW2012TrigV0
73 >        kPFIso_HWW2012TrigV0,
74 >        kPFIso_HggLeptonTag2012,
75 >        kPFIso_HggLeptonTag2012HCP,
76 >        kMVAIso_BDTG_IDIsoCombinedHWW2012TrigV4
77        };
78  
79        enum EElectronEffectiveAreaType {
# Line 100 | Line 107 | namespace mithep {
107        enum EElectronEffectiveAreaTarget {
108          kEleEANoCorr,
109          kEleEAData2011,
110 <                                kEleEAData2012,
110 >        kEleEAData2012,
111          kEleEASummer11MC,
112          kEleEAFall11MC
113        };
# Line 125 | Line 132 | namespace mithep {
132        static Double_t     Likelihood(ElectronLikelihood *LH, const Electron *ele);
133        static Double_t     ElectronEffectiveArea(EElectronEffectiveAreaType type, Double_t Eta,
134                                                  EElectronEffectiveAreaTarget EffectiveAreaTarget = kEleEAData2011);
135 +      static std::pair<Double_t,Double_t> ComputeEPCombination( const Electron * ele, const float regression_energy,
136 +                                                  const float regression_energy_error);
137  
138        static Bool_t       PassHggLeptonTagID(const Electron *el);
139 <
139 >      static Bool_t       PassHggLeptonTagID2012(const Electron *el);
140 >    
141      ClassDef(ElectronTools, 0) // Muon tools
142    };
143   }

Diff Legend

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