ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/MitPhysics/Utils/src/JetIDMVA.cc
(Generate patch)

Comparing UserCode/MitPhysics/Utils/src/JetIDMVA.cc (file contents):
Revision 1.3 by pharris, Wed Apr 4 09:51:31 2012 UTC vs.
Revision 1.14 by bendavid, Tue May 29 17:09:02 2012 UTC

# Line 1 | Line 1
1 + #include "FWCore/PythonParameterSet/interface/MakeParameterSets.h"
2 + #include "FWCore/ParameterSet/interface/ParameterSet.h"
3   #include "MitPhysics/Utils/interface/JetIDMVA.h"
4   #include "MitPhysics/Utils/interface/JetTools.h"
5   #include "MitAna/DataTree/interface/StableData.h"
# Line 13 | Line 15 | using namespace mithep;
15  
16   //--------------------------------------------------------------------------------------------------
17   JetIDMVA::JetIDMVA() :
18 <  fJetPtMin(10), //We need to lower this
19 <  fMethodName("JetIDMA"),
18 >  fJetPtMin(0.)  , //We need to lower this
19 >  fDZCut   (0.2),
20 >  fLowPtMethodName ("JetIDMVALowPt" ),
21 >  fHighPtMethodName("JetIDMVAHighPt"),
22    fIsInitialized(kFALSE),
23 <  fNPV    (0),
24 <  fJPt1   (0),
25 <  fJEta1  (0),
26 <  fJPhi1  (0),
27 <  fJD01   (0),
28 <  fJDZ1   (0),
29 <  fJM1    (0),
30 <  fNPart1 (0),
31 <  fLPt1   (0),
32 <  fLEta1  (0),
33 <  fLPhi1  (0),
34 <  fSPt1   (0),
35 <  fSEta1  (0),
36 <  fSPhi1  (0),
37 <  fNEPt1  (0),
38 <  fNEEta1 (0),
39 <  fNEPhi1 (0),
36 <  fEMPt1  (0),
37 <  fEMEta1 (0),
38 <  fEMPhi1 (0),
39 <  fChPt1  (0),
40 <  fChPhi1 (0),
41 <  fLFr1   (0),
42 <  fDRLC1  (0),
43 <  fDRLS1  (0),
44 <  fDRM1   (0),
45 <  fDRNE1  (0),
46 <  fDREM1  (0),
47 <  fDRCH1  (0)
23 >  fNVtx     (0),
24 >  fJPt1     (0),
25 >  fJEta1    (0),
26 >  fJPhi1    (0),
27 >  fJD01     (0),
28 >  fJDZ1     (0),
29 >  fBeta     (0),
30 >  fBetaStar (0),
31 >  fNCharged (0),
32 >  fNNeutrals(0),
33 >  fDRMean   (0),
34 >  fFrac01   (0),
35 >  fFrac02   (0),
36 >  fFrac03   (0),
37 >  fFrac04   (0),
38 >  fFrac05   (0),
39 >  fDR2Mean  (0)
40   {    
41    fReader = 0;
42   }
43   //--------------------------------------------------------------------------------------------------
44 < JetIDMVA::~JetIDMVA()
45 < {
46 <  fReader = 0;
44 > JetIDMVA::~JetIDMVA() {
45 >
46 >  delete fReader;
47 >  delete fLowPtReader;
48   }
49  
50   //--------------------------------------------------------------------------------------------------
51 < void JetIDMVA::Initialize( TString iMethodName,
52 <                           TString iWeights,
53 <                            JetIDMVA::MVAType iType)
51 > void JetIDMVA::Initialize( JetIDMVA::CutType iCutType,
52 >                           TString iLowPtWeights,
53 >                           TString iHighPtWeights,
54 >                           JetIDMVA::MVAType iType,
55 >                           TString iCutFileName)
56   {
57    
58    fIsInitialized = kTRUE;
64  fMethodName    = iMethodName;
59    fType          = iType;
60 +  fCutType       = iCutType;
61 +  
62 +  std::string lCutId = "JetIdParams";
63 +  if(fType == k42)  lCutId = "PuJetIdOptMVA_wp";
64 +  if(fType == k52)  lCutId = "full_5x_wp";
65 +  if(fType == kCut) lCutId = "PuJetIdCutBased_wp";
66 +  //Load Cut Matrix
67 +  edm::ParameterSet lDefConfig = edm::readPSetsFrom(iCutFileName.Data())->getParameter<edm::ParameterSet>("JetIdParams");
68 +  edm::ParameterSet lConfig    = edm::readPSetsFrom(iCutFileName.Data())->getParameter<edm::ParameterSet>(lCutId);
69 +  std::string lCutType = "Tight";
70 +  if(fCutType == kMedium) lCutType = "Medium";
71 +  if(fCutType == kLoose ) lCutType = "Loose";
72 +  if(fCutType == kMET   ) lCutType = "MET";
73 +  if(fType != kCut) {
74 +    std::string lLowPtCut = "MET";
75 +    std::vector<double> lPt010  = lDefConfig.getParameter<std::vector<double> >(("Pt010_" +lLowPtCut).c_str());
76 +    std::vector<double> lPt1020 = lConfig.getParameter<std::vector<double> >(("Pt1020_"+lCutType).c_str());
77 +    std::vector<double> lPt2030 = lConfig.getParameter<std::vector<double> >(("Pt2030_"+lCutType).c_str());
78 +    std::vector<double> lPt3050 = lConfig.getParameter<std::vector<double> >(("Pt3050_"+lCutType).c_str());
79 +    for(int i0 = 0; i0 < 4; i0++) fMVACut[0][i0] = lPt010 [i0];
80 +    for(int i0 = 0; i0 < 4; i0++) fMVACut[1][i0] = lPt1020[i0];
81 +    for(int i0 = 0; i0 < 4; i0++) fMVACut[2][i0] = lPt2030[i0];
82 +    for(int i0 = 0; i0 < 4; i0++) fMVACut[3][i0] = lPt3050[i0];
83 +  }
84 +  if(fType == kCut) {
85 +    for(int i0 = 0; i0 < 2; i0++) {
86 +      std::string lFullCutType = lCutType;
87 +      if(i0 == 0) lFullCutType = "BetaStar"+ lCutType;
88 +      if(i0 == 1) lFullCutType = "RMS"     + lCutType;
89 +      std::vector<double> pt010  = lConfig.getParameter<std::vector<double> >(("Pt010_" +lFullCutType).c_str());
90 +      std::vector<double> pt1020 = lConfig.getParameter<std::vector<double> >(("Pt1020_"+lFullCutType).c_str());
91 +      std::vector<double> pt2030 = lConfig.getParameter<std::vector<double> >(("Pt2030_"+lFullCutType).c_str());
92 +      std::vector<double> pt3050 = lConfig.getParameter<std::vector<double> >(("Pt3050_"+lFullCutType).c_str());
93 +      if(i0 == 0) {
94 +        for(int i2 = 0; i2 < 4; i2++) fBetaStarCut[0][i2] = pt010 [i2];
95 +        for(int i2 = 0; i2 < 4; i2++) fBetaStarCut[1][i2] = pt1020[i2];
96 +        for(int i2 = 0; i2 < 4; i2++) fBetaStarCut[2][i2] = pt2030[i2];
97 +        for(int i2 = 0; i2 < 4; i2++) fBetaStarCut[3][i2] = pt3050[i2];
98 +      }
99 +      if(i0 == 1) {
100 +        for(int i2 = 0; i2 < 4; i2++) fRMSCut[0][i2] = pt010 [i2];
101 +        for(int i2 = 0; i2 < 4; i2++) fRMSCut[1][i2] = pt1020[i2];
102 +        for(int i2 = 0; i2 < 4; i2++) fRMSCut[2][i2] = pt2030[i2];
103 +        for(int i2 = 0; i2 < 4; i2++) fRMSCut[3][i2] = pt3050[i2];
104 +      }
105 +    }
106 +    return;
107 +  }
108 +  
109 +  
110 +  fLowPtReader   = 0;
111 +  fLowPtReader   = new TMVA::Reader( "!Color:!Silent:Error" );  
112 +  fLowPtReader->AddVariable( "nvtx"     , &fNVtx      );
113 +  fLowPtReader->AddVariable( "jetPt"    , &fJPt1      );  
114 +  fLowPtReader->AddVariable( "jetEta"   , &fJEta1     );
115 +  fLowPtReader->AddVariable( "jetPhi"   , &fJPhi1     );            
116 +  fLowPtReader->AddVariable( "dZ"       , &fJDZ1      );
117 +  fLowPtReader->AddVariable( "d0"       , &fJD01      );
118 +  fLowPtReader->AddVariable( "beta"     , &fBeta      );
119 +  fLowPtReader->AddVariable( "betaStar" , &fBetaStar  );
120 +  fLowPtReader->AddVariable( "nCharged" , &fNCharged  );
121 +  fLowPtReader->AddVariable( "nNeutrals", &fNNeutrals );
122 +  fLowPtReader->AddVariable( "dRMean"   , &fDRMean    );
123 +  fLowPtReader->AddVariable( "frac01"   , &fFrac01    );
124 +  fLowPtReader->AddVariable( "frac02"   , &fFrac02    );
125 +  fLowPtReader->AddVariable( "frac03"   , &fFrac03    );
126 +  fLowPtReader->AddVariable( "frac04"   , &fFrac04    );
127 +  fLowPtReader->AddVariable( "frac05"   , &fFrac05    );
128 +  
129    fReader        = 0;
130    fReader        = new TMVA::Reader( "!Color:!Silent:Error" );  
131    if (fType == kBaseline) {
132 <    fReader->AddSpectator( "npv"     , &fNPV    );
133 <    fReader->AddVariable( "jspt_1"   , &fJPt1   );
134 <    fReader->AddVariable( "jseta_1"  , &fJEta1  );
135 <    fReader->AddVariable( "jsphi_1"  , &fJPhi1  );
136 <    fReader->AddVariable( "jd0_1"    , &fJD01   );
137 <    fReader->AddVariable( "jdZ_1"    , &fJDZ1   );
138 <    fReader->AddVariable( "jm_1"     , &fJM1    );
139 <    fReader->AddVariable( "npart_1"  , &fNPart1 );
140 <    fReader->AddVariable( "lpt_1"    , &fLPt1   );
141 <    fReader->AddVariable( "leta_1"   , &fLEta1  );
142 <    fReader->AddVariable( "lphi_1"   , &fLPhi1  );
143 <    fReader->AddVariable( "spt_1"    , &fSPt1   );
144 <    fReader->AddVariable( "seta_1"   , &fSEta1  );
145 <    fReader->AddVariable( "sphi_1"   , &fSPhi1  );
146 <    fReader->AddVariable( "lnept_1"  , &fNEPt1  );
147 <    fReader->AddVariable( "lneeta_1" , &fNEEta1 );
148 <    fReader->AddVariable( "lnephi_1" , &fNEPhi1 );
149 <    fReader->AddVariable( "lempt_1"  , &fEMPt1  );
150 <    fReader->AddVariable( "lemeta_1" , &fEMEta1 );
151 <    fReader->AddVariable( "lemphi_1" , &fEMPhi1 );
152 <    fReader->AddVariable( "lchpt_1"  , &fChPt1  );
153 <    fReader->AddVariable( "lchphi_1" , &fChPhi1 );
154 <    fReader->AddVariable( "lLfr_1"   , &fLFr1   );
155 <    fReader->AddVariable( "drlc_1"   , &fDRLC1  );
156 <    fReader->AddVariable( "drls_1"   , &fDRLS1  );
157 <    fReader->AddVariable( "drm_1"    , &fDRM1   );
158 <    fReader->AddVariable( "drmne_1"  , &fDRNE1  );
159 <    fReader->AddVariable( "drem_1"   , &fDREM1  );
160 <    fReader->AddVariable( "drch_1"   , &fDRCH1  );
132 >    fReader->AddVariable( "nvtx"     , &fNVtx      );
133 >    fReader->AddVariable( "jetPt"    , &fJPt1      );  
134 >    fReader->AddVariable( "jetEta"   , &fJEta1     );
135 >    fReader->AddVariable( "jetPhi"   , &fJPhi1     );            
136 >    fReader->AddVariable( "dZ"       , &fJDZ1      );
137 >    fReader->AddVariable( "d0"       , &fJD01      );
138 >    fReader->AddVariable( "beta"     , &fBeta      );
139 >    fReader->AddVariable( "betaStar" , &fBetaStar  );
140 >    fReader->AddVariable( "nCharged" , &fNCharged  );
141 >    fReader->AddVariable( "nNeutrals", &fNNeutrals );
142 >    fReader->AddVariable( "dRMean"   , &fDRMean    );
143 >    fReader->AddVariable( "frac01"   , &fFrac01    );
144 >    fReader->AddVariable( "frac02"   , &fFrac02    );
145 >    fReader->AddVariable( "frac03"   , &fFrac03    );
146 >    fReader->AddVariable( "frac04"   , &fFrac04    );
147 >    fReader->AddVariable( "frac05"   , &fFrac05    );
148 >  }
149 >  if (fType == k42) {
150 >    fReader->AddVariable( "frac01"   , &fFrac01    );
151 >    fReader->AddVariable( "frac02"   , &fFrac02    );
152 >    fReader->AddVariable( "frac03"   , &fFrac03    );
153 >    fReader->AddVariable( "frac04"   , &fFrac04    );
154 >    fReader->AddVariable( "frac05"   , &fFrac05    );
155 >    fReader->AddVariable( "nvtx"     , &fNVtx      );
156 >    fReader->AddVariable( "nNeutrals", &fNNeutrals );
157 >    fReader->AddVariable( "beta"     , &fBeta      );
158 >    fReader->AddVariable( "betaStar" , &fBetaStar  );
159 >    fReader->AddVariable( "dZ"       , &fJDZ1      );
160 >    fReader->AddVariable( "nCharged" , &fNCharged  );
161 >    fReader->AddSpectator( "jetPt"    , &fJPt1      );  
162 >    fReader->AddSpectator( "jetEta"   , &fJEta1     );
163    }
164 <  fReader->BookMVA(fMethodName , iWeights );
164 >  if (fType == k52) {
165 >    fReader->AddVariable( "frac01"   , &fFrac01    );
166 >    fReader->AddVariable( "frac02"   , &fFrac02    );
167 >    fReader->AddVariable( "frac03"   , &fFrac03    );
168 >    fReader->AddVariable( "frac04"   , &fFrac04    );
169 >    fReader->AddVariable( "frac05"   , &fFrac05    );
170 >    fReader->AddVariable( "dR2Mean"  , &fDR2Mean   );
171 >    fReader->AddVariable( "nvtx"     , &fNVtx      );
172 >    fReader->AddVariable( "nNeutrals", &fNNeutrals );
173 >    fReader->AddVariable( "beta"     , &fBeta      );
174 >    fReader->AddVariable( "betaStar" , &fBetaStar  );
175 >    fReader->AddVariable( "dZ"       , &fJDZ1      );
176 >    fReader->AddVariable( "nCharged" , &fNCharged  );
177 >    fReader->AddSpectator( "jetPt"    , &fJPt1      );  
178 >    fReader->AddSpectator( "jetEta"   , &fJEta1     );
179 >  }
180 >
181 >  fLowPtReader->BookMVA(fLowPtMethodName  , iLowPtWeights );
182 >  fReader->BookMVA(fHighPtMethodName , iHighPtWeights );
183    std::cout << "Jet ID MVA Initialization\n";
184 <  std::cout << "MethodName : " << fMethodName << " , type == " << fType << std::endl;
184 >  std::cout << "MethodName : " << fLowPtMethodName << " , type == " << fType << std::endl;
185 >
186   }
187  
188   //--------------------------------------------------------------------------------------------------
# Line 109 | Line 193 | Double_t JetIDMVA::MVAValue(
193                              Float_t iJPhi1  ,
194                              Float_t iJD01   ,
195                              Float_t iJDZ1   ,
196 <                            Float_t iJM1    ,
197 <                            Float_t iNPart1 ,
198 <                            Float_t iLPt1   ,
199 <                            Float_t iLEta1  ,
200 <                            Float_t iLPhi1  ,
201 <                            Float_t iSPt1   ,
202 <                            Float_t iSEta1  ,
203 <                            Float_t iSPhi1  ,
204 <                            Float_t iNEPt1  ,
205 <                            Float_t iNEEta1 ,
206 <                            Float_t iNEPhi1 ,
123 <                            Float_t iEMPt1  ,
124 <                            Float_t iEMEta1 ,
125 <                            Float_t iEMPhi1 ,
126 <                            Float_t iChPt1  ,
127 <                            Float_t iChPhi1 ,
128 <                            Float_t iLFr1   ,
129 <                            Float_t iDRLC1  ,
130 <                            Float_t iDRLS1  ,
131 <                            Float_t iDRM1   ,
132 <                            Float_t iDRNE1 ,
133 <                            Float_t iDREM1  ,
134 <                            Float_t iDRCH1  
196 >                            Float_t iBeta   ,
197 >                            Float_t iBetaStar,
198 >                            Float_t iNCharged,
199 >                            Float_t iNNeutrals,
200 >                            Float_t iDRMean  ,
201 >                            Float_t iFrac01  ,
202 >                            Float_t iFrac02  ,
203 >                            Float_t iFrac03  ,
204 >                            Float_t iFrac04  ,
205 >                            Float_t iFrac05  ,
206 >                            Float_t iDR2Mean  
207                              ){
208    
209 <  if (!fIsInitialized) {
209 >  if(!fIsInitialized) {
210      std::cout << "Error: JetIDMVA not properly initialized.\n";
211      return -9999;
212    }
213    
214 <  fNPV    = iNPV;
215 <  fJPt1   = iJPt1;
216 <  fJEta1  = iJEta1;
217 <  fJPhi1  = fJPhi1;
218 <  fJD01   = iJD01;
219 <  fJDZ1   = iJDZ1;
220 <  fJM1    = iJM1 ;
221 <  fNPart1 = iNPart1;
222 <  fLPt1   = iLPt1;
223 <  fLEta1  = iLEta1;
224 <  fLPhi1  = iLPhi1;
225 <  fSPt1   = iSPt1;
226 <  fSEta1  = iSEta1;
227 <  fSPhi1  = iSPhi1;
228 <  fNEPt1  = iNEPt1;
229 <  fNEEta1 = iNEEta1;
230 <  fNEPhi1 = iNEPhi1;
159 <  fEMPt1  = iEMPt1;
160 <  fEMEta1 = iEMEta1;
161 <  fEMPhi1 = iEMPhi1;
162 <  fChPt1  = iChPt1;
163 <  fChPhi1 = iChPhi1;
164 <  fLFr1   = iLFr1;
165 <  fDRLC1  = iDRLC1;
166 <  fDRLS1  = iDRLS1;
167 <  fDRM1   = iDRM1;
168 <  fDRNE1  = iDRNE1;
169 <  fDREM1  = iDREM1;
170 <  fDRCH1  = iDRCH1;  
214 >  fNVtx      = iNPV;
215 >  fJPt1      = iJPt1;
216 >  fJEta1     = iJEta1;
217 >  fJPhi1     = fJPhi1;
218 >  fJD01      = iJD01;
219 >  fJDZ1      = iJDZ1;
220 >  fBeta      = iBeta;
221 >  fBetaStar  = iBetaStar;
222 >  fNCharged  = iNCharged;
223 >  fNNeutrals = iNNeutrals;
224 >  fDRMean    = iDRMean;
225 >  fFrac01    = iFrac01;
226 >  fFrac02    = iFrac02;
227 >  fFrac03    = iFrac03;
228 >  fFrac04    = iFrac04;
229 >  fFrac05    = iFrac05;
230 >  fDR2Mean   = iDR2Mean;
231  
232    Double_t lMVA = -9999;  
233 <  lMVA = fReader->EvaluateMVA( fMethodName );
233 >  if(iJPt1 < 10) lMVA = fLowPtReader->EvaluateMVA( fLowPtMethodName  );
234 >  if(iJPt1 > 10) lMVA = fReader->EvaluateMVA( fHighPtMethodName );
235  
236    return lMVA;
237   }
238   //--------------------------------------------------------------------------------------------------
239 < Bool_t JetIDMVA::pass(const PFJet *iJet,const Vertex *iVertex,
239 > Bool_t JetIDMVA::pass(const PFJet *iJet,const Vertex *iVertex,const VertexCol *iVertices,
240                        FactorizedJetCorrector *iJetCorrector,
241 <                      const PileupEnergyDensityCol *iPileupEnergyDensity) {
241 >                      const PileupEnergyDensityCol *iPileupEnergyDensity,
242 >                      RhoUtilities::RhoType type) {
243 >  
244    if(!JetTools::passPFLooseId(iJet))                 return false;
245 <  if(correctedPt(iJet,iJetCorrector,iPileupEnergyDensity) < fJetPtMin && iJet->TrackCountingHighEffBJetTagsDisc() == -100) return false; //This line is a bug in the Met training
246 <  if( fabs(JetTools::impactParameter(iJet,iVertex,true)) < 0.2) return true;
247 <  double lMVA = MVAValue(iJet,iVertex,iJetCorrector,iPileupEnergyDensity);
248 <  if(lMVA < -0.8)                            return false;
249 <  if(lMVA < -0.5 && fabs(iJet->Eta()) > 3.0) return false;
245 >  if(fabs(iJet->Eta()) > 4.99)                       return false;
246 >  
247 >  double lMVA = MVAValue   (iJet,iVertex,iVertices,iJetCorrector,iPileupEnergyDensity);
248 >  double lPt  = correctedPt(iJet,                  iJetCorrector,iPileupEnergyDensity,type);
249 >  if(lPt < fJetPtMin)                         return false;
250 >  
251 >  int lPtId = 0;
252 >  if(lPt > 10 && lPt < 20) lPtId = 1;
253 >  if(lPt > 20 && lPt < 30) lPtId = 2;
254 >  if(lPt > 30                   ) lPtId = 3;
255 >  
256 >  int lEtaId = 0;
257 >  if(fabs(iJet->Eta()) > 2.5  && fabs(iJet->Eta()) < 2.75) lEtaId = 1;
258 >  if(fabs(iJet->Eta()) > 2.75 && fabs(iJet->Eta()) < 3.0 ) lEtaId = 2;
259 >  if(fabs(iJet->Eta()) > 3.0  && fabs(iJet->Eta()) < 5.0 ) lEtaId = 3;
260 >  
261 >  double lMVACut = fMVACut[lPtId][lEtaId];
262 >  if(lMVA < lMVACut) return false;
263    return true;
264   }
265   //--------------------------------------------------------------------------------------------------
266 < Bool_t JetIDMVA::pass(const PFJet *iJet,const Vertex *iVertex) {
266 > Bool_t JetIDMVA::passCut(const PFJet *iJet,const Vertex *iVertex,const VertexCol *iVertices) {
267 >  if(!JetTools::passPFLooseId(iJet))                 return false;
268 >  if(iJet->Pt()        < fJetPtMin) return false;
269 >  if(fabs(iJet->Eta()) > 4.99)      return false;
270 >  //if(fType == kCut) passCut(iJet,iVertex,iVertices);
271 >
272 >  double lPt = iJet->Pt();
273 >  int lPtId = 0;
274 >  if(lPt > 10 && lPt < 20) lPtId = 1;
275 >  if(lPt > 20 && lPt < 30) lPtId = 2;
276 >  if(lPt > 30                   ) lPtId = 3;
277 >  
278 >  int lEtaId = 0;
279 >  if(fabs(iJet->Eta()) > 2.5  && fabs(iJet->Eta()) < 2.75) lEtaId = 1;
280 >  if(fabs(iJet->Eta()) > 2.75 && fabs(iJet->Eta()) < 3.0 ) lEtaId = 2;
281 >  if(fabs(iJet->Eta()) > 3.0  && fabs(iJet->Eta()) < 5.0 ) lEtaId = 3;
282 >  float betaStarModified = JetTools::betaStarClassic(iJet,iVertex,iVertices)/log(iVertices ->GetEntries()-0.64);
283 >  float dR2Mean          = JetTools::dR2Mean(iJet,-1);
284 >  
285 >  if(betaStarModified < fBetaStarCut[lPtId][lEtaId] &&
286 >     dR2Mean          < fRMSCut     [lPtId][lEtaId]
287 >     ) return true;
288 >  
289 >  return false;
290 > }
291 > //--------------------------------------------------------------------------------------------------
292 > Bool_t JetIDMVA::pass(const PFJet *iJet,const Vertex *iVertex,const VertexCol *iVertices) {
293    if(!JetTools::passPFLooseId(iJet))                 return false;
294 <  if(iJet->Pt() < fJetPtMin && iJet->TrackCountingHighEffBJetTagsDisc() == -100) return false; //This line is a bug in the Met training
295 <  if( fabs(JetTools::impactParameter(iJet,iVertex,true)) < 0.2) return true;
296 <  double lMVA = MVAValue(iJet,iVertex);
297 <  if(lMVA < -0.8)                            return false;
298 <  if(lMVA < -0.5 && fabs(iJet->Eta()) > 3.0) return false;
294 >  if(iJet->Pt()        < fJetPtMin) return false;
295 >  if(fabs(iJet->Eta()) > 4.99)      return false;
296 >  if(fType == kCut) return passCut(iJet,iVertex,iVertices);
297 >  double lMVA = MVAValue(iJet,iVertex,iVertices);
298 >  
299 >  int lPtId = 0;
300 >  if(iJet->Pt() > 10 && iJet->Pt() < 20) lPtId = 1;
301 >  if(iJet->Pt() > 20 && iJet->Pt() < 30) lPtId = 2;
302 >  if(iJet->Pt() > 30                   ) lPtId = 3;
303 >  
304 >  int lEtaId = 0;
305 >  if(fabs(iJet->Eta()) > 2.5  && fabs(iJet->Eta()) < 2.75) lEtaId = 1;
306 >  if(fabs(iJet->Eta()) > 2.75 && fabs(iJet->Eta()) < 3.0 ) lEtaId = 2;
307 >  if(fabs(iJet->Eta()) > 3.0  && fabs(iJet->Eta()) < 5.0 ) lEtaId = 3;
308 >  
309 >  double lMVACut = fMVACut[lPtId][lEtaId];
310 >  if(lMVA < lMVACut) return false;
311    return true;
312 +  //if(lMVA < -0.8)                            return false;
313 +  //if(lMVA < -0.5 && fabs(iJet->Eta()) > 3.0) return false;
314 +  //if(iJet->Pt() < fJetPtMin && iJet->TrackCountingHighEffBJetTagsDisc() == -100) return false; //This line is a bug in the Met training
315 +  //if( fabs(JetTools::impactParameter(iJet,iVertex,true)) < 0.2) return true;
316   }
317   //--------------------------------------------------------------------------------------------------
318 < Double_t JetIDMVA::MVAValue(const PFJet *iJet,const Vertex *iVertex, //Vertex here is the PV
318 > Double_t JetIDMVA::MVAValue(const PFJet *iJet,const Vertex *iVertex,const VertexCol *iVertices, //Vertex here is the PV
319                              FactorizedJetCorrector *iJetCorrector,
320                              const PileupEnergyDensityCol *iPileupEnergyDensity,
321                              Bool_t printDebug) {
# Line 209 | Line 327 | Double_t JetIDMVA::MVAValue(const PFJet
327    if(!JetTools::passPFLooseId(iJet)) return -2.;
328  
329    //set all input variables
330 +  fNVtx      = iVertices->GetEntries();
331    fJPt1      = correctedPt(iJet,iJetCorrector,iPileupEnergyDensity);
332    fJEta1     = iJet->RawMom().Eta();
333    fJPhi1     = iJet->RawMom().Phi();
334 <  fJM1       = iJet->Mass();
335 <
336 <  const mithep::PFCandidate *lLead     = JetTools::leadCand(iJet,-1);
337 <  const mithep::PFCandidate *lSecond   = JetTools::leadCand(iJet,-1,true);
338 <  const mithep::PFCandidate *lLeadNeut = JetTools::leadCand(iJet ,5);
339 <  const mithep::PFCandidate *lLeadEm   = JetTools::leadCand(iJet ,4);
340 <  const mithep::PFCandidate *lLeadCh   = JetTools::leadCand(iJet ,1);
341 <
342 <  fJD01         = JetTools::impactParameter(iJet,iVertex);  
343 <  fJDZ1         = JetTools::impactParameter(iJet,iVertex,true);
344 <  fNPart1       = iJet->NPFCands();
345 <  fLPt1         = lLead    ->Pt();
346 <  fLEta1        = lLead    ->Eta();
347 <  fLPhi1        = lLead    ->Phi();
348 <  fSPt1         = lSecond  ->Pt();
349 <  fSEta1        = lSecond  ->Eta();
350 <  fSPhi1        = lSecond  ->Phi();
351 <  fNEPt1        = lLeadNeut->Pt();
233 <  fNEEta1       = lLeadNeut->Eta();
234 <  fNEPhi1       = lLeadNeut->Phi();
235 <  fEMPt1        = lLeadEm  ->Pt();
236 <  fEMEta1       = lLeadEm  ->Eta();
237 <  fEMPhi1       = lLeadEm  ->Phi();
238 <  fChPt1        = lLeadCh  ->Pt();
239 <  //fChEta1       = lLeadCh  ->Eta();
240 <  fChPhi1       = lLeadCh  ->Phi();
241 <  fLFr1         = lLead->Pt()/iJet->Pt();
242 <
243 <  fDRLC1        = MathUtils::DeltaR(iJet->Mom(),lLead  ->Mom());
244 <  fDRLS1        = MathUtils::DeltaR(iJet->Mom(),lSecond->Mom());
245 <  fDRM1         = JetTools::dRMean (iJet,-1);
246 <  fDRNE1        = JetTools::dRMean (iJet, 5);
247 <  fDREM1        = JetTools::dRMean (iJet, 4);
248 <  fDRCH1        = JetTools::dRMean (iJet, 1);
249 <
250 <  double lMVA = fReader->EvaluateMVA( fMethodName );
251 <  
334 >  fJD01      = JetTools::impactParameter(iJet,iVertex);  
335 >  fJDZ1      = JetTools::impactParameter(iJet,iVertex,true);
336 >  fBeta      = JetTools::Beta(iJet,iVertex,fDZCut);
337 >  fBetaStar  = JetTools::betaStar(iJet,iVertex,iVertices,fDZCut);
338 >  fNCharged  = iJet->ChargedMultiplicity();
339 >  fNNeutrals = iJet->NeutralMultiplicity();
340 >
341 >  fDRMean    = JetTools::dRMean(iJet,-1);
342 >  fDR2Mean   = JetTools::dR2Mean(iJet,-1);
343 >  fFrac01    = JetTools::frac  (iJet,0.1,0. ,-1);
344 >  fFrac02    = JetTools::frac  (iJet,0.2,0.1,-1);
345 >  fFrac03    = JetTools::frac  (iJet,0.3,0.2,-1);
346 >  fFrac04    = JetTools::frac  (iJet,0.4,0.3,-1);
347 >  fFrac05    = JetTools::frac  (iJet,0.5,0.4,-1);
348 >
349 >  double lMVA = 0;
350 >  if(fJPt1 < 10) lMVA = fLowPtReader->EvaluateMVA( fLowPtMethodName  );
351 >  if(fJPt1 > 10) lMVA = fReader->EvaluateMVA( fHighPtMethodName );
352    if (printDebug == kTRUE) {
353      std::cout << "Debug Jet MVA: "
354 <              << fNPV    << " "
355 <              << fJPt1   << " "
356 <              << fJEta1  << " "
357 <              << fJPhi1  << " "
358 <              << fJD01   << " "
359 <              << fJDZ1   << " "
360 <              << fJM1    << " "
361 <              << fNPart1 << " "
362 <              << fLPt1   << " "
363 <              << fLEta1  << " "
364 <              << fLPhi1  << " "
365 <              << fSPt1   << " "
366 <              << fSEta1  << " "
367 <              << fSPhi1  << " "
368 <              << fNEPt1  << " "
369 <              << fNEEta1 << " "
370 <              << fNEPhi1 << " "
271 <              << fEMPt1  << " "
272 <              << fEMEta1 << " "
273 <              << fEMPhi1 << " "
274 <              << fChPt1  << " "
275 <              << fChPhi1 << " "
276 <              << fLFr1   << " "
277 <              << fDRLC1  << " "
278 <              << fDRLS1  << " "
279 <              << fDRM1   << " "
280 <              << fDRNE1 << " "
281 <              << fDREM1  << " "
282 <              << fDRCH1  << " "
354 >              << fNVtx      << " "
355 >              << fJPt1      << " "
356 >              << fJEta1     << " "
357 >              << fJPhi1     << " "
358 >              << fJD01      << " "
359 >              << fJDZ1      << " "
360 >              << fBeta      << " "
361 >              << fBetaStar  << " "
362 >              << fNCharged  << " "
363 >              << fNNeutrals << " "
364 >              << fDRMean    << " "
365 >              << fFrac01    << " "
366 >              << fFrac02    << " "
367 >              << fFrac03    << " "
368 >              << fFrac04    << " "
369 >              << fFrac05    << " "
370 >              << fDRMean    
371                << " === : === "
372                << lMVA << " "    
373                << std::endl;
# Line 287 | Line 375 | Double_t JetIDMVA::MVAValue(const PFJet
375  
376    return lMVA;
377   }
378 < Double_t JetIDMVA::MVAValue(const PFJet *iJet,const Vertex *iVertex, //Vertex here is the PV
378 > Double_t JetIDMVA::MVAValue(const PFJet *iJet,const Vertex *iVertex, const VertexCol *iVertices,//Vertex here is the PV
379                              Bool_t printDebug) {
380    
381    if (!fIsInitialized) {
# Line 297 | Line 385 | Double_t JetIDMVA::MVAValue(const PFJet
385    if(!JetTools::passPFLooseId(iJet)) return -2.;
386  
387    //set all input variables
388 +  fNVtx      = iVertices->GetEntries();
389    fJPt1      = iJet->Pt();
390    fJEta1     = iJet->RawMom().Eta();
391    fJPhi1     = iJet->RawMom().Phi();
392 <  fJM1       = iJet->Mass();
393 <
394 <  const mithep::PFCandidate *lLead     = JetTools::leadCand(iJet,-1);
395 <  const mithep::PFCandidate *lSecond   = JetTools::leadCand(iJet,-1,true);
396 <  const mithep::PFCandidate *lLeadNeut = JetTools::leadCand(iJet ,5);
397 <  const mithep::PFCandidate *lLeadEm   = JetTools::leadCand(iJet ,4);
398 <  const mithep::PFCandidate *lLeadCh   = JetTools::leadCand(iJet ,1);
399 <
400 <  fJD01         = JetTools::impactParameter(iJet,iVertex);  
401 <  fJDZ1         = JetTools::impactParameter(iJet,iVertex,true);
402 <  fNPart1       = iJet->NPFCands();
403 <  fLPt1         = lLead    ->Pt();
404 <  fLEta1        = lLead    ->Eta();
405 <  fLPhi1        = lLead    ->Phi();
406 <  fSPt1         = lSecond  ->Pt();
407 <  fSEta1        = lSecond  ->Eta();
408 <  fSPhi1        = lSecond  ->Phi();
409 <  fNEPt1        = lLeadNeut->Pt();
410 <  fNEEta1       = lLeadNeut->Eta();
322 <  fNEPhi1       = lLeadNeut->Phi();
323 <  fEMPt1        = lLeadEm  ->Pt();
324 <  fEMEta1       = lLeadEm  ->Eta();
325 <  fEMPhi1       = lLeadEm  ->Phi();
326 <  fChPt1        = lLeadCh  ->Pt();
327 <  //fChEta1       = lLeadCh  ->Eta();
328 <  fChPhi1       = lLeadCh  ->Phi();
329 <  fLFr1         = lLead->Pt()/iJet->RawMom().Pt();
330 <
331 <  fDRLC1        = MathUtils::DeltaR(iJet->Mom(),lLead  ->Mom());
332 <  fDRLS1        = MathUtils::DeltaR(iJet->Mom(),lSecond->Mom());
333 <  fDRM1         = JetTools::dRMean (iJet,-1);
334 <  fDRNE1        = JetTools::dRMean (iJet, 5);
335 <  fDREM1        = JetTools::dRMean (iJet, 4);
336 <  fDRCH1        = JetTools::dRMean (iJet, 1);
337 <
338 <  double lMVA = fReader->EvaluateMVA( fMethodName );
339 <  
392 >  fJD01      = JetTools::impactParameter(iJet,iVertex);  
393 >  fJDZ1      = JetTools::impactParameter(iJet,iVertex,true);
394 >  fBeta      = JetTools::Beta(iJet,iVertex,fDZCut);
395 >  fBetaStar  = JetTools::betaStar(iJet,iVertex,iVertices,fDZCut);
396 >  fNCharged  = iJet->ChargedMultiplicity();
397 >  fNNeutrals = iJet->NeutralMultiplicity();
398 >
399 >  fDRMean    = JetTools::dRMean (iJet,-1);
400 >  fDR2Mean   = JetTools::dR2Mean(iJet,-1);
401 >  fFrac01    = JetTools::frac   (iJet,0.1,0. ,-1);
402 >  fFrac02    = JetTools::frac   (iJet,0.2,0.1,-1);
403 >  fFrac03    = JetTools::frac   (iJet,0.3,0.2,-1);
404 >  fFrac04    = JetTools::frac   (iJet,0.4,0.3,-1);
405 >  fFrac05    = JetTools::frac   (iJet,0.5,0.4,-1);
406 >
407 >  double lMVA = 0;
408 >  if(fJPt1 < 10) lMVA = fLowPtReader->EvaluateMVA( fLowPtMethodName  );
409 >  if(fJPt1 > 10) lMVA = fReader     ->EvaluateMVA( fHighPtMethodName );
410 >  
411    if (printDebug == kTRUE) {
412      std::cout << "Debug Jet MVA: "
413 <              << fNPV    << " "
414 <              << fJPt1   << " "
415 <              << fJEta1  << " "
416 <              << fJPhi1  << " "
417 <              << fJD01   << " "
418 <              << fJDZ1   << " "
419 <              << fJM1    << " "
420 <              << fNPart1 << " "
421 <              << fLPt1   << " "
422 <              << fLEta1  << " "
423 <              << fLPhi1  << " "
424 <              << fSPt1   << " "
425 <              << fSEta1  << " "
426 <              << fSPhi1  << " "
427 <              << fNEPt1  << " "
428 <              << fNEEta1 << " "
429 <              << fNEPhi1 << " "
359 <              << fEMPt1  << " "
360 <              << fEMEta1 << " "
361 <              << fEMPhi1 << " "
362 <              << fChPt1  << " "
363 <              << fChPhi1 << " "
364 <              << fLFr1   << " "
365 <              << fDRLC1  << " "
366 <              << fDRLS1  << " "
367 <              << fDRM1   << " "
368 <              << fDRNE1 << " "
369 <              << fDREM1  << " "
370 <              << fDRCH1  << " "
413 >              << fNVtx      << " "
414 >              << fJPt1      << " "
415 >              << fJEta1     << " "
416 >              << fJPhi1     << " "
417 >              << fJD01      << " "
418 >              << fJDZ1      << " "
419 >              << fBeta      << " "
420 >              << fBetaStar  << " "
421 >              << fNCharged  << " "
422 >              << fNNeutrals << " "
423 >              << fDRMean    << " "
424 >              << fFrac01    << " "
425 >              << fFrac02    << " "
426 >              << fFrac03    << " "
427 >              << fFrac04    << " "
428 >              << fFrac05    << " "
429 >              << fDRMean    
430                << " === : === "
431                << lMVA << " "    
432                << std::endl;
# Line 375 | Line 434 | Double_t JetIDMVA::MVAValue(const PFJet
434  
435    return lMVA;
436   }
437 < Double_t JetIDMVA::correctedPt(const PFJet *iJet, FactorizedJetCorrector *iJetCorrector,const PileupEnergyDensityCol *iPUEnergyDensity) {
437 > Double_t JetIDMVA::correctedPt(const PFJet *iJet, FactorizedJetCorrector *iJetCorrector,
438 >                               const PileupEnergyDensityCol *iPUEnergyDensity,
439 >                               RhoUtilities::RhoType type) {
440 >  Double_t Rho = 0.0;
441 >  switch(type) {
442 >  case RhoUtilities::MIT_RHO_VORONOI_HIGH_ETA:
443 >    Rho = iPUEnergyDensity->At(0)->Rho();
444 >    break;
445 >  case RhoUtilities::MIT_RHO_VORONOI_LOW_ETA:
446 >    Rho = iPUEnergyDensity->At(0)->RhoLowEta();
447 >    break;
448 >  case RhoUtilities::MIT_RHO_RANDOM_HIGH_ETA:
449 >    Rho = iPUEnergyDensity->At(0)->RhoRandom();
450 >    break;
451 >  case RhoUtilities::MIT_RHO_RANDOM_LOW_ETA:
452 >    Rho = iPUEnergyDensity->At(0)->RhoRandomLowEta();
453 >    break;
454 >  case RhoUtilities::CMS_RHO_RHOKT6PFJETS:
455 >    Rho = iPUEnergyDensity->At(0)->RhoKt6PFJets();
456 >    break;
457 >  default:
458 >    // use the old default
459 >    Rho = iPUEnergyDensity->At(0)->Rho();
460 >    break;
461 >  }
462 >    
463    const FourVectorM rawMom = iJet->RawMom();
464    iJetCorrector->setJetEta(rawMom.Eta());
465    iJetCorrector->setJetPt (rawMom.Pt());
466    iJetCorrector->setJetPhi(rawMom.Phi());
467    iJetCorrector->setJetE  (rawMom.E());
468 <  iJetCorrector->setRho   (iPUEnergyDensity->At(0)->RhoHighEta());
468 >  iJetCorrector->setRho   (Rho);
469    iJetCorrector->setJetA  (iJet->JetArea());
470    iJetCorrector->setJetEMF(-99.0);    
471    Double_t correction = iJetCorrector->getCorrection();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines