ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing UserCode/MitPhysics/Utils/src/MVATools.cc (file contents):
Revision 1.3 by fabstoec, Tue Oct 18 11:27:19 2011 UTC vs.
Revision 1.15 by mingyang, Mon Jun 11 09:04:33 2012 UTC

#	Line 4 | Line 4
4		#include "MitPhysics/Utils/interface/MVATools.h"
5		#include "MitPhysics/Utils/interface/ElectronTools.h"
6		#include "MitPhysics/Utils/interface/IsolationTools.h"
7	+	#include "MitAna/DataTree/interface/PFCandidateCol.h"
8		#include "MitAna/DataTree/interface/StableData.h"
9	+	#include <TMath.h>
10		#include <TFile.h>
11		#include <TRandom3.h>
12		#include "TMVA/Tools.h"//MVA
13		#include "TMVA/Reader.h"//MVA
14
15	+
16		ClassImp(mithep::MVATools)
17
18		using namespace mithep;
#	Line 20 | Line 23 | MVATools::MVATools():
23		fReaderEndcap(0),
24		fReaderBarrel(0),
25
26	<	//MVA variables 0
26	>	//MVA Variables v4
27		HoE(0),
28		covIEtaIEta(0),
29	<	tIso1(0),
30	<	tIso3(0),
31	<	tIso2(0),
29	>	tIso1abs(0),
30	>	tIso3abs(0),
31	>	tIso2abs(0),
32		R9(0),
33
34	<	//MVA variables 1
35	<	RelIsoEcal(0),
33	<	RelIsoHcal(0),
34	<
34	>	absIsoEcal(0),
35	>	absIsoHcal(0),
36		RelEMax(0),
37		RelETop(0),
38		RelEBottom(0),
#	Line 44 | Line 45 | MVATools::MVATools():
45		RelE2x5Right(0),
46		RelE5x5(0),
47
47	–	//MVA variables 2
48		EtaWidth(0),
49		PhiWidth(0),
50	<	CoviEtaiPhi(0),
50	>	CoviEtaiPhi(0),
51		CoviPhiiPhi(0),
52	–	RelPreshowerEnergy(0)
52
53	+	NVertexes(0),
54	+	RelPreshowerEnergy(0),
55	+
56	+	//MVA v2 and v1
57	+	RelIsoEcal(0),
58	+	RelIsoHcal(0),
59	+	tIso1(0),
60	+	tIso3(0),
61	+	tIso2(0),
62	+	ScEta(0.)
63		{
64		// Constructor.
65		}
#	Line 69 | Line 78 | void MVATools::InitializeMVA(int Variabl
78		readers[1]  = fReaderBarrel;
79
80		for (UInt_t i=0; i<2; ++i) {
81	<
81	>
82		if(VariableType==0||VariableType==1||VariableType==2){
83		readers[i]->AddVariable( "HoE", &HoE );
84		readers[i]->AddVariable( "covIEtaIEta", &covIEtaIEta );
#	Line 79 | Line 88 | void MVATools::InitializeMVA(int Variabl
88		readers[i]->AddVariable( "R9", &R9 );
89		}
90
91	+	if(VariableType==3||VariableType==4){
92	+	readers[i]->AddVariable( "HoE", &HoE );
93	+	readers[i]->AddVariable( "covIEtaIEta", &covIEtaIEta );
94	+	readers[i]->AddVariable( "tIso1abs", &tIso1abs );
95	+	readers[i]->AddVariable( "tIso3abs", &tIso3abs );
96	+	readers[i]->AddVariable( "tIso2abs", &tIso2abs );
97	+	readers[i]->AddVariable( "R9", &R9 );
98	+	}
99	+
100		if(VariableType==1||VariableType==2){
101	<	readers[i]->AddVariable( "RelIsoEcal", &RelIsoEcal);
102	<	readers[i]->AddVariable( "RelIsoHcal", &RelIsoHcal);
103	<	readers[i]->AddVariable( "RelEMax", &RelEMax);
104	<	readers[i]->AddVariable( "RelETop",&RelETop);
105	<	readers[i]->AddVariable( "RelEBottom", &RelEBottom);
101	>	readers[i]->AddVariable( "RelIsoEcal", &RelIsoEcal );
102	>	readers[i]->AddVariable( "RelIsoHcal", &RelIsoHcal );
103	>	readers[i]->AddVariable( "RelEMax", &RelEMax );
104	>	readers[i]->AddVariable( "RelETop", &RelETop );
105	>	readers[i]->AddVariable( "RelEBottom", &RelEBottom );
106	>	readers[i]->AddVariable( "RelELeft", &RelELeft );
107	>	readers[i]->AddVariable( "RelERight", &RelERight );
108	>	readers[i]->AddVariable( "RelE2x5Max", &RelE2x5Max );
109	>	readers[i]->AddVariable( "RelE2x5Top", &RelE2x5Top );
110	>	readers[i]->AddVariable( "RelE2x5Bottom", &RelE2x5Bottom );
111	>	readers[i]->AddVariable( "RelE2x5Left", &RelE2x5Left );
112	>	readers[i]->AddVariable( "RelE2x5Right", &RelE2x5Right );
113	>	readers[i]->AddVariable( "RelE5x5", &RelE5x5 );
114	>	}
115	>
116	>	if(VariableType==3||VariableType==4){
117	>	readers[i]->AddVariable( "absIsoEcal", &absIsoEcal );
118	>	readers[i]->AddVariable( "absIsoHcal", &absIsoHcal );
119	>	readers[i]->AddVariable( "RelEMax", &RelEMax );
120	>	readers[i]->AddVariable( "RelETop", &RelEBottom);
121	>	readers[i]->AddVariable( "RelEBottom", &RelEBottom );
122		readers[i]->AddVariable( "RelELeft", &RelELeft );
123	<	readers[i]->AddVariable( "RelERight", &RelERight);
123	>	readers[i]->AddVariable( "RelERight", &RelERight );
124		readers[i]->AddVariable( "RelE2x5Max", &RelE2x5Max );
125		readers[i]->AddVariable( "RelE2x5Top", &RelE2x5Top );
126		readers[i]->AddVariable( "RelE2x5Bottom", &RelE2x5Bottom );
#	Line 95 | Line 129 | void MVATools::InitializeMVA(int Variabl
129		readers[i]->AddVariable( "RelE5x5", &RelE5x5 );
130		}
131
132	<	if(VariableType==2){
132	>	if(VariableType==2||VariableType==3||VariableType==4){
133		readers[i]->AddVariable( "EtaWidth", &EtaWidth );
134		readers[i]->AddVariable( "PhiWidth", &PhiWidth );
135		readers[i]->AddVariable( "CoviEtaiPhi", &CoviEtaiPhi );
136		readers[i]->AddVariable( "CoviPhiiPhi", &CoviPhiiPhi );
137	+	if(VariableType==4){
138	+	readers[i]->AddVariable( "NVertexes", &NVertexes );
139	+	}
140		if(i==0){
141		readers[i]->AddVariable( "RelPreshowerEnergy", &RelPreshowerEnergy );
142		}
143		}
144	+
145	+	if(VariableType==6){
146	+	readers[i]->AddVariable( "HoE", &HoE );
147	+	readers[i]->AddVariable( "covIEtaIEta", &covIEtaIEta );
148	+	readers[i]->AddVariable( "tIso1abs", &tIso1abs );
149	+	readers[i]->AddVariable( "tIso3abs", &tIso3abs );
150	+	readers[i]->AddVariable( "tIso2abs", &tIso2abs );
151	+	readers[i]->AddVariable( "R9", &R9 );
152	+	readers[i]->AddVariable( "absIsoEcal", &absIsoEcal );
153	+	readers[i]->AddVariable( "absIsoHcal", &absIsoHcal );
154	+	readers[i]->AddVariable( "RelE5x5", &RelE5x5 );
155	+	readers[i]->AddVariable( "EtaWidth", &EtaWidth );
156	+	readers[i]->AddVariable( "PhiWidth", &PhiWidth );
157	+	readers[i]->AddVariable( "CoviEtaiPhi", &CoviEtaiPhi );
158	+	readers[i]->AddVariable( "CoviPhiiPhi", &CoviPhiiPhi );
159	+	readers[i]->AddVariable( "NVertexes", &NVertexes );
160	+	if(i==0){
161	+	readers[i]->AddVariable( "RelPreshowerEnergy", &RelPreshowerEnergy );
162	+	}
163	+	}
164	+
165	+	if(VariableType==7){
166	+	readers[i]->AddVariable( "HoE", &HoE );
167	+	readers[i]->AddVariable( "covIEtaIEta", &covIEtaIEta );
168	+	readers[i]->AddVariable( "tIso1abs", &tIso1abs );
169	+	readers[i]->AddVariable( "tIso3abs", &tIso3abs );
170	+	readers[i]->AddVariable( "tIso2abs", &tIso2abs );
171	+	readers[i]->AddVariable( "R9", &R9 );
172	+	readers[i]->AddVariable( "absIsoEcal", &absIsoEcal );
173	+	readers[i]->AddVariable( "absIsoHcal", &absIsoHcal );
174	+	readers[i]->AddVariable( "NVertexes", &NVertexes );
175	+	readers[i]->AddVariable( "ScEta", &ScEta );
176	+	}
177	+
178	+	if(VariableType==10){
179	+	readers[i]->AddVariable( "HoE", &HoE );
180	+	readers[i]->AddVariable( "covIEtaIEta", &covIEtaIEta );
181	+	readers[i]->AddVariable( "tIso1abs", &tIso1abs );
182	+	readers[i]->AddVariable( "tIso3abs", &tIso3abs );
183	+	readers[i]->AddVariable( "tIso2abs", &tIso2abs );
184	+	readers[i]->AddVariable( "R9", &R9 );
185	+	readers[i]->AddVariable( "absIsoEcal", &absIsoEcal );
186	+	readers[i]->AddVariable( "absIsoHcal", &absIsoHcal );
187	+	readers[i]->AddVariable( "NVertexes", &NVertexes );
188	+	readers[i]->AddVariable( "ScEta", &ScEta );
189	+	readers[i]->AddVariable( "EtaWidth", &EtaWidth );
190	+	readers[i]->AddVariable( "PhiWidth", &PhiWidth );
191	+	}
192	+
193	+	if(VariableType==1201){
194	+	/*readers[i]->AddVariable( "myphoton_pfchargedisogood03", &myphoton_pfchargedisogood03);
195	+	readers[i]->AddVariable( "myphoton_pfchargedisobad03", &myphoton_pfchargedisobad03);
196	+	readers[i]->AddVariable( "myphoton_pfphotoniso03", &myphoton_pfphotoniso03 );
197	+	readers[i]->AddVariable( "myphoton_sieie", &myphoton_sieie );
198	+	readers[i]->AddVariable( "myphoton_sieip", &myphoton_sieip );
199	+	readers[i]->AddVariable( "myphoton_etawidth", &myphoton_etawidth );
200	+	readers[i]->AddVariable( "myphoton_phiwidth", &myphoton_phiwidth );
201	+	readers[i]->AddVariable( "myphoton_r9", &myphoton_r9 );
202	+	readers[i]->AddVariable( "myphoton_s4ratio", &myphoton_s4ratio );
203	+	readers[i]->AddVariable( "myphoton_SCeta", &myphoton_SCeta );
204	+	readers[i]->AddVariable( "event_rho", &event_rho );
205	+	if(i==0){
206	+	readers[i]->AddVariable( "myphoton_ESEffSigmaRR", &myphoton_ESEffSigmaRR);
207	+	}*/
208	+	readers[i]->AddVariable( "ph.r9", &myphoton_r9 );
209	+	readers[i]->AddVariable( "ph.sigietaieta", &myphoton_sieie );
210	+	readers[i]->AddVariable( "ph.scetawidth", &myphoton_etawidth );
211	+	readers[i]->AddVariable( "ph.scphiwidth", &myphoton_phiwidth );
212	+	readers[i]->AddVariable( "ph.idmva_CoviEtaiPhi", &myphoton_sieip );
213	+	readers[i]->AddVariable( "ph.idmva_s4ratio", &myphoton_s4ratio );
214	+	readers[i]->AddVariable( "ph.idmva_GammaIso", &myphoton_pfphotoniso03 );
215	+	readers[i]->AddVariable( "ph.idmva_ChargedIso_selvtx", &myphoton_pfchargedisogood03);
216	+	readers[i]->AddVariable( "ph.idmva_ChargedIso_worstvtx", &myphoton_pfchargedisobad03);
217	+	readers[i]->AddVariable( "ph.sceta", &myphoton_SCeta );
218	+	readers[i]->AddVariable( "rho", &event_rho );
219	+	if(i==0){
220	+	readers[i]->AddVariable( "1.00023*ph.idmva_PsEffWidthSigmaRR + 0.0913", &myphoton_ESEffSigmaRR);
221	+	}
222	+	}
223	+
224		}
225
226		fReaderEndcap->BookMVA("BDT method",EndcapWeights);
227		fReaderBarrel->BookMVA("BDT method",BarrelWeights);
228	<
228	>
229		assert(fReaderEndcap);
230		assert(fReaderBarrel);
231
232		}
233
234	<	//--------------------------------------------------------------------------------------------------
234	>	Bool_t MVATools::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, Bool_t applyElectronVeto) {
235	>
236	>	//initilize the bool value
237	>	PassMVA=kFALSE;
238	>
239	>	Float_t photon_bdt =  MVATools::GetMVAbdtValue_2011(p,vtx,trackCol,vtxCol, _tRho, els, applyElectronVeto);
240	>
241	>	if (isbarrel) {
242	>	if(bdt>bdtCutBarrel){
243	>	PassMVA=kTRUE;
244	>	}
245	>	}
246	>	else {
247	>	if(bdt>bdtCutEndcap){
248	>	PassMVA=kTRUE;
249	>	}
250	>	}
251	>	return PassMVA;
252	>	}
253
254	<	Bool_t MVATools::PassMVASelection(const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho,const ElectronCol* els,double MVAPtMin, Float_t bdtCutBarrel, Float_t bdtCutEndcap, Bool_t applyEleVeto) {
254	>	//---------------------------------------------------------------------------------
255	>	Int_t MVATools::PassElectronVetoInt(const Photon* p, const ElectronCol* els) {
256
257		// these values are taken from the H2GGlobe code... (actually from Marco/s mail)
258		float cic4_allcuts_temp_sublead[] = {
#	Line 129 | Line 265 | Bool_t MVATools::PassMVASelection(const
265		1.,          0.062,       0.97,        0.97,
266		1.5,         1.5,         1.5,         1.5 };  // the last line is PixelmatchVeto and un-used
267
132	–
268		//initilize the bool value
269	<	PassMVA=kFALSE;
270	<	PassElecVeto=kFALSE;
271	<	//Bool_t PassElecVeto=PhotonTools::PassElectronVeto(p,els);
269	>	PassElecVetoInt=0;
270	>
271	>	dRTrack = PhotonTools::ElectronVetoCiC(p, els);
272	>
273	>	ScEta_MVA=p->SCluster()->Eta();
274	>
275	>	isbarrel = (fabs(ScEta_MVA)<1.4442);
276	>
277	>	R9 = p->R9();
278	>	//R9 = p->E33()/p->SCluster()->RawEnergy();
279	>
280	>	// check which category it is ...
281	>	_tCat = 1;
282	>	if ( !isbarrel ) _tCat = 3;
283	>	if ( R9 < 0.94 ) _tCat++;
284
285	+	//Electron Veto
286	+	if(dRTrack > cic4_allcuts_temp_sublead[_tCat-1+6*4]){
287	+	PassElecVetoInt=1;
288	+	}
289	+
290	+	return  PassElecVetoInt;
291	+
292	+	}
293	+
294	+	//--------------------------------------------------------------------------------------------------
295	+
296	+	Float_t MVATools::GetMVAbdtValue_2012_globe(const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho, const PFCandidateCol *fPFCands,const ElectronCol* els,Bool_t applyElectronVeto) {
297
298		//get the variables used to compute MVA variables
299		ecalIso3 = p->EcalRecHitIsoDr03();
#	Line 143 | Line 302 | Bool_t MVATools::PassMVASelection(const
302
303		wVtxInd = 0;
304
305	<	trackIso1 = IsolationTools::CiCTrackIsolation(p,vtx, 0.3, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, NULL, NULL, (!applyEleVeto ? els : NULL) );//Question Ming:whyfPV->At(0) instead of selected vertex using ranking method?
306	<
148	<	// track iso only
149	<	trackIso3 = IsolationTools::CiCTrackIsolation(p,vtx, 0.3, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, NULL, NULL, (!applyEleVeto ? els : NULL));
150	<
305	>	trackIso1 = IsolationTools::CiCTrackIsolation(p,vtx, 0.3, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, NULL, NULL, (!applyElectronVeto ? els : NULL) );//Question Ming:whyfPV->At(0) instead of selected vertex using ranking method?
306	>
307		// track iso worst vtx
308	<	trackIso2 = IsolationTools::CiCTrackIsolation(p,vtx, 0.4, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, &wVtxInd,vtxCol, (!applyEleVeto ? els : NULL));
308	>	trackIso2 = IsolationTools::CiCTrackIsolation(p,vtx, 0.4, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, &wVtxInd,vtxCol, (!applyElectronVeto ? els : NULL) );
309
310		combIso1 = ecalIso3+hcalIso4+trackIso1 - 0.17*_tRho;
311		combIso2 = ecalIso4+hcalIso4+trackIso2 - 0.52*_tRho;
312
313		RawEnergy = p->SCluster()->RawEnergy();
314
315	<	dRTrack = PhotonTools::ElectronVetoCiC(p, els);
315	>	ScEta = p->SCluster()->Eta();
316
317	<	//compute MVA variables 0
162	<	HoE = p->HadOverEm();
163	<	covIEtaIEta = p->CoviEtaiEta();
317	>	//mva varialbes v1 and v2
318		tIso1 = (combIso1) *50./p->Et();
319	<	tIso3 = (trackIso3)*50./p->Et();
319	>	tIso3 = (trackIso1)*50./p->Et();
320		tIso2 = (combIso2) *50./(p->MomVtx(vtxCol->At(wVtxInd)->Position()).Pt());
167	–	R9 = p->R9();
168	–
169	–	//newly added MVA variables 1
321		RelIsoEcal=(ecalIso3-0.17*_tRho)/p->Et();
322		RelIsoHcal=(hcalIso4-0.17*_tRho)/p->Et();
323	<
323	>
324	>	//compute mva variables for v3
325	>	HoE = p->HadOverEm();
326	>	covIEtaIEta = p->CoviEtaiEta();
327	>	tIso1abs = combIso1;
328	>	tIso3abs = trackIso1;
329	>	tIso2abs = combIso2;
330	>	R9 = p->R9();
331	>
332	>	absIsoEcal=(ecalIso3-0.17*_tRho);
333	>	absIsoHcal=(hcalIso4-0.17*_tRho);
334		RelEMax=p->SCluster()->Seed()->EMax()/RawEnergy;
335		RelETop=p->SCluster()->Seed()->ETop()/RawEnergy;
336		RelEBottom=p->SCluster()->Seed()->EBottom()/RawEnergy;
#	Line 182 | Line 343 | Bool_t MVATools::PassMVASelection(const
343		RelE2x5Right=p->SCluster()->Seed()->E2x5Right()/RawEnergy;
344		RelE5x5=p->SCluster()->Seed()->E5x5()/RawEnergy;
345
346	<	//newly added MVA variables 2
347	<	EtaWidth=p->SCluster()->EtaWidth();
187	<	PhiWidth=p->SCluster()->PhiWidth();
346	>	EtaWidth=p->EtaWidth();
347	>	PhiWidth=p->PhiWidth();
348		CoviEtaiPhi=p->SCluster()->Seed()->CoviEtaiPhi();
349		CoviPhiiPhi=p->SCluster()->Seed()->CoviPhiiPhi();
350	+
351		RelPreshowerEnergy=p->SCluster()->PreshowerEnergy()/RawEnergy;
352	+	NVertexes=vtxCol->GetEntries();
353
354		//spectator variables
355		Pt_MVA=p->Pt();
356		ScEta_MVA=p->SCluster()->Eta();
357	<
357	>
358	>	//
359	>
360		isbarrel = (fabs(ScEta_MVA)<1.4442);
361
362	<	// check which category it is ...
363	<	_tCat = 1;
364	<	if ( !isbarrel ) _tCat = 3;
365	<	if ( R9 < 0.94 ) _tCat++;
366	<
367	<	//Electron Veto (made electron Veto optinal (Fabian) )
368	<	if(dRTrack > cic4_allcuts_temp_sublead[_tCat-1+6*4] || !applyEleVeto ){
369	<	PassElecVeto=kTRUE;
370	<	}
371	<
372	<	if(PassElecVeto && Pt_MVA>MVAPtMin && ((fabs(ScEta_MVA)<1.4442)||(fabs(ScEta_MVA)>1.566 && fabs(ScEta_MVA)<2.5)) && tIso1<250 && tIso2<250 && tIso3<250){
373	<
210	<	if (isbarrel) {
211	<	reader = fReaderBarrel;
212	<	}
213	<	else {
214	<	reader = fReaderEndcap;
215	<	}
216	<
217	<	bdt = reader->EvaluateMVA( "BDT method" );
218	<
219	<	if (isbarrel) {
220	<	if(bdt>bdtCutBarrel){
221	<	PassMVA=kTRUE;
222	<	}
223	<	}
224	<	else {
225	<	if(bdt>bdtCutEndcap){
226	<	PassMVA=kTRUE;
227	<	}
228	<	}
362	>	//variable 1201
363	>	myphoton_pfchargedisogood03=IsolationTools::PFChargedIsolation(p,vtx,0.3,0,fPFCands);
364	>	myphoton_pfchargedisobad03=IsolationTools::PFChargedIsolation(p,vtx,0.3,0,fPFCands,&wVtxInd,vtxCol);
365	>	myphoton_pfphotoniso03=IsolationTools::PFGammaIsolation(p,0.3,0,fPFCands);
366	>	myphoton_sieie=covIEtaIEta;
367	>	myphoton_sieip=CoviEtaiPhi;
368	>	myphoton_etawidth=EtaWidth;
369	>	myphoton_phiwidth=PhiWidth;
370	>	myphoton_r9=R9;
371	>	myphoton_s4ratio=p->S4Ratio();
372	>	myphoton_SCeta=ScEta_MVA;
373	>	event_rho= _tRho;
374
375	<	}
231	<
232	<	return PassMVA;
233	<	}
375	>	myphoton_ESEffSigmaRR=-99;
376
377	<	//---------------------------------------------------------------------------------
378	<	Int_t MVATools::PassElectronVetoInt(const Photon* p, const ElectronCol* els) {
379	<
238	<	// these values are taken from the H2GGlobe code... (actually from Marco/s mail)
239	<	float cic4_allcuts_temp_sublead[] = {
240	<	3.8,         2.2,         1.77,        1.29,
241	<	11.7,        3.4,         3.9,         1.84,
242	<	3.5,         2.2,         2.3,         1.45,
243	<	0.0106,      0.0097,      0.028,       0.027,
244	<	0.082,       0.062,       0.065,       0.048,
245	<	0.94,        0.36,        0.94,        0.32,
246	<	1.,          0.062,       0.97,        0.97,
247	<	1.5,         1.5,         1.5,         1.5 };  // the last line is PixelmatchVeto and un-used
248	<
249	<	//initilize the bool value
250	<	PassElecVetoInt=0;
251	<
252	<	dRTrack = PhotonTools::ElectronVetoCiC(p, els);
377	>	if(!isbarrel){
378	>	myphoton_ESEffSigmaRR=p->EffSigmaRR();
379	>	}
380
381	<	ScEta_MVA=p->SCluster()->Eta();
381	>	if (isbarrel) {
382	>	reader = fReaderBarrel;
383	>	}
384	>	else {
385	>	reader = fReaderEndcap;
386	>	}
387
388	<	isbarrel = (fabs(ScEta_MVA)<1.4442);
388	>	assert(reader);
389
390	<	R9 = p->R9();
390	>	bdt = reader->EvaluateMVA("BDT method");
391	>
392	>	/* printf("HoE: %f\n",HoE);
393	>	printf("covIEtaIEta: %f\n",covIEtaIEta);
394	>	printf("tIso1abs: %f\n",tIso1abs);
395	>	printf("tIso3abs: %f\n",tIso3abs);
396	>	printf("tIso2abs: %f\n",tIso2abs);
397
398	<	// check which category it is ...
399	<	_tCat = 1;
400	<	if ( !isbarrel ) _tCat = 3;
401	<	if ( R9 < 0.94 ) _tCat++;
398	>	printf("absIsoEcal: %f\n",absIsoEcal);
399	>	printf("absIsoHcal: %f\n",absIsoHcal);
400	>	printf("RelEMax: %f\n",RelEMax);
401	>	printf("RelETop: %f\n",RelETop);
402	>	printf("RelEBottom: %f\n",RelEBottom);
403	>	printf("RelELeft: %f\n",RelELeft);
404	>	printf("RelERight: %f\n",RelERight);
405	>	printf("RelE2x5Max: %f\n",RelE2x5Max);
406	>	printf("RelE2x5Top: %f\n",RelE2x5Top);
407	>	printf("RelE2x5Bottom: %f\n",RelE2x5Bottom);
408	>	printf("RelE2x5Left: %f\n",RelE2x5Left);
409	>	printf("RelE2x5Right;: %f\n",RelE2x5Right);
410	>	printf("RelE5x5: %f\n",RelE5x5);
411
412	<	//Electron Veto
413	<	if(dRTrack > cic4_allcuts_temp_sublead[_tCat-1+6*4]){
414	<	PassElecVetoInt=1;
415	<	}
412	>	printf("EtaWidth: %f\n",EtaWidth);
413	>	printf("PhiWidth: %f\n",PhiWidth);
414	>	printf("CoviEtaiPhi: %f\n",CoviEtaiPhi);
415	>	printf("CoviPhiiPhi: %f\n",CoviPhiiPhi);
416
417	<	return  PassElecVetoInt;
417	>	if (!isbarrel) {
418	>	printf("RelPreshowerEnergy: %f\n",RelPreshowerEnergy);
419	>	}*/
420
421	+	return bdt;
422		}
423
424	<	//--------------------------------------------------------------------------------------------------
275	<
276	<	Float_t MVATools::GetMVAbdtValue(const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho,const ElectronCol* els) {
424	>	Float_t MVATools::GetMVAbdtValue_2011(const Photon* p,const Vertex* vtx,const TrackCol* trackCol,const VertexCol* vtxCol,Double_t _tRho,const ElectronCol* els,Bool_t applyElectronVeto) {
425
426		//get the variables used to compute MVA variables
427		ecalIso3 = p->EcalRecHitIsoDr03();
#	Line 282 | Line 430 | Float_t MVATools::GetMVAbdtValue(const P
430
431		wVtxInd = 0;
432
433	<	trackIso1 = IsolationTools::CiCTrackIsolation(p,vtx, 0.3, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol);//Question Ming:whyfPV->At(0) instead of selected vertex using ranking method?
434	<
287	<	// track iso only
288	<	trackIso3 = IsolationTools::CiCTrackIsolation(p,vtx, 0.3, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol);
289	<
433	>	trackIso1 = IsolationTools::CiCTrackIsolation(p,vtx, 0.3, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, NULL, NULL, (!applyElectronVeto ? els : NULL) );//Question Ming:whyfPV->At(0) instead of selected vertex using ranking method?
434	>
435		// track iso worst vtx
436	<	trackIso2 = IsolationTools::CiCTrackIsolation(p,vtx, 0.4, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, &wVtxInd,vtxCol);
436	>	trackIso2 = IsolationTools::CiCTrackIsolation(p,vtx, 0.4, 0.02, 0.0, 0.0, 0.1, 1.0, trackCol, &wVtxInd,vtxCol, (!applyElectronVeto ? els : NULL) );
437
438		combIso1 = ecalIso3+hcalIso4+trackIso1 - 0.17*_tRho;
439		combIso2 = ecalIso4+hcalIso4+trackIso2 - 0.52*_tRho;
440
441		RawEnergy = p->SCluster()->RawEnergy();
442
443	<	dRTrack = PhotonTools::ElectronVetoCiC(p, els);
443	>	ScEta = p->SCluster()->Eta();
444
445	<	//compute MVA variables 0
301	<	HoE = p->HadOverEm();
302	<	covIEtaIEta = p->CoviEtaiEta();
445	>	//mva varialbes v1 and v2
446		tIso1 = (combIso1) *50./p->Et();
447	<	tIso3 = (trackIso3)*50./p->Et();
447	>	tIso3 = (trackIso1)*50./p->Et();
448		tIso2 = (combIso2) *50./(p->MomVtx(vtxCol->At(wVtxInd)->Position()).Pt());
306	–	R9 = p->R9();
307	–
308	–	//newly added MVA variables 1
449		RelIsoEcal=(ecalIso3-0.17*_tRho)/p->Et();
450		RelIsoHcal=(hcalIso4-0.17*_tRho)/p->Et();
451	<
451	>
452	>	//compute mva variables for v3
453	>	HoE = p->HadOverEm();
454	>	covIEtaIEta = p->CoviEtaiEta();
455	>	tIso1abs = combIso1;
456	>	tIso3abs = trackIso1;
457	>	tIso2abs = combIso2;
458	>	R9 = p->R9();
459	>
460	>	absIsoEcal=(ecalIso3-0.17*_tRho);
461	>	absIsoHcal=(hcalIso4-0.17*_tRho);
462		RelEMax=p->SCluster()->Seed()->EMax()/RawEnergy;
463		RelETop=p->SCluster()->Seed()->ETop()/RawEnergy;
464		RelEBottom=p->SCluster()->Seed()->EBottom()/RawEnergy;
#	Line 321 | Line 471 | Float_t MVATools::GetMVAbdtValue(const P
471		RelE2x5Right=p->SCluster()->Seed()->E2x5Right()/RawEnergy;
472		RelE5x5=p->SCluster()->Seed()->E5x5()/RawEnergy;
473
474	<	//newly added MVA variables 2
475	<	EtaWidth=p->SCluster()->EtaWidth();
326	<	PhiWidth=p->SCluster()->PhiWidth();
474	>	EtaWidth=p->EtaWidth();
475	>	PhiWidth=p->PhiWidth();
476		CoviEtaiPhi=p->SCluster()->Seed()->CoviEtaiPhi();
477		CoviPhiiPhi=p->SCluster()->Seed()->CoviPhiiPhi();
478	+
479		RelPreshowerEnergy=p->SCluster()->PreshowerEnergy()/RawEnergy;
480	+	NVertexes=vtxCol->GetEntries();
481
482		//spectator variables
483		Pt_MVA=p->Pt();
484		ScEta_MVA=p->SCluster()->Eta();
485	<
485	>
486	>	//
487	>
488		isbarrel = (fabs(ScEta_MVA)<1.4442);
489
490		if (isbarrel) {
#	Line 345 | Line 498 | Float_t MVATools::GetMVAbdtValue(const P
498
499		bdt = reader->EvaluateMVA("BDT method");
500
501	<	/*  printf("HoE: %f\n",HoE);
501	>	/* printf("HoE: %f\n",HoE);
502		printf("covIEtaIEta: %f\n",covIEtaIEta);
503	<	printf("tIso1: %f\n",tIso1);
504	<	printf("tIso3: %f\n",tIso3);
505	<	printf("tIso2: %f\n",tIso2);
353	<	printf("tIso1: %f\n",tIso1);
354	<	printf("R9: %f\n",R9);
355	<	printf("RelIsoEcal: %f\n",RelIsoEcal);
356	<	printf("RelIsoHcal: %f\n",RelIsoHcal);
503	>	printf("tIso1abs: %f\n",tIso1abs);
504	>	printf("tIso3abs: %f\n",tIso3abs);
505	>	printf("tIso2abs: %f\n",tIso2abs);
506
507	+	printf("absIsoEcal: %f\n",absIsoEcal);
508	+	printf("absIsoHcal: %f\n",absIsoHcal);
509		printf("RelEMax: %f\n",RelEMax);
510		printf("RelETop: %f\n",RelETop);
511		printf("RelEBottom: %f\n",RelEBottom);
#	Line 372 | Line 523 | Float_t MVATools::GetMVAbdtValue(const P
523		printf("CoviEtaiPhi: %f\n",CoviEtaiPhi);
524		printf("CoviPhiiPhi: %f\n",CoviPhiiPhi);
525
526	<	if (isbarrel) {
526	>	if (!isbarrel) {
527		printf("RelPreshowerEnergy: %f\n",RelPreshowerEnergy);
528		}*/
529

Diff Legend

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