From 190d081e2aff2c760ac35a8bbd4b66c1d454dc1a Mon Sep 17 00:00:00 2001 From: kleinb Date: Thu, 2 Sep 2010 19:08:14 +0000 Subject: [PATCH] Fixes for not filled histograms and calculation of Dijet binning --- .../AliAnalysisTaskFragmentationFunction.cxx | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx index 97ea0bdaa9b..ce780956c80 100644 --- a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx +++ b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx @@ -2887,9 +2887,9 @@ Double_t AliAnalysisTaskFragmentationFunction::GetDiJetBin(Double_t invMass, Dou { jetBin = fDiJetJetInvMassMin + i*stepInvMass/2.; if(((fDiJetJetInvMassMin+i*stepInvMass) <= invMass) && - (fDiJetJetInvMassMin + (i+1)*stepInvMass) > invMass) jetBinOk = jetBin; + (fDiJetJetInvMassMin + (i+1)*stepInvMass) > invMass) {jetBinOk = jetBin; break;} + else jetBinOk = -1.; } - jetBinOk = -1.; } else if (kindBins == 3) { @@ -2897,9 +2897,9 @@ Double_t AliAnalysisTaskFragmentationFunction::GetDiJetBin(Double_t invMass, Dou { jetBin = fDiJetJetPtMin + i*stepPt/2.; if(((fDiJetJetPtMin+i*stepPt) <= EtMean) && - (fDiJetJetPtMin + (i+1)*stepPt) > EtMean) jetBinOk = jetBin; + (fDiJetJetPtMin + (i+1)*stepPt) > EtMean) {jetBinOk = jetBin; break;} + else jetBinOk = -1.; } - jetBinOk = -1.; } else if (kindBins == 2) { @@ -2907,9 +2907,9 @@ Double_t AliAnalysisTaskFragmentationFunction::GetDiJetBin(Double_t invMass, Dou { jetBin = fDiJetJetPtMin + i*stepPt/2.; if(((fDiJetJetPtMin+i*stepPt) <= leadingJetPt) && - (fDiJetJetPtMin + (i+1)*stepPt) > leadingJetPt) jetBinOk = jetBin; + (fDiJetJetPtMin + (i+1)*stepPt) > leadingJetPt) {jetBinOk = jetBin; break;} + else jetBinOk = -1.; } - jetBinOk = -1.; } else {Printf("WARNING: kindBins wrongly set ! Please make sure to call SetKindSlices() and set the kind parameter to 1, 2 or 3.\n");} @@ -2941,7 +2941,7 @@ Int_t AliAnalysisTaskFragmentationFunction::GetListOfTracks(TList *list, Int_t t if(type==kTrackUndef) return 0; Int_t iCount = 0; - if(type==kTrackAODCuts || type==kTrackAOD){ + if(type==kTrackAODCuts || type==kTrackAODQualityCuts || type==kTrackAOD){ // all rec. tracks, esd filter mask, eta range if(!fAOD) return -1; @@ -2949,11 +2949,13 @@ Int_t AliAnalysisTaskFragmentationFunction::GetListOfTracks(TList *list, Int_t t for(Int_t it=0; itGetNumberOfTracks(); ++it){ AliAODTrack *tr = fAOD->GetTrack(it); - if(type == kTrackAODCuts){ + if(type == kTrackAODCuts || type==kTrackAODQualityCuts ){ if((fFilterMask>0)&&!(tr->TestFilterBit(fFilterMask))) continue; - if(tr->Eta() < fTrackEtaMin || tr->Eta() > fTrackEtaMax) continue; - if(tr->Phi() < fTrackPhiMin || tr->Phi() > fTrackPhiMax) continue; - if(tr->Pt() < fTrackPtCut) continue; + if(type == kTrackAODCuts){ + if(tr->Eta() < fTrackEtaMin || tr->Eta() > fTrackEtaMax) continue; + if(tr->Phi() < fTrackPhiMin || tr->Phi() > fTrackPhiMax) continue; + if(tr->Pt() < fTrackPtCut) continue; + } } list->Add(tr); iCount++; -- 2.31.1