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

Comparing UserCode/MitPhysics/Utils/interface/MVATools.h (file contents):
Revision 1.1 by mingyang, Thu Oct 13 17:29:19 2011 UTC vs.
Revision 1.15 by mingyang, Sat Nov 9 15:08:28 2013 UTC

# Line 25 | Line 25
25   #include "MitAna/DataTree/interface/SuperCluster.h"
26   #include "MitAna/DataTree/interface/SuperClusterCol.h"
27   #include "MitCommon/MathTools/interface/MathUtils.h"
28 <
28 > #include "MitAna/DataTree/interface/PFCandidateCol.h"
29  
30   class TRandom3;
31   namespace TMVA {//MVA
# Line 34 | Line 34 | namespace TMVA {//MVA
34  
35   namespace mithep {
36    class MVATools {
37 <    public:
38 <      MVATools();
39 <  
40 <  
37 >  public:
38 >    MVATools();
39 >    
40 >    // MVA Typles
41 >    enum IdMVAType {
42 >      kNone      = 0,
43 >      k2011IdMVA,
44 >      k2012IdMVA_globe,
45 >      k2012IdMVA,        // same as above, but more logical name...
46 >      k2013FinalIdMVA_8TeV,
47 >      k2013FinalIdMVA_7TeV,
48 >      k2011IdMVA_HZg
49 >    };
50 >    
51      //--------------------------
52      //MVA
53      //--------------------------
54 +    
55      //void InitializeMVA(int VariableType, TString EndcapWeights,TString BarrelWeights);
56 <    //Bool_t PassMVASelection(const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho,const ElectronCol *els);
56 >    void InitializeMVA(IdMVAType type);
57 >
58 >    // removed this (fab): if a mod want to cuty on BDT values, compute them in the mod using GetMVAbdtValue(..) and make the cut in the mod
59 >    //Bool_t PassMVASelection   (const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho,Float_t bdtCutBarrel, Float_t bdtCutEndcap, const ElectronCol* els=0, Bool_t applyElectronVeto=kTRUE);
60 >    // removed this (fab): no needed naywhere...
61 >    //Int_t  PassElectronVetoInt(const Photon* p, const ElectronCol* els);
62      
63 <    void InitializeMVA(int VariableType, TString EndcapWeights,TString BarrelWeights);
64 <    Bool_t PassMVASelection(const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho,const ElectronCol* els,double MVAPtMin);
65 <    Int_t PassElectronVetoInt(const Photon* p, const ElectronCol* els);
66 <    Float_t GetMVAbdtValue(const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho,const ElectronCol* els);
63 >    Double_t GetMVAbdtValue   (const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho, const PFCandidateCol *fPFCands=NULL ,const ElectronCol* els=0, Bool_t applyElectronVeto=kTRUE);
64 >    
65 >    // these we can remove at some point
66 > /*     Float_t GetMVAbdtValue_2011      (const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho,                                      const ElectronCol* els=0, Bool_t applyElectronVeto=kTRUE); */
67 > /*     Float_t GetMVAbdtValue_2012_globe(const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho, const PFCandidateCol *fPFCands=NULL ,const ElectronCol* els=0, Bool_t applyElectronVeto=kTRUE); */
68 >    
69 >    
70 >  private:
71      
72      TMVA::Reader *fReaderEndcap;
73      TMVA::Reader *fReaderBarrel;    
74      
75 <    //MVA variables 0
76 <    Float_t HoE;
77 <    Float_t covIEtaIEta;
78 <    Float_t tIso1;
79 <    Float_t tIso3;
80 <    Float_t tIso2;
81 <    Float_t R9;
82 <    
83 <    //MVA variables 1
84 <    float RelIsoEcal;
85 <    float RelIsoHcal;
86 <    
87 <    float RelEMax;
88 <    float RelETop;
89 <    float RelEBottom;
90 <    float RelELeft;
91 <    float RelERight;
92 <    float RelE2x5Max;
93 <    float RelE2x5Top;
94 <    float RelE2x5Bottom;
95 <    float RelE2x5Left;
96 <    float RelE2x5Right;
97 <    float RelE5x5;
98 <    
99 <    //MVA variables 2
100 <    float EtaWidth;
101 <    float PhiWidth;
102 <    float CoviEtaiPhi;
103 <    float CoviPhiiPhi;
104 <    float RelPreshowerEnergy;
105 <
106 <    //variables used to compute mva variables
107 <
108 <    Bool_t PassElecVeto;  
109 <
110 <    double ecalIso3;
111 <    double ecalIso4;
112 <    double hcalIso4;
113 <    
114 <    unsigned int wVtxInd;
115 <    
116 <    double trackIso1;
117 <    
118 <    // track iso only
119 <    double trackIso3;
120 <    
121 <    // track iso worst vtx
122 <    double trackIso2;
123 <    
124 <    double combIso1;
125 <    double combIso2;
126 <    
127 <    double RawEnergy;
128 <    
129 <    double dRTrack;
130 <
131 <    //spectator variables
132 <    double Pt_MVA;
133 <    double ScEta_MVA;
134 <  
135 <    Bool_t isbarrel;
136 <    
137 <    // check which category it is ...
138 <    int _tCat;
75 >    IdMVAType fMVAType;
76 >    std::vector<float> mvaVars;
77 >    std::vector<std::string> varNames;
78 >    std::map<std::string,unsigned int> mvaVarMapEB;
79 >    std::map<std::string,unsigned int> mvaVarMapEE;
80 >    
81 >    // -------------------------------------------------
82 >    // fab: these guys should all go away...
83 >    //MVA Variables
84 > /*     float HoE; */
85 > /*     float covIEtaIEta; */
86 > /*     float tIso1abs; */
87 > /*     float tIso3abs; */
88 > /*     float tIso2abs; */
89 > /*     float R9; */
90 >    
91 > /*     float absIsoEcal; */
92 > /*     float absIsoHcal; */
93 > /*     float RelEMax; */
94 > /*     float RelETop; */
95 > /*     float RelEBottom; */
96 > /*     float RelELeft; */
97 > /*     float RelERight; */
98 > /*     float RelE2x5Max; */
99 > /*     float RelE2x5Top; */
100 > /*     float RelE2x5Bottom; */
101 > /*     float RelE2x5Left; */
102 > /*     float RelE2x5Right; */
103 > /*     float RelE5x5; */
104 >    
105 > /*     float EtaWidth; */
106 > /*     float PhiWidth; */
107 > /*     float CoviEtaiPhi; */
108 > /*     float CoviPhiiPhi; */
109 >    
110 > /*     float NVertexes; */
111 > /*     float RelPreshowerEnergy; */
112 >    
113 > /*     //variable for v2 and v1 */
114 > /*     float RelIsoEcal; */
115 > /*     float RelIsoHcal; */
116 > /*     float tIso1; */
117 > /*     float tIso3; */
118 > /*     float tIso2; */
119 >    
120 > /*     float ScEta; */
121 >    
122 > /*     //variables used to compute mva variables */
123 >    
124 > /*     Bool_t PassElecVeto;   */
125 >    
126 > /*     double ecalIso3; */
127 > /*     double ecalIso4; */
128 > /*     double hcalIso4;  */
129 >    
130 > /*     unsigned int wVtxInd; */
131 >    
132 > /*     double trackIso1; */
133 >    
134 > /*     // track iso only */
135 > /*     double trackIso3; */
136 >    
137 > /*     // track iso worst vtx */
138 > /*     double trackIso2;  */
139 >    
140 > /*     double combIso1; */
141 > /*     double combIso2; */
142 >    
143 > /*     double RawEnergy; */
144 >    
145 > /*     double dRTrack; */
146 >    
147 > /*     //spectator variables */
148 > /*     double Pt_MVA; */
149 > /*     double ScEta_MVA; */
150 >    
151 > /*     Bool_t isbarrel; */
152 >    
153 > /*     // check which category it is ... */
154 > /*     int _tCat; */
155 >    
156 > /*     //1201 variable */
157 > /*     float myphoton_pfchargedisogood03; */
158 > /*     float myphoton_pfchargedisobad03;  */
159 > /*     float myphoton_pfphotoniso03; */
160 > /*     float myphoton_sieie;  */
161 > /*     float myphoton_sieip; */
162 > /*     float myphoton_etawidth;  */
163 > /*     float myphoton_phiwidth; */
164 > /*     float myphoton_r9;  */
165 > /*     float myphoton_s4ratio; */
166 > /*     float myphoton_SCeta;  */
167 > /*     float event_rho; */
168 > /*     float myphoton_ESEffSigmaRR; */
169      
170      //MVA  
171 <    Bool_t PassMVA;
172 <    TMVA::Reader *reader;
173 <    Float_t bdt;
174 <    Int_t PassElecVetoInt;
171 > /*     Bool_t PassMVA; */
172 > /*     //Float_t bdt;   -> removed this, we should not have this a memeber variable !!! (fab) */
173 > /*     Int_t PassElecVetoInt; */
174 >
175  
176 <    ClassDef(MVATools, 0) // Muon tools
176 >    TMVA::Reader *reader;    
177 >    ClassDef(MVATools, 0)
178        };
179   }
180  

Diff Legend

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