ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/MitPhysics/Utils/src/JetIDMVA.cc

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.4 by pharris, Sat Apr 7 09:36:33 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),
35	<	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		{
40		fReader = 0;
41		}
42		//--------------------------------------------------------------------------------------------------
43	<	JetIDMVA::~JetIDMVA()
44	<	{
43	>	JetIDMVA::~JetIDMVA() {
44	>
45		fReader = 0;
46		}
47
48		//--------------------------------------------------------------------------------------------------
49	<	void JetIDMVA::Initialize( TString iMethodName,
50	<	TString iWeights,
51	<	JetIDMVA::MVAType iType)
49	>	void JetIDMVA::Initialize( JetIDMVA::CutType iCutType,
50	>	TString iLowPtWeights,
51	>	TString iHighPtWeights,
52	>	JetIDMVA::MVAType iType,
53	>	TString iCutFileName)
54		{
55
56		fIsInitialized = kTRUE;
64	–	fMethodName    = iMethodName;
57		fType          = iType;
58	+	fCutType       = iCutType;
59		fReader        = 0;
60		fReader        = new TMVA::Reader( "!Color:!Silent:Error" );
61		if (fType == kBaseline) {
62	<	fReader->AddSpectator( "npv"     , &fNPV    );
63	<	fReader->AddVariable( "jspt_1"   , &fJPt1   );
64	<	fReader->AddVariable( "jseta_1"  , &fJEta1  );
65	<	fReader->AddVariable( "jsphi_1"  , &fJPhi1  );
66	<	fReader->AddVariable( "jd0_1"    , &fJD01   );
67	<	fReader->AddVariable( "jdZ_1"    , &fJDZ1   );
68	<	fReader->AddVariable( "jm_1"     , &fJM1    );
69	<	fReader->AddVariable( "npart_1"  , &fNPart1 );
70	<	fReader->AddVariable( "lpt_1"    , &fLPt1   );
71	<	fReader->AddVariable( "leta_1"   , &fLEta1  );
72	<	fReader->AddVariable( "lphi_1"   , &fLPhi1  );
73	<	fReader->AddVariable( "spt_1"    , &fSPt1   );
74	<	fReader->AddVariable( "seta_1"   , &fSEta1  );
75	<	fReader->AddVariable( "sphi_1"   , &fSPhi1  );
76	<	fReader->AddVariable( "lnept_1"  , &fNEPt1  );
77	<	fReader->AddVariable( "lneeta_1" , &fNEEta1 );
85	<	fReader->AddVariable( "lnephi_1" , &fNEPhi1 );
86	<	fReader->AddVariable( "lempt_1"  , &fEMPt1  );
87	<	fReader->AddVariable( "lemeta_1" , &fEMEta1 );
88	<	fReader->AddVariable( "lemphi_1" , &fEMPhi1 );
89	<	fReader->AddVariable( "lchpt_1"  , &fChPt1  );
90	<	fReader->AddVariable( "lchphi_1" , &fChPhi1 );
91	<	fReader->AddVariable( "lLfr_1"   , &fLFr1   );
92	<	fReader->AddVariable( "drlc_1"   , &fDRLC1  );
93	<	fReader->AddVariable( "drls_1"   , &fDRLS1  );
94	<	fReader->AddVariable( "drm_1"    , &fDRM1   );
95	<	fReader->AddVariable( "drmne_1"  , &fDRNE1  );
96	<	fReader->AddVariable( "drem_1"   , &fDREM1  );
97	<	fReader->AddVariable( "drch_1"   , &fDRCH1  );
62	>	fReader->AddVariable( "nvtx"     , &fNVtx      );
63	>	fReader->AddVariable( "jetPt"    , &fJPt1      );
64	>	fReader->AddVariable( "jetEta"   , &fJEta1     );
65	>	fReader->AddVariable( "jetPhi"   , &fJPhi1     );
66	>	fReader->AddVariable( "dZ"       , &fJDZ1      );
67	>	fReader->AddVariable( "d0"       , &fJD01      );
68	>	fReader->AddVariable( "beta"     , &fBeta      );
69	>	fReader->AddVariable( "betaStar" , &fBetaStar  );
70	>	fReader->AddVariable( "nCharged" , &fNCharged  );
71	>	fReader->AddVariable( "nNeutrals", &fNNeutrals );
72	>	fReader->AddVariable( "dRMean"   , &fDRMean    );
73	>	fReader->AddVariable( "frac01"   , &fFrac01    );
74	>	fReader->AddVariable( "frac02"   , &fFrac02    );
75	>	fReader->AddVariable( "frac03"   , &fFrac03    );
76	>	fReader->AddVariable( "frac04"   , &fFrac04    );
77	>	fReader->AddVariable( "frac05"   , &fFrac05    );
78		}
79	<	fReader->BookMVA(fMethodName , iWeights );
79	>	fReader->BookMVA(fLowPtMethodName  , iLowPtWeights );
80	>	fReader->BookMVA(fHighPtMethodName , iHighPtWeights );
81		std::cout << "Jet ID MVA Initialization\n";
82	<	std::cout << "MethodName : " << fMethodName << " , type == " << fType << std::endl;
82	>	std::cout << "MethodName : " << fLowPtMethodName << " , type == " << fType << std::endl;
83	>
84	>	//Load Cut Matrix
85	>	edm::ParameterSet lConfig = edm::readPSetsFrom(iCutFileName.Data())->getParameter<edm::ParameterSet>("JetIdParams");
86	>	std::string lCutType = "Tight";
87	>	if(fCutType == kMedium) lCutType = "Medium";
88	>	if(fCutType == kLoose ) lCutType = "Loose";
89	>	std::vector<double> lPt010  = lConfig.getParameter<std::vector<double> >(("Pt010_" +lCutType).c_str());
90	>	std::vector<double> lPt1020 = lConfig.getParameter<std::vector<double> >(("Pt1020_"+lCutType).c_str());
91	>	std::vector<double> lPt2030 = lConfig.getParameter<std::vector<double> >(("Pt2030_"+lCutType).c_str());
92	>	std::vector<double> lPt3050 = lConfig.getParameter<std::vector<double> >(("Pt3050_"+lCutType).c_str());
93	>	for(int i0 = 0; i0 < 4; i0++) fMVACut[0][i0] = lPt010 [i0];
94	>	for(int i0 = 0; i0 < 4; i0++) fMVACut[1][i0] = lPt1020[i0];
95	>	for(int i0 = 0; i0 < 4; i0++) fMVACut[2][i0] = lPt2030[i0];
96	>	for(int i0 = 0; i0 < 4; i0++) fMVACut[3][i0] = lPt3050[i0];
97		}
98
99		//--------------------------------------------------------------------------------------------------
#	Line 109 | Line 104 | Double_t JetIDMVA::MVAValue(
104		Float_t iJPhi1  ,
105		Float_t iJD01   ,
106		Float_t iJDZ1   ,
107	<	Float_t iJM1    ,
108	<	Float_t iNPart1 ,
109	<	Float_t iLPt1   ,
110	<	Float_t iLEta1  ,
111	<	Float_t iLPhi1  ,
112	<	Float_t iSPt1   ,
113	<	Float_t iSEta1  ,
114	<	Float_t iSPhi1  ,
115	<	Float_t iNEPt1  ,
116	<	Float_t iNEEta1 ,
122	<	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
107	>	Float_t iBeta   ,
108	>	Float_t iBetaStar,
109	>	Float_t iNCharged,
110	>	Float_t iNNeutrals,
111	>	Float_t iDRMean  ,
112	>	Float_t iFrac01  ,
113	>	Float_t iFrac02  ,
114	>	Float_t iFrac03  ,
115	>	Float_t iFrac04  ,
116	>	Float_t iFrac05
117		){
118
119	<	if (!fIsInitialized) {
119	>	if(!fIsInitialized) {
120		std::cout << "Error: JetIDMVA not properly initialized.\n";
121		return -9999;
122		}
123
124	<	fNPV    = iNPV;
125	<	fJPt1   = iJPt1;
126	<	fJEta1  = iJEta1;
127	<	fJPhi1  = fJPhi1;
128	<	fJD01   = iJD01;
129	<	fJDZ1   = iJDZ1;
130	<	fJM1    = iJM1 ;
131	<	fNPart1 = iNPart1;
132	<	fLPt1   = iLPt1;
133	<	fLEta1  = iLEta1;
134	<	fLPhi1  = iLPhi1;
135	<	fSPt1   = iSPt1;
136	<	fSEta1  = iSEta1;
137	<	fSPhi1  = iSPhi1;
138	<	fNEPt1  = iNEPt1;
139	<	fNEEta1 = iNEEta1;
158	<	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;
124	>	fNVtx      = iNPV;
125	>	fJPt1      = iJPt1;
126	>	fJEta1     = iJEta1;
127	>	fJPhi1     = fJPhi1;
128	>	fJD01      = iJD01;
129	>	fJDZ1      = iJDZ1;
130	>	fBeta      = iBeta;
131	>	fBetaStar  = iBetaStar;
132	>	fNCharged  = iNCharged;
133	>	fNNeutrals = iNNeutrals;
134	>	fDRMean    = iDRMean;
135	>	fFrac01    = iFrac01;
136	>	fFrac02    = iFrac02;
137	>	fFrac03    = iFrac03;
138	>	fFrac04    = iFrac04;
139	>	fFrac05    = iFrac05;
140
141		Double_t lMVA = -9999;
142	<	lMVA = fReader->EvaluateMVA( fMethodName );
142	>	if(iJPt1 < 10) lMVA = fReader->EvaluateMVA( fLowPtMethodName  );
143	>	if(iJPt1 > 10) lMVA = fReader->EvaluateMVA( fHighPtMethodName );
144
145		return lMVA;
146		}
147		//--------------------------------------------------------------------------------------------------
148	<	Bool_t JetIDMVA::pass(const PFJet *iJet,const Vertex *iVertex,
148	>	Bool_t JetIDMVA::pass(const PFJet *iJet,const Vertex *iVertex,const VertexCol *iVertices,
149		FactorizedJetCorrector *iJetCorrector,
150		const PileupEnergyDensityCol *iPileupEnergyDensity) {
151	+
152		if(!JetTools::passPFLooseId(iJet))                 return false;
153	<	if(correctedPt(iJet,iJetCorrector,iPileupEnergyDensity) < fJetPtMin && iJet->TrackCountingHighEffBJetTagsDisc() == -100) return false; //This line is a bug in the Met training
154	<	if( fabs(JetTools::impactParameter(iJet,iVertex,true)) < 0.2) return true;
155	<	double lMVA = MVAValue(iJet,iVertex,iJetCorrector,iPileupEnergyDensity);
156	<	if(lMVA < -0.8)                            return false;
157	<	if(lMVA < -0.5 && fabs(iJet->Eta()) > 3.0) return false;
153	>	if(iJet->Pt() < fJetPtMin)                         return false;
154	>	if(iJet->Pt() > 50)                                return true; //==> we can raise this
155	>	if(fabs(iJet->Eta()) > 4.99)                       return false;//Castor
156	>
157	>	double lMVA = MVAValue   (iJet,iVertex,iVertices,iJetCorrector,iPileupEnergyDensity);
158	>	double lPt  = correctedPt(iJet,                  iJetCorrector,iPileupEnergyDensity);
159	>
160	>	int lPtId = 0;
161	>	if(lPt > 10 && iJet->Pt() < 20) lPtId = 1;
162	>	if(lPt > 20 && iJet->Pt() < 30) lPtId = 2;
163	>	if(lPt > 30                   ) lPtId = 3;
164	>
165	>	int lEtaId = 0;
166	>	if(fabs(iJet->Eta()) > 2.5  && fabs(iJet->Eta()) < 2.75) lEtaId = 1;
167	>	if(fabs(iJet->Eta()) > 2.75 && fabs(iJet->Eta()) < 3.0 ) lEtaId = 2;
168	>	if(fabs(iJet->Eta()) > 3.0  && fabs(iJet->Eta()) < 5.0 ) lEtaId = 3;
169	>
170	>	double lMVACut = fMVACut[lPtId][lEtaId];
171	>	if(lMVA < lMVACut) return false;
172		return true;
173	+	//if( fabs(JetTools::impactParameter(iJet,iVertex,true)) < 0.2) return true;
174	+	//if(correctedPt(iJet,iJetCorrector,iPileupEnergyDensity) < fJetPtMin && iJet->TrackCountingHighEffBJetTagsDisc() == -100) return false;
175	+	//This line is a bug in the Met training
176	+	//if(lMVA < -0.8)                            return false;
177	+	//if(lMVA < -0.5 && fabs(iJet->Eta()) > 3.0) return false;
178		}
179		//--------------------------------------------------------------------------------------------------
180	<	Bool_t JetIDMVA::pass(const PFJet *iJet,const Vertex *iVertex) {
180	>	Bool_t JetIDMVA::pass(const PFJet *iJet,const Vertex *iVertex,const VertexCol *iVertices) {
181		if(!JetTools::passPFLooseId(iJet))                 return false;
182	<	if(iJet->Pt() < fJetPtMin && iJet->TrackCountingHighEffBJetTagsDisc() == -100) return false; //This line is a bug in the Met training
183	<	if( fabs(JetTools::impactParameter(iJet,iVertex,true)) < 0.2) return true;
184	<	double lMVA = MVAValue(iJet,iVertex);
185	<	if(lMVA < -0.8)                            return false;
186	<	if(lMVA < -0.5 && fabs(iJet->Eta()) > 3.0) return false;
182	>	if(iJet->Pt() < fJetPtMin)                         return false;
183	>	if(iJet->Pt() > 50)                                return true; //==> we can raise this
184	>	if(fabs(iJet->Eta()) > 4.99)                       return false;//Castor
185	>
186	>	double lMVA = MVAValue(iJet,iVertex,iVertices);
187	>
188	>	int lPtId = 0;
189	>	if(iJet->Pt() > 10 && iJet->Pt() < 20) lPtId = 1;
190	>	if(iJet->Pt() > 20 && iJet->Pt() < 30) lPtId = 2;
191	>	if(iJet->Pt() > 30                   ) lPtId = 3;
192	>
193	>	int lEtaId = 0;
194	>	if(fabs(iJet->Eta()) > 2.5  && fabs(iJet->Eta()) < 2.75) lEtaId = 1;
195	>	if(fabs(iJet->Eta()) > 2.75 && fabs(iJet->Eta()) < 3.0 ) lEtaId = 2;
196	>	if(fabs(iJet->Eta()) > 3.0  && fabs(iJet->Eta()) < 5.0 ) lEtaId = 3;
197	>
198	>	double lMVACut = fMVACut[lPtId][lEtaId];
199	>	if(lMVA < lMVACut) return false;
200		return true;
201	+	//if(lMVA < -0.8)                            return false;
202	+	//if(lMVA < -0.5 && fabs(iJet->Eta()) > 3.0) return false;
203	+	//if(iJet->Pt() < fJetPtMin && iJet->TrackCountingHighEffBJetTagsDisc() == -100) return false; //This line is a bug in the Met training
204	+	//if( fabs(JetTools::impactParameter(iJet,iVertex,true)) < 0.2) return true;
205		}
206		//--------------------------------------------------------------------------------------------------
207	<	Double_t JetIDMVA::MVAValue(const PFJet *iJet,const Vertex *iVertex, //Vertex here is the PV
207	>	Double_t JetIDMVA::MVAValue(const PFJet *iJet,const Vertex *iVertex,const VertexCol *iVertices, //Vertex here is the PV
208		FactorizedJetCorrector *iJetCorrector,
209		const PileupEnergyDensityCol *iPileupEnergyDensity,
210		Bool_t printDebug) {
#	Line 209 | Line 216 | Double_t JetIDMVA::MVAValue(const PFJet
216		if(!JetTools::passPFLooseId(iJet)) return -2.;
217
218		//set all input variables
219	+	fNVtx      = iVertices->GetEntries();
220		fJPt1      = correctedPt(iJet,iJetCorrector,iPileupEnergyDensity);
221		fJEta1     = iJet->RawMom().Eta();
222		fJPhi1     = iJet->RawMom().Phi();
223	<	fJM1       = iJet->Mass();
224	<
225	<	const mithep::PFCandidate *lLead     = JetTools::leadCand(iJet,-1);
226	<	const mithep::PFCandidate *lSecond   = JetTools::leadCand(iJet,-1,true);
227	<	const mithep::PFCandidate *lLeadNeut = JetTools::leadCand(iJet ,5);
228	<	const mithep::PFCandidate *lLeadEm   = JetTools::leadCand(iJet ,4);
229	<	const mithep::PFCandidate *lLeadCh   = JetTools::leadCand(iJet ,1);
230	<
231	<	fJD01         = JetTools::impactParameter(iJet,iVertex);
232	<	fJDZ1         = JetTools::impactParameter(iJet,iVertex,true);
233	<	fNPart1       = iJet->NPFCands();
234	<	fLPt1         = lLead    ->Pt();
235	<	fLEta1        = lLead    ->Eta();
236	<	fLPhi1        = lLead    ->Phi();
237	<	fSPt1         = lSecond  ->Pt();
238	<	fSEta1        = lSecond  ->Eta();
239	<	fSPhi1        = lSecond  ->Phi();
232	<	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 );
223	>	fJD01      = JetTools::impactParameter(iJet,iVertex);
224	>	fJDZ1      = JetTools::impactParameter(iJet,iVertex,true);
225	>	fBeta      = JetTools::Beta(iJet,iVertex,fDZCut);
226	>	fBetaStar  = JetTools::betaStar(iJet,iVertex,iVertices,fDZCut);
227	>	fNCharged  = iJet->ChargedMultiplicity();
228	>	fNNeutrals = iJet->NeutralMultiplicity();
229	>
230	>	fDRMean    = JetTools::dRMean(iJet,-1);
231	>	fFrac01    = JetTools::frac  (iJet,0.1,0. ,-1);
232	>	fFrac02    = JetTools::frac  (iJet,0.2,0.1,-1);
233	>	fFrac03    = JetTools::frac  (iJet,0.3,0.2,-1);
234	>	fFrac04    = JetTools::frac  (iJet,0.4,0.3,-1);
235	>	fFrac05    = JetTools::frac  (iJet,0.5,0.4,-1);
236	>
237	>	double lMVA = 0;
238	>	if(fJPt1 < 10) lMVA = fReader->EvaluateMVA( fLowPtMethodName  );
239	>	if(fJPt1 > 10) lMVA = fReader->EvaluateMVA( fHighPtMethodName );
240
241		if (printDebug == kTRUE) {
242		std::cout << "Debug Jet MVA: "
243	<	<< fNPV    << " "
244	<	<< fJPt1   << " "
245	<	<< fJEta1  << " "
246	<	<< fJPhi1  << " "
247	<	<< fJD01   << " "
248	<	<< fJDZ1   << " "
249	<	<< fJM1    << " "
250	<	<< fNPart1 << " "
251	<	<< fLPt1   << " "
252	<	<< fLEta1  << " "
253	<	<< fLPhi1  << " "
254	<	<< fSPt1   << " "
255	<	<< fSEta1  << " "
256	<	<< fSPhi1  << " "
257	<	<< fNEPt1  << " "
258	<	<< fNEEta1 << " "
270	<	<< 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  << " "
243	>	<< fNVtx      << " "
244	>	<< fJPt1      << " "
245	>	<< fJEta1     << " "
246	>	<< fJPhi1     << " "
247	>	<< fJD01      << " "
248	>	<< fJDZ1      << " "
249	>	<< fBeta      << " "
250	>	<< fBetaStar  << " "
251	>	<< fNCharged  << " "
252	>	<< fNNeutrals << " "
253	>	<< fDRMean    << " "
254	>	<< fFrac01    << " "
255	>	<< fFrac02    << " "
256	>	<< fFrac03    << " "
257	>	<< fFrac04    << " "
258	>	<< fFrac05
259		<< " === : === "
260		<< lMVA << " "
261		<< std::endl;
#	Line 287 | Line 263 | Double_t JetIDMVA::MVAValue(const PFJet
263
264		return lMVA;
265		}
266	<	Double_t JetIDMVA::MVAValue(const PFJet *iJet,const Vertex *iVertex, //Vertex here is the PV
266	>	Double_t JetIDMVA::MVAValue(const PFJet *iJet,const Vertex *iVertex, const VertexCol *iVertices,//Vertex here is the PV
267		Bool_t printDebug) {
268
269		if (!fIsInitialized) {
#	Line 297 | Line 273 | Double_t JetIDMVA::MVAValue(const PFJet
273		if(!JetTools::passPFLooseId(iJet)) return -2.;
274
275		//set all input variables
276	+	fNVtx      = iVertices->GetEntries();
277		fJPt1      = iJet->Pt();
278		fJEta1     = iJet->RawMom().Eta();
279		fJPhi1     = iJet->RawMom().Phi();
280	<	fJM1       = iJet->Mass();
281	<
282	<	const mithep::PFCandidate *lLead     = JetTools::leadCand(iJet,-1);
283	<	const mithep::PFCandidate *lSecond   = JetTools::leadCand(iJet,-1,true);
284	<	const mithep::PFCandidate *lLeadNeut = JetTools::leadCand(iJet ,5);
285	<	const mithep::PFCandidate *lLeadEm   = JetTools::leadCand(iJet ,4);
286	<	const mithep::PFCandidate *lLeadCh   = JetTools::leadCand(iJet ,1);
287	<
288	<	fJD01         = JetTools::impactParameter(iJet,iVertex);
289	<	fJDZ1         = JetTools::impactParameter(iJet,iVertex,true);
290	<	fNPart1       = iJet->NPFCands();
291	<	fLPt1         = lLead    ->Pt();
292	<	fLEta1        = lLead    ->Eta();
293	<	fLPhi1        = lLead    ->Phi();
294	<	fSPt1         = lSecond  ->Pt();
295	<	fSEta1        = lSecond  ->Eta();
296	<	fSPhi1        = lSecond  ->Phi();
320	<	fNEPt1        = lLeadNeut->Pt();
321	<	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);
280	>	fJD01      = JetTools::impactParameter(iJet,iVertex);
281	>	fJDZ1      = JetTools::impactParameter(iJet,iVertex,true);
282	>	fBeta      = JetTools::Beta(iJet,iVertex,fDZCut);
283	>	fBetaStar  = JetTools::betaStar(iJet,iVertex,iVertices,fDZCut);
284	>	fNCharged  = iJet->ChargedMultiplicity();
285	>	fNNeutrals = iJet->NeutralMultiplicity();
286	>
287	>	fDRMean    = JetTools::dRMean(iJet,-1);
288	>	fFrac01    = JetTools::frac  (iJet,0.1,0. ,-1);
289	>	fFrac02    = JetTools::frac  (iJet,0.2,0.1,-1);
290	>	fFrac03    = JetTools::frac  (iJet,0.3,0.2,-1);
291	>	fFrac04    = JetTools::frac  (iJet,0.4,0.3,-1);
292	>	fFrac05    = JetTools::frac  (iJet,0.5,0.4,-1);
293	>
294	>	double lMVA = 0;
295	>	if(fJPt1 < 10) lMVA = fReader->EvaluateMVA( fLowPtMethodName  );
296	>	if(fJPt1 > 10) lMVA = fReader->EvaluateMVA( fHighPtMethodName );
297
338	–	double lMVA = fReader->EvaluateMVA( fMethodName );
339	–
298		if (printDebug == kTRUE) {
299		std::cout << "Debug Jet MVA: "
300	<	<< fNPV    << " "
301	<	<< fJPt1   << " "
302	<	<< fJEta1  << " "
303	<	<< fJPhi1  << " "
304	<	<< fJD01   << " "
305	<	<< fJDZ1   << " "
306	<	<< fJM1    << " "
307	<	<< fNPart1 << " "
308	<	<< fLPt1   << " "
309	<	<< fLEta1  << " "
310	<	<< fLPhi1  << " "
311	<	<< fSPt1   << " "
312	<	<< fSEta1  << " "
313	<	<< fSPhi1  << " "
314	<	<< fNEPt1  << " "
315	<	<< fNEEta1 << " "
358	<	<< 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  << " "
300	>	<< fNVtx      << " "
301	>	<< fJPt1      << " "
302	>	<< fJEta1     << " "
303	>	<< fJPhi1     << " "
304	>	<< fJD01      << " "
305	>	<< fJDZ1      << " "
306	>	<< fBeta      << " "
307	>	<< fBetaStar  << " "
308	>	<< fNCharged  << " "
309	>	<< fNNeutrals << " "
310	>	<< fDRMean    << " "
311	>	<< fFrac01    << " "
312	>	<< fFrac02    << " "
313	>	<< fFrac03    << " "
314	>	<< fFrac04    << " "
315	>	<< fFrac05
316		<< " === : === "
317		<< lMVA << " "
318		<< std::endl;

Diff Legend

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