From 08c34a44b9449c6499f144666c919c7e614f5d55 Mon Sep 17 00:00:00 2001 From: morsch Date: Thu, 28 Apr 2011 16:06:08 +0000 Subject: [PATCH] Corrections. C. Loizides --- ANALYSIS/AliEPSelectionTask.cxx | 6 +++--- ANALYSIS/AliEPSelectionTask.h | 34 ++++++++++++++++----------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ANALYSIS/AliEPSelectionTask.cxx b/ANALYSIS/AliEPSelectionTask.cxx index 1830b519e2a..ad1714f19ac 100644 --- a/ANALYSIS/AliEPSelectionTask.cxx +++ b/ANALYSIS/AliEPSelectionTask.cxx @@ -226,7 +226,6 @@ void AliEPSelectionTask::UserExec(Option_t */*option*/) fQsub1 = new TVector2(QQ1); fQsub2 = new TVector2(QQ2); fQsubRes = (fQsub1->Phi()/2 - fQsub2->Phi()/2); - esdEP->SetQVector(fQVector); esdEP->SetEventplaneQ(fEventplaneQ); esdEP->SetQsub(fQsub1,fQsub2); @@ -363,7 +362,8 @@ void AliEPSelectionTask::SetESDtrackCuts(TString status){ } //__________________________________________________________________________ -void AliEPSelectionTask::SetPhiDistribution(char* infilename, char* listname){ +void AliEPSelectionTask::SetPhiDistribution(char* infilename, char* listname) +{ TFile f(infilename); TObject* list = f.Get(listname); fPhiDist = (TH1F*)list->FindObject("fHOutPhi"); @@ -420,7 +420,7 @@ Double_t AliEPSelectionTask::GetPhiWeight(AliESDtrack* track) while (Phi<0) Phi += TMath::TwoPi(); while (Phi>TMath::TwoPi()) Phi -= TMath::TwoPi(); - Double_t PhiDistValue = fPhiDist->GetBinContent(1+TMath::Floor((track->Phi())*nPhibins/TMath::TwoPi())); + Double_t PhiDistValue = fPhiDist->GetBinContent(1+TMath::FloorNint((track->Phi())*nPhibins/TMath::TwoPi())); if (PhiDistValue > 0) phiweight = nParticles/nPhibins/PhiDistValue; } diff --git a/ANALYSIS/AliEPSelectionTask.h b/ANALYSIS/AliEPSelectionTask.h index 29cf7df693c..879937268d2 100644 --- a/ANALYSIS/AliEPSelectionTask.h +++ b/ANALYSIS/AliEPSelectionTask.h @@ -64,28 +64,28 @@ class AliEPSelectionTask : public AliAnalysisTaskSE { Bool_t fUsePtWeight; // use of pT weights Bool_t fSaveTrackContribution; // storage of contribution of each track to Q-Vector - AliESDtrackCuts* fESDtrackCuts; + AliESDtrackCuts* fESDtrackCuts; //! track cuts - TObjArray* ftracklist; // list of accepted tracks for Q-Vector + TObjArray* ftracklist; //! list of accepted tracks for Q-Vector TH1F* fPhiDist; // Phi distribution used to calculate phi weights - TVector2* fQVector; // Q-Vector of the event - Double_t* fQContributionX; // array of the tracks' contributions to X component of Q-Vector - index = track ID - Double_t* fQContributionY; // array of the tracks' contributions to Y component of Q-Vector - index = track ID - Double_t fEventplaneQ; // Event plane angle from Q-Vector - TVector2* fQsub1; // Q-Vector of sub-event 1 - TVector2* fQsub2; // Q-Vector of sub-event 2 - Double_t fQsubRes; // Difference of EP angles of subevents + TVector2* fQVector; //! Q-Vector of the event + Double_t* fQContributionX; //! array of the tracks' contributions to X component of Q-Vector - index = track ID + Double_t* fQContributionY; //! array of the tracks' contributions to Y component of Q-Vector - index = track ID + Double_t fEventplaneQ; //! Event plane angle from Q-Vector + TVector2* fQsub1; //! Q-Vector of sub-event 1 + TVector2* fQsub2; //! Q-Vector of sub-event 2 + Double_t fQsubRes; //! Difference of EP angles of subevents TList* fOutputList; - TH1F* fHOutEventplaneQ; // control histogram: Event Plane angle - TH1F* fHOutPhi; // control histogram: original phi distribution - TH1F* fHOutPhiCorr; // control histogram: corrected phi distribution - TH2F* fHOutsub1sub2; // control histogram: correlation of EP from subevents - TH2F* fHOutNTEPRes; // control histogram: Difference of EP angles of subevents vs Nch - TH2F* fHOutPTPsi; // control histogram: Difference of EP angle and emission angle of track vs track pT - TH2F* fHOutDiff; // control histogram: Difference of MC RP and EP - only filled if fUseMCRP is true! - TH2F* fHOutleadPTPsi; // control histogram: emission angle of leading pT track vs EP angle + TH1F* fHOutEventplaneQ; //! control histogram: Event Plane angle + TH1F* fHOutPhi; //! control histogram: original phi distribution + TH1F* fHOutPhiCorr; //! control histogram: corrected phi distribution + TH2F* fHOutsub1sub2; //! control histogram: correlation of EP from subevents + TH2F* fHOutNTEPRes; //! control histogram: Difference of EP angles of subevents vs Nch + TH2F* fHOutPTPsi; //! control histogram: Difference of EP angle and emission angle of track vs track pT + TH2F* fHOutDiff; //! control histogram: Difference of MC RP and EP - only filled if fUseMCRP is true! + TH2F* fHOutleadPTPsi; //! control histogram: emission angle of leading pT track vs EP angle ClassDef(AliEPSelectionTask,2); }; -- 2.43.0