ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing UserCode/MitPhysics/Utils/src/MetTools.cc (file contents):
Revision 1.4 by mzanetti, Tue Apr 12 07:30:29 2011 UTC vs.
Revision 1.6 by ceballos, Mon Apr 25 21:24:53 2011 UTC

#	Line 70 | Line 70 | MetTools::MetTools(const ElectronCol *fE
70		for (UInt_t i=0; i<fPFCandidates->GetEntries(); ++i) {
71
72		// charged
73	<	if (fPFCandidates->At(i)->HasTrackerTrk()){
73	>	if (fPFCandidates->At(i)->HasTrackerTrk() || fPFCandidates->At(i)->HasGsfTrk()){
74		bool isElectronTrack = false;
75		for (UInt_t m = 0; m < fElectrons->GetEntries(); ++m) {
76		if ( (fElectrons->At(m)->TrackerTrk() == fPFCandidates->At(i)->TrackerTrk()) or
#	Line 81 | Line 81 | MetTools::MetTools(const ElectronCol *fE
81		}
82		if (isElectronTrack) continue;
83
84	<	if (fabs(fPFCandidates->At(i)->TrackerTrk()->DzCorrected(*fVertex)) < deltaZCut) {
84	>	if ((fPFCandidates->At(i)->HasTrackerTrk() && fabs(fPFCandidates->At(i)->TrackerTrk()->DzCorrected(*fVertex)) < deltaZCut) ||
85	>	(fPFCandidates->At(i)->HasGsfTrk()     && fabs(fPFCandidates->At(i)->GsfTrk()->DzCorrected(*fVertex)    ) < deltaZCut)) {
86		trackNumeratorX -= fPFCandidates->At(i)->Px();
87		trackNumeratorY -= fPFCandidates->At(i)->Py();
88		}
#	Line 126 | Line 127 | MetTools::MetTools(const MuonCol *fMuons
127		// jets
128		bool inTheJet = false;
129		for (UInt_t j = 0; j < pfJets->GetEntries(); ++j) {
130	<	for (UInt_t c=0;c<pfJets->At(j)->NPFCands();c++){
131	<	if (pfJets->At(j)->PFCand(j) == fPFCandidates->At(i)) {
130	>	for (UInt_t c=0;c<pfJets->At(j)->NPFCands();++c){
131	>	if (pfJets->At(j)->PFCand(c) == fPFCandidates->At(i)) {
132		inTheJet=true;
133		break;
134		}
#	Line 192 | Line 193 | MetTools::MetTools(const ElectronCol *fE
193		// jets
194		bool inTheJet = false;
195		for (UInt_t j = 0; j < pfJets->GetEntries(); ++j) {
196	<	for (UInt_t c=0;c<pfJets->At(j)->NPFCands();c++){
197	<	if (pfJets->At(j)->PFCand(j) == fPFCandidates->At(i)) {
196	>	for (UInt_t c=0;c<pfJets->At(j)->NPFCands();++c){
197	>	if (pfJets->At(j)->PFCand(c) == fPFCandidates->At(i)) {
198		inTheJet=true;
199		break;
200		}
#	Line 203 | Line 204 | MetTools::MetTools(const ElectronCol *fE
204		if (inTheJet) continue;
205
206		// charged
207	<	if (fPFCandidates->At(i)->HasTrackerTrk()){
207	>	if (fPFCandidates->At(i)->HasTrackerTrk() || fPFCandidates->At(i)->HasGsfTrk()){
208		bool isElectronTrack = false;
209		for (UInt_t m = 0; m < fElectrons->GetEntries(); ++m) {
210		if ( (fElectrons->At(m)->TrackerTrk() == fPFCandidates->At(i)->TrackerTrk()) or
#	Line 214 | Line 215 | MetTools::MetTools(const ElectronCol *fE
215		}
216		if (isElectronTrack) continue;
217
218	<	if (fabs(fPFCandidates->At(i)->TrackerTrk()->DzCorrected(*fVertex)) < deltaZCut) {
218	>	if ((fPFCandidates->At(i)->HasTrackerTrk() && fabs(fPFCandidates->At(i)->TrackerTrk()->DzCorrected(*fVertex)) < deltaZCut) ||
219	>	(fPFCandidates->At(i)->HasGsfTrk()     && fabs(fPFCandidates->At(i)->GsfTrk()->DzCorrected(*fVertex)    ) < deltaZCut)) {
220		trackNumeratorX -= fPFCandidates->At(i)->Px();
221		trackNumeratorY -= fPFCandidates->At(i)->Py();
222		}
#	Line 256 | Line 258 | MetTools::MetTools(const MuonCol *fMuons
258		for (UInt_t i=0; i<fPFCandidates->GetEntries(); ++i) {
259
260		// charged
261	<	if (fPFCandidates->At(i)->HasTrackerTrk()){
261	>	if (fPFCandidates->At(i)->HasTrackerTrk() || fPFCandidates->At(i)->HasGsfTrk()){
262		bool isMuonTrack = false;
263		for (UInt_t m = 0; m < fMuons->GetEntries(); ++m) {
264		if (fMuons->At(m)->TrackerTrk() == fPFCandidates->At(i)->TrackerTrk()) {
#	Line 276 | Line 278 | MetTools::MetTools(const MuonCol *fMuons
278		}
279		if (isElectronTrack) continue;
280
281	<	if (fabs(fPFCandidates->At(i)->TrackerTrk()->DzCorrected(*fVertex)) < deltaZCut) {
281	>	if ((fPFCandidates->At(i)->HasTrackerTrk() && fabs(fPFCandidates->At(i)->TrackerTrk()->DzCorrected(*fVertex)) < deltaZCut) ||
282	>	(fPFCandidates->At(i)->HasGsfTrk()     && fabs(fPFCandidates->At(i)->GsfTrk()->DzCorrected(*fVertex)    ) < deltaZCut)) {
283		trackNumeratorX -= fPFCandidates->At(i)->Px();
284		trackNumeratorY -= fPFCandidates->At(i)->Py();
285		}
#	Line 326 | Line 329 | MetTools::MetTools(const MuonCol *fMuons
329		// jets
330		bool inTheJet = false;
331		for (UInt_t j = 0; j < pfJets->GetEntries(); ++j) {
332	<	for (UInt_t c=0;c<pfJets->At(j)->NPFCands();c++){
333	<	if (pfJets->At(j)->PFCand(j) == fPFCandidates->At(i)) {
332	>	for (UInt_t c=0;c<pfJets->At(j)->NPFCands();++c){
333	>	if (pfJets->At(j)->PFCand(c) == fPFCandidates->At(i)) {
334		inTheJet=true;
335		break;
336		}
#	Line 338 | Line 341 | MetTools::MetTools(const MuonCol *fMuons
341
342
343		// charged
344	<	if (fPFCandidates->At(i)->HasTrackerTrk()){
344	>	if (fPFCandidates->At(i)->HasTrackerTrk() || fPFCandidates->At(i)->HasGsfTrk()){
345		bool isMuonTrack = false;
346		for (UInt_t m = 0; m < fMuons->GetEntries(); ++m) {
347		if (fMuons->At(m)->TrackerTrk() == fPFCandidates->At(i)->TrackerTrk()) {
#	Line 358 | Line 361 | MetTools::MetTools(const MuonCol *fMuons
361		}
362		if (isElectronTrack) continue;
363
364	<	if (fabs(fPFCandidates->At(i)->TrackerTrk()->DzCorrected(*fVertex)) < deltaZCut) {
364	>	if ((fPFCandidates->At(i)->HasTrackerTrk() && fabs(fPFCandidates->At(i)->TrackerTrk()->DzCorrected(*fVertex)) < deltaZCut) ||
365	>	(fPFCandidates->At(i)->HasGsfTrk()     && fabs(fPFCandidates->At(i)->GsfTrk()->DzCorrected(*fVertex)    ) < deltaZCut)) {
366		trackNumeratorX -= fPFCandidates->At(i)->Px();
367		trackNumeratorY -= fPFCandidates->At(i)->Py();
368		}

Diff Legend

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