From 9fd4b54eba9cd4510d3bc16b82f0ca0fad93b983 Mon Sep 17 00:00:00 2001 From: miweber Date: Fri, 13 Jul 2012 04:40:20 +0000 Subject: [PATCH] coding/naming rule fixes --- .../BalanceFunctions/AliAnalysisTaskBF.cxx | 360 ++++++++-------- .../EBYE/BalanceFunctions/AliAnalysisTaskBF.h | 95 ++--- .../BalanceFunctions/AliAnalysisTaskBFPsi.cxx | 150 +++---- .../BalanceFunctions/AliAnalysisTaskBFPsi.h | 83 ++-- .../AliAnalysisTaskEventMixingBF.cxx | 116 +++--- .../AliAnalysisTaskEventMixingBF.h | 76 ++-- .../AliAnalysisTaskToyModel.cxx | 394 +++++++++--------- .../AliAnalysisTaskTriggeredBF.cxx | 64 +-- .../AliAnalysisTaskTriggeredBF.h | 38 +- PWGCF/EBYE/BalanceFunctions/AliBalance.cxx | 43 +- PWGCF/EBYE/BalanceFunctions/AliBalance.h | 54 +-- .../AliBalanceEventMixing.cxx | 43 +- .../BalanceFunctions/AliBalanceEventMixing.h | 52 +-- PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx | 56 +-- PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h | 8 +- .../BalanceFunctions/AliBalanceTriggered.cxx | 40 +- .../BalanceFunctions/AliBalanceTriggered.h | 4 +- 17 files changed, 835 insertions(+), 841 deletions(-) diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx index 798f4d8745b..8185d3f988b 100755 --- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx +++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx @@ -107,7 +107,7 @@ AliAnalysisTaskBF::AliAnalysisTaskBF(const char *name) fVxMax(0.3), fVyMax(0.3), fVzMax(10.), - nAODtrackCutBit(128), + fAODtrackCutBit(128), fPtMin(0.3), fPtMax(1.5), fEtaMin(-0.8), @@ -369,7 +369,7 @@ void AliAnalysisTaskBF::UserExec(Option_t *) { // Called for each event TString gAnalysisLevel = fBalance->GetAnalysisLevel(); - AliESDtrack *track_TPC = NULL; + AliESDtrack *trackTPC = NULL; Int_t gNumberOfAcceptedTracks = 0; Float_t fCentrality = 0.; @@ -385,13 +385,13 @@ void AliAnalysisTaskBF::UserExec(Option_t *) { chargeVector[i] = new vector; } - Double_t v_charge; - Double_t v_y; - Double_t v_eta; - Double_t v_phi; - Double_t v_p[3]; - Double_t v_pt; - Double_t v_E; + Double_t vCharge; + Double_t vY; + Double_t vEta; + Double_t vPhi; + Double_t vP[3]; + Double_t vPt; + Double_t vE; if(fUsePID) { fPIDResponse = ((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->GetPIDResponse(); @@ -455,28 +455,28 @@ void AliAnalysisTaskBF::UserExec(Option_t *) { } // take only TPC only tracks - track_TPC = new AliESDtrack(); - if(!track->FillTPCOnlyTrack(*track_TPC)) continue; + trackTPC = new AliESDtrack(); + if(!track->FillTPCOnlyTrack(*trackTPC)) continue; //ESD track cuts if(fESDtrackCuts) - if(!fESDtrackCuts->AcceptTrack(track_TPC)) continue; + if(!fESDtrackCuts->AcceptTrack(trackTPC)) continue; // fill QA histograms Float_t b[2]; Float_t bCov[3]; - track_TPC->GetImpactParameters(b,bCov); + trackTPC->GetImpactParameters(b,bCov); if (bCov[0]<=0 || bCov[2]<=0) { AliDebug(1, "Estimated b resolution lower or equal zero!"); bCov[0]=0; bCov[2]=0; } Int_t nClustersTPC = -1; - nClustersTPC = track_TPC->GetTPCNclsIter1(); // TPC standalone + nClustersTPC = trackTPC->GetTPCNclsIter1(); // TPC standalone //nClustersTPC = track->GetTPCclusters(0); // global track Float_t chi2PerClusterTPC = -1; if (nClustersTPC!=0) { - chi2PerClusterTPC = track_TPC->GetTPCchi2Iter1()/Float_t(nClustersTPC); // TPC standalone + chi2PerClusterTPC = trackTPC->GetTPCchi2Iter1()/Float_t(nClustersTPC); // TPC standalone //chi2PerClusterTPC = track->GetTPCchi2()/Float_t(nClustersTPC); // global track } @@ -581,47 +581,47 @@ void AliAnalysisTaskBF::UserExec(Option_t *) { PostData(4, fHistListPIDQA); } //===========================PID===============================// - v_charge = track_TPC->Charge(); - v_y = track_TPC->Y(); - v_eta = track_TPC->Eta(); - v_phi = track_TPC->Phi() * TMath::RadToDeg(); - v_E = track_TPC->E(); - v_pt = track_TPC->Pt(); - track_TPC->PxPyPz(v_p); - fHistClus->Fill(track_TPC->GetITSclusters(0),nClustersTPC); + vCharge = trackTPC->Charge(); + vY = trackTPC->Y(); + vEta = trackTPC->Eta(); + vPhi = trackTPC->Phi() * TMath::RadToDeg(); + vE = trackTPC->E(); + vPt = trackTPC->Pt(); + trackTPC->PxPyPz(vP); + fHistClus->Fill(trackTPC->GetITSclusters(0),nClustersTPC); fHistDCA->Fill(b[1],b[0]); fHistChi2->Fill(chi2PerClusterTPC); - fHistPt->Fill(v_pt); - fHistEta->Fill(v_eta); - fHistPhi->Fill(v_phi); - fHistRapidity->Fill(v_y); - if(v_charge > 0) fHistPhiPos->Fill(v_phi); - else if(v_charge < 0) fHistPhiNeg->Fill(v_phi); + fHistPt->Fill(vPt); + fHistEta->Fill(vEta); + fHistPhi->Fill(vPhi); + fHistRapidity->Fill(vY); + if(vCharge > 0) fHistPhiPos->Fill(vPhi); + else if(vCharge < 0) fHistPhiNeg->Fill(vPhi); // fill charge vector - chargeVector[0]->push_back(v_charge); - chargeVector[1]->push_back(v_y); - chargeVector[2]->push_back(v_eta); - chargeVector[3]->push_back(v_phi); - chargeVector[4]->push_back(v_p[0]); - chargeVector[5]->push_back(v_p[1]); - chargeVector[6]->push_back(v_p[2]); - chargeVector[7]->push_back(v_pt); - chargeVector[8]->push_back(v_E); + chargeVector[0]->push_back(vCharge); + chargeVector[1]->push_back(vY); + chargeVector[2]->push_back(vEta); + chargeVector[3]->push_back(vPhi); + chargeVector[4]->push_back(vP[0]); + chargeVector[5]->push_back(vP[1]); + chargeVector[6]->push_back(vP[2]); + chargeVector[7]->push_back(vPt); + chargeVector[8]->push_back(vE); if(fRunShuffling) { - chargeVectorShuffle[0]->push_back(v_charge); - chargeVectorShuffle[1]->push_back(v_y); - chargeVectorShuffle[2]->push_back(v_eta); - chargeVectorShuffle[3]->push_back(v_phi); - chargeVectorShuffle[4]->push_back(v_p[0]); - chargeVectorShuffle[5]->push_back(v_p[1]); - chargeVectorShuffle[6]->push_back(v_p[2]); - chargeVectorShuffle[7]->push_back(v_pt); - chargeVectorShuffle[8]->push_back(v_E); + chargeVectorShuffle[0]->push_back(vCharge); + chargeVectorShuffle[1]->push_back(vY); + chargeVectorShuffle[2]->push_back(vEta); + chargeVectorShuffle[3]->push_back(vPhi); + chargeVectorShuffle[4]->push_back(vP[0]); + chargeVectorShuffle[5]->push_back(vP[1]); + chargeVectorShuffle[6]->push_back(vP[2]); + chargeVectorShuffle[7]->push_back(vPt); + chargeVectorShuffle[8]->push_back(vE); } - delete track_TPC; + delete trackTPC; } //track loop }//Vz cut @@ -721,7 +721,7 @@ void AliAnalysisTaskBF::UserExec(Option_t *) { continue; } Int_t gID = aodTrack->GetID(); - //if (!aodTrack->TestFilterBit(nAODtrackCutBit)) trackMap->Add(gID, iTracks); + //if (!aodTrack->TestFilterBit(fAODtrackCutBit)) trackMap->Add(gID, iTracks); if (aodTrack->TestFilterBit(1)) trackMap->Add(gID, iTracks); } AliAODTrack* newAodTrack; @@ -740,7 +740,7 @@ void AliAnalysisTaskBF::UserExec(Option_t *) { //===========================================// // take only TPC only tracks fHistTrackStats->Fill(aodTrack->GetFilterMap()); - if(!aodTrack->TestFilterBit(nAODtrackCutBit)) continue; + if(!aodTrack->TestFilterBit(fAODtrackCutBit)) continue; Int_t gID = aodTrack->GetID(); newAodTrack = gID >= 0 ? aodTrack : gAOD->GetTrack(trackMap->GetValue(-1-gID)); @@ -748,34 +748,34 @@ void AliAnalysisTaskBF::UserExec(Option_t *) { //===========================================// //fHistTrackStats->Fill(aodTrack->GetFilterMap()); - //if(!aodTrack->TestFilterBit(nAODtrackCutBit)) continue; + //if(!aodTrack->TestFilterBit(fAODtrackCutBit)) continue; - v_charge = aodTrack->Charge(); - v_y = aodTrack->Y(); - v_eta = aodTrack->Eta(); - v_phi = aodTrack->Phi() * TMath::RadToDeg(); - v_E = aodTrack->E(); - v_pt = aodTrack->Pt(); - aodTrack->PxPyPz(v_p); + vCharge = aodTrack->Charge(); + vY = aodTrack->Y(); + vEta = aodTrack->Eta(); + vPhi = aodTrack->Phi() * TMath::RadToDeg(); + vE = aodTrack->E(); + vPt = aodTrack->Pt(); + aodTrack->PxPyPz(vP); - Float_t DCAxy = aodTrack->DCA(); // this is the DCA from global track (not exactly what is cut on) - Float_t DCAz = aodTrack->ZAtDCA(); // this is the DCA from global track (not exactly what is cut on) + Float_t dcaXY = aodTrack->DCA(); // this is the DCA from global track (not exactly what is cut on) + Float_t dcaZ = aodTrack->ZAtDCA(); // this is the DCA from global track (not exactly what is cut on) // Kinematics cuts from ESD track cuts - if( v_pt < fPtMin || v_pt > fPtMax) continue; + if( vPt < fPtMin || vPt > fPtMax) continue; if (!fUsePID) { - if( v_eta < fEtaMin || v_eta > fEtaMax) continue; + if( vEta < fEtaMin || vEta > fEtaMax) continue; } else if (fUsePID){ - if( v_y < fEtaMin || v_y > fEtaMax) continue; + if( vY < fEtaMin || vY > fEtaMax) continue; } // Extra DCA cuts (for systematic studies [!= -1]) if( fDCAxyCut != -1 && fDCAzCut != -1){ - if(TMath::Sqrt((DCAxy*DCAxy)/(fDCAxyCut*fDCAxyCut)+(DCAz*DCAz)/(fDCAzCut*fDCAzCut)) > 1 ){ + if(TMath::Sqrt((dcaXY*dcaXY)/(fDCAxyCut*fDCAxyCut)+(dcaZ*dcaZ)/(fDCAzCut*fDCAzCut)) > 1 ){ continue; // 2D cut } } @@ -896,36 +896,36 @@ void AliAnalysisTaskBF::UserExec(Option_t *) { // fill QA histograms fHistClus->Fill(aodTrack->GetITSNcls(),aodTrack->GetTPCNcls()); - fHistDCA->Fill(DCAz,DCAxy); + fHistDCA->Fill(dcaZ,dcaXY); fHistChi2->Fill(aodTrack->Chi2perNDF()); - fHistPt->Fill(v_pt); - fHistEta->Fill(v_eta); - fHistPhi->Fill(v_phi); - fHistRapidity->Fill(v_y); - if(v_charge > 0) fHistPhiPos->Fill(v_phi); - else if(v_charge < 0) fHistPhiNeg->Fill(v_phi); + fHistPt->Fill(vPt); + fHistEta->Fill(vEta); + fHistPhi->Fill(vPhi); + fHistRapidity->Fill(vY); + if(vCharge > 0) fHistPhiPos->Fill(vPhi); + else if(vCharge < 0) fHistPhiNeg->Fill(vPhi); // fill charge vector - chargeVector[0]->push_back(v_charge); - chargeVector[1]->push_back(v_y); - chargeVector[2]->push_back(v_eta); - chargeVector[3]->push_back(v_phi); - chargeVector[4]->push_back(v_p[0]); - chargeVector[5]->push_back(v_p[1]); - chargeVector[6]->push_back(v_p[2]); - chargeVector[7]->push_back(v_pt); - chargeVector[8]->push_back(v_E); + chargeVector[0]->push_back(vCharge); + chargeVector[1]->push_back(vY); + chargeVector[2]->push_back(vEta); + chargeVector[3]->push_back(vPhi); + chargeVector[4]->push_back(vP[0]); + chargeVector[5]->push_back(vP[1]); + chargeVector[6]->push_back(vP[2]); + chargeVector[7]->push_back(vPt); + chargeVector[8]->push_back(vE); if(fRunShuffling) { - chargeVectorShuffle[0]->push_back(v_charge); - chargeVectorShuffle[1]->push_back(v_y); - chargeVectorShuffle[2]->push_back(v_eta); - chargeVectorShuffle[3]->push_back(v_phi); - chargeVectorShuffle[4]->push_back(v_p[0]); - chargeVectorShuffle[5]->push_back(v_p[1]); - chargeVectorShuffle[6]->push_back(v_p[2]); - chargeVectorShuffle[7]->push_back(v_pt); - chargeVectorShuffle[8]->push_back(v_E); + chargeVectorShuffle[0]->push_back(vCharge); + chargeVectorShuffle[1]->push_back(vY); + chargeVectorShuffle[2]->push_back(vEta); + chargeVectorShuffle[3]->push_back(vPhi); + chargeVectorShuffle[4]->push_back(vP[0]); + chargeVectorShuffle[5]->push_back(vP[1]); + chargeVectorShuffle[6]->push_back(vP[2]); + chargeVectorShuffle[7]->push_back(vPt); + chargeVectorShuffle[8]->push_back(vE); } gNumberOfAcceptedTracks += 1; @@ -1010,73 +1010,73 @@ void AliAnalysisTaskBF::UserExec(Option_t *) { if(!mcTrack) continue; // take only TPC only tracks - track_TPC = new AliESDtrack(); - if(!track->FillTPCOnlyTrack(*track_TPC)) continue; + trackTPC = new AliESDtrack(); + if(!track->FillTPCOnlyTrack(*trackTPC)) continue; //ESD track cuts if(fESDtrackCuts) - if(!fESDtrackCuts->AcceptTrack(track_TPC)) continue; + if(!fESDtrackCuts->AcceptTrack(trackTPC)) continue; // fill QA histograms Float_t b[2]; Float_t bCov[3]; - track_TPC->GetImpactParameters(b,bCov); + trackTPC->GetImpactParameters(b,bCov); if (bCov[0]<=0 || bCov[2]<=0) { AliDebug(1, "Estimated b resolution lower or equal zero!"); bCov[0]=0; bCov[2]=0; } Int_t nClustersTPC = -1; - nClustersTPC = track_TPC->GetTPCNclsIter1(); // TPC standalone + nClustersTPC = trackTPC->GetTPCNclsIter1(); // TPC standalone //nClustersTPC = track->GetTPCclusters(0); // global track Float_t chi2PerClusterTPC = -1; if (nClustersTPC!=0) { - chi2PerClusterTPC = track_TPC->GetTPCchi2Iter1()/Float_t(nClustersTPC); // TPC standalone + chi2PerClusterTPC = trackTPC->GetTPCchi2Iter1()/Float_t(nClustersTPC); // TPC standalone //chi2PerClusterTPC = track->GetTPCchi2()/Float_t(nClustersTPC); // global track } - v_charge = track_TPC->Charge(); - v_y = track_TPC->Y(); - v_eta = track_TPC->Eta(); - v_phi = track_TPC->Phi() * TMath::RadToDeg(); - v_E = track_TPC->E(); - v_pt = track_TPC->Pt(); - track_TPC->PxPyPz(v_p); - - fHistClus->Fill(track_TPC->GetITSclusters(0),nClustersTPC); + vCharge = trackTPC->Charge(); + vY = trackTPC->Y(); + vEta = trackTPC->Eta(); + vPhi = trackTPC->Phi() * TMath::RadToDeg(); + vE = trackTPC->E(); + vPt = trackTPC->Pt(); + trackTPC->PxPyPz(vP); + + fHistClus->Fill(trackTPC->GetITSclusters(0),nClustersTPC); fHistDCA->Fill(b[1],b[0]); fHistChi2->Fill(chi2PerClusterTPC); - fHistPt->Fill(v_pt); - fHistEta->Fill(v_eta); - fHistPhi->Fill(v_phi); - fHistRapidity->Fill(v_y); - if(v_charge > 0) fHistPhiPos->Fill(v_phi); - else if(v_charge < 0) fHistPhiNeg->Fill(v_phi); + fHistPt->Fill(vPt); + fHistEta->Fill(vEta); + fHistPhi->Fill(vPhi); + fHistRapidity->Fill(vY); + if(vCharge > 0) fHistPhiPos->Fill(vPhi); + else if(vCharge < 0) fHistPhiNeg->Fill(vPhi); // fill charge vector - chargeVector[0]->push_back(v_charge); - chargeVector[1]->push_back(v_y); - chargeVector[2]->push_back(v_eta); - chargeVector[3]->push_back(v_phi); - chargeVector[4]->push_back(v_p[0]); - chargeVector[5]->push_back(v_p[1]); - chargeVector[6]->push_back(v_p[2]); - chargeVector[7]->push_back(v_pt); - chargeVector[8]->push_back(v_E); + chargeVector[0]->push_back(vCharge); + chargeVector[1]->push_back(vY); + chargeVector[2]->push_back(vEta); + chargeVector[3]->push_back(vPhi); + chargeVector[4]->push_back(vP[0]); + chargeVector[5]->push_back(vP[1]); + chargeVector[6]->push_back(vP[2]); + chargeVector[7]->push_back(vPt); + chargeVector[8]->push_back(vE); if(fRunShuffling) { - chargeVectorShuffle[0]->push_back(v_charge); - chargeVectorShuffle[1]->push_back(v_y); - chargeVectorShuffle[2]->push_back(v_eta); - chargeVectorShuffle[3]->push_back(v_phi); - chargeVectorShuffle[4]->push_back(v_p[0]); - chargeVectorShuffle[5]->push_back(v_p[1]); - chargeVectorShuffle[6]->push_back(v_p[2]); - chargeVectorShuffle[7]->push_back(v_pt); - chargeVectorShuffle[8]->push_back(v_E); + chargeVectorShuffle[0]->push_back(vCharge); + chargeVectorShuffle[1]->push_back(vY); + chargeVectorShuffle[2]->push_back(vEta); + chargeVectorShuffle[3]->push_back(vPhi); + chargeVectorShuffle[4]->push_back(vP[0]); + chargeVectorShuffle[5]->push_back(vP[1]); + chargeVectorShuffle[6]->push_back(vP[2]); + chargeVectorShuffle[7]->push_back(vPt); + chargeVectorShuffle[8]->push_back(vE); } - delete track_TPC; + delete trackTPC; gNumberOfAcceptedTracks += 1; } //track loop @@ -1148,17 +1148,17 @@ void AliAnalysisTaskBF::UserExec(Option_t *) { //exclude non stable particles if(!mcEvent->IsPhysicalPrimary(iTracks)) continue; - v_eta = track->Eta(); - v_pt = track->Pt(); - v_y = track->Y(); + vEta = track->Eta(); + vPt = track->Pt(); + vY = track->Y(); - if( v_pt < fPtMin || v_pt > fPtMax) + if( vPt < fPtMin || vPt > fPtMax) continue; if (!fUsePID) { - if( v_eta < fEtaMin || v_eta > fEtaMax) continue; + if( vEta < fEtaMin || vEta > fEtaMax) continue; } else if (fUsePID){ - if( v_y < fEtaMin || v_y > fEtaMax) continue; + if( vY < fEtaMin || vY > fEtaMax) continue; } //analyze one set of particles @@ -1203,67 +1203,67 @@ void AliAnalysisTaskBF::UserExec(Option_t *) { if(kExcludeParticle) continue; } - v_charge = track->Charge(); - v_phi = track->Phi(); - v_E = track->E(); - track->PxPyPz(v_p); - //Printf("phi (before): %lf",v_phi); + vCharge = track->Charge(); + vPhi = track->Phi(); + vE = track->E(); + track->PxPyPz(vP); + //Printf("phi (before): %lf",vPhi); - fHistPt->Fill(v_pt); - fHistEta->Fill(v_eta); - fHistPhi->Fill(v_phi); - fHistRapidity->Fill(v_y); - if(v_charge > 0) fHistPhiPos->Fill(v_phi); - else if(v_charge < 0) fHistPhiNeg->Fill(v_phi); + fHistPt->Fill(vPt); + fHistEta->Fill(vEta); + fHistPhi->Fill(vPhi); + fHistRapidity->Fill(vY); + if(vCharge > 0) fHistPhiPos->Fill(vPhi); + else if(vCharge < 0) fHistPhiNeg->Fill(vPhi); //Flow after burner if(fUseFlowAfterBurner) { Double_t precisionPhi = 0.001; Int_t maxNumberOfIterations = 100; - Double_t phi0 = v_phi; - Double_t gV2 = fDifferentialV2->Eval(v_pt); + Double_t phi0 = vPhi; + Double_t gV2 = fDifferentialV2->Eval(vPt); for (Int_t j = 0; j < maxNumberOfIterations; j++) { - Double_t phiprev = v_phi; - Double_t fl = v_phi - phi0 + gV2*TMath::Sin(2.*(v_phi - gReactionPlane)); - Double_t fp = 1.0 + 2.0*gV2*TMath::Cos(2.*(v_phi - gReactionPlane)); - v_phi -= fl/fp; - if (TMath::AreEqualAbs(phiprev,v_phi,precisionPhi)) break; + Double_t phiprev = vPhi; + Double_t fl = vPhi - phi0 + gV2*TMath::Sin(2.*(vPhi - gReactionPlane)); + Double_t fp = 1.0 + 2.0*gV2*TMath::Cos(2.*(vPhi - gReactionPlane)); + vPhi -= fl/fp; + if (TMath::AreEqualAbs(phiprev,vPhi,precisionPhi)) break; } - //Printf("phi (after): %lf\n",v_phi); - Double_t v_DeltaphiBefore = phi0 - gReactionPlane; - if(v_DeltaphiBefore < 0) v_DeltaphiBefore += 2*TMath::Pi(); - fHistPhiBefore->Fill(v_DeltaphiBefore); - - Double_t v_DeltaphiAfter = v_phi - gReactionPlane; - if(v_DeltaphiAfter < 0) v_DeltaphiAfter += 2*TMath::Pi(); - fHistPhiAfter->Fill(v_DeltaphiAfter); + //Printf("phi (after): %lf\n",vPhi); + Double_t vDeltaphiBefore = phi0 - gReactionPlane; + if(vDeltaphiBefore < 0) vDeltaphiBefore += 2*TMath::Pi(); + fHistPhiBefore->Fill(vDeltaphiBefore); + + Double_t vDeltaphiAfter = vPhi - gReactionPlane; + if(vDeltaphiAfter < 0) vDeltaphiAfter += 2*TMath::Pi(); + fHistPhiAfter->Fill(vDeltaphiAfter); } - v_phi *= TMath::RadToDeg(); + vPhi *= TMath::RadToDeg(); // fill charge vector - chargeVector[0]->push_back(v_charge); - chargeVector[1]->push_back(v_y); - chargeVector[2]->push_back(v_eta); - chargeVector[3]->push_back(v_phi); - chargeVector[4]->push_back(v_p[0]); - chargeVector[5]->push_back(v_p[1]); - chargeVector[6]->push_back(v_p[2]); - chargeVector[7]->push_back(v_pt); - chargeVector[8]->push_back(v_E); + chargeVector[0]->push_back(vCharge); + chargeVector[1]->push_back(vY); + chargeVector[2]->push_back(vEta); + chargeVector[3]->push_back(vPhi); + chargeVector[4]->push_back(vP[0]); + chargeVector[5]->push_back(vP[1]); + chargeVector[6]->push_back(vP[2]); + chargeVector[7]->push_back(vPt); + chargeVector[8]->push_back(vE); if(fRunShuffling) { - chargeVectorShuffle[0]->push_back(v_charge); - chargeVectorShuffle[1]->push_back(v_y); - chargeVectorShuffle[2]->push_back(v_eta); - chargeVectorShuffle[3]->push_back(v_phi); - chargeVectorShuffle[4]->push_back(v_p[0]); - chargeVectorShuffle[5]->push_back(v_p[1]); - chargeVectorShuffle[6]->push_back(v_p[2]); - chargeVectorShuffle[7]->push_back(v_pt); - chargeVectorShuffle[8]->push_back(v_E); + chargeVectorShuffle[0]->push_back(vCharge); + chargeVectorShuffle[1]->push_back(vY); + chargeVectorShuffle[2]->push_back(vEta); + chargeVectorShuffle[3]->push_back(vPhi); + chargeVectorShuffle[4]->push_back(vP[0]); + chargeVectorShuffle[5]->push_back(vP[1]); + chargeVectorShuffle[6]->push_back(vP[2]); + chargeVectorShuffle[7]->push_back(vPt); + chargeVectorShuffle[8]->push_back(vE); } gNumberOfAcceptedTracks += 1; diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.h b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.h index f6d6cdf3af3..e0e22bbbf34 100755 --- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.h +++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.h @@ -1,5 +1,5 @@ -#ifndef ALIANALYSISTASKBF_CXX -#define ALIANALYSISTASKBF_CXX +#ifndef ALIANALYSISTASKBF_H +#define ALIANALYSISTASKBF_H // Analysis task for the BF code // Authors: Panos Cristakoglou@cern.ch @@ -48,15 +48,12 @@ class AliAnalysisTaskBF : public AliAnalysisTaskSE { //==============AOD analysis==============// void SetAODtrackCutBit(Int_t bit){ - nAODtrackCutBit = bit; + fAODtrackCutBit = bit; } void SetKinematicsCutsAOD(Double_t ptmin, Double_t ptmax, Double_t etamin, Double_t etamax){ - fPtMin = ptmin; - fPtMax = ptmax; - fEtaMin = etamin; - fEtaMax = etamax; - + fPtMin = ptmin; fPtMax = ptmax; + fEtaMin = etamin; fEtaMax = etamax; } void SetExtraDCACutsAOD(Double_t DCAxy, Double_t DCAz){ @@ -70,10 +67,9 @@ class AliAnalysisTaskBF : public AliAnalysisTaskSE { } //==============MC analysis==============// - void SetKinematicsCutsMC(Double_t ptmin, Double_t ptmax, - Double_t etamin, Double_t etamax){ - fPtMin = ptmin; fPtMax = ptmax; - fEtaMin = etamin; fEtaMax = etamax; + void SetKinematicsCutsMC(Double_t ptmin, Double_t ptmax,Double_t etamin, Double_t etamax){ + fPtMin = ptmin; fPtMax = ptmax; + fEtaMin = etamin; fEtaMax = etamax; } void UseFlowAfterBurner(TF1 *gDifferentialV2) { fDifferentialV2 = gDifferentialV2; @@ -88,7 +84,7 @@ class AliAnalysisTaskBF : public AliAnalysisTaskSE { //Centrality void SetCentralityEstimator(const char* centralityEstimator) {fCentralityEstimator = centralityEstimator;} - const char* GetCentralityEstimator(void) {return fCentralityEstimator;} + const char* GetCentralityEstimator (void) const {return fCentralityEstimator;} void SetCentralityPercentileRange(Double_t min, Double_t max) { fUseCentrality = kTRUE; fCentralityPercentileMin=min; @@ -146,47 +142,48 @@ class AliAnalysisTaskBF : public AliAnalysisTaskSE { TH1F *fHistVy; //y coordinate of the primary vertex TH1F *fHistVz; //z coordinate of the primary vertex - TH2F *fHistClus;// - TH2F *fHistDCA;// - TH1F *fHistChi2;// - TH1F *fHistPt;// - TH1F *fHistEta;// - TH1F *fHistRapidity;// - TH1F *fHistPhi;// - TH1F *fHistPhiBefore;// - TH1F *fHistPhiAfter;// - TH1F *fHistPhiPos;// - TH1F *fHistPhiNeg;// - TH2F *fHistV0M;// - TH2F *fHistRefTracks;// + TH2F *fHistClus;//number of clusters (QA histogram) + TH2F *fHistDCA;//DCA (QA histogram) + TH1F *fHistChi2;//track chi2 (QA histogram) + TH1F *fHistPt;//transverse momentum (QA histogram) + TH1F *fHistEta;//pseudorapidity (QA histogram) + TH1F *fHistRapidity;//rapidity (QA histogram) + TH1F *fHistPhi;//phi (QA histogram) + TH1F *fHistPhiBefore;//phi before v2 afterburner (QA histogram) + TH1F *fHistPhiAfter;//phi after v2 afterburner (QA histogram) + TH1F *fHistPhiPos;//phi for positive particles (QA histogram) + TH1F *fHistPhiNeg;//phi for negative particles (QA histogram) + TH2F *fHistV0M;//V0 multiplicities (QA histogram) + TH2F *fHistRefTracks;//reference track multiplicities (QA histogram) //============PID============// - TH2D *fHistdEdxVsPTPCbeforePID;// - TH2D *fHistBetavsPTOFbeforePID;// - TH2D *fHistProbTPCvsPtbeforePID; // - TH2D *fHistProbTOFvsPtbeforePID;// - TH2D *fHistProbTPCTOFvsPtbeforePID;// - TH2D *fHistNSigmaTPCvsPtbeforePID;// - TH2D *fHistNSigmaTOFvsPtbeforePID;// - TH2D *fHistdEdxVsPTPCafterPID;// - TH2D *fHistBetavsPTOFafterPID;// - TH2D *fHistProbTPCvsPtafterPID;// - TH2D *fHistProbTOFvsPtafterPID;// - TH2D *fHistProbTPCTOFvsPtafterPID;// - TH2D *fHistNSigmaTPCvsPtafterPID;// - TH2D *fHistNSigmaTOFvsPtafterPID; // + TH2D *fHistdEdxVsPTPCbeforePID;//TPC dEdx vs momentum before PID cuts (QA histogram) + TH2D *fHistBetavsPTOFbeforePID;//beta vs momentum before PID cuts (QA histogram) + TH2D *fHistProbTPCvsPtbeforePID; //TPC probability vs pT before PID cuts (QA histogram) + TH2D *fHistProbTOFvsPtbeforePID;//TOF probability vs pT before PID cuts (QA histogram) + TH2D *fHistProbTPCTOFvsPtbeforePID;//TOF/TPC probability vs pT before PID cuts (QA histogram) + TH2D *fHistNSigmaTPCvsPtbeforePID;//TPC nsigma vs pT before PID cuts (QA histogram) + TH2D *fHistNSigmaTOFvsPtbeforePID;//TOF nsigma vs pT before PID cuts (QA histogram) + TH2D *fHistdEdxVsPTPCafterPID;//TPC dEdx vs momentum after PID cuts (QA histogram) + TH2D *fHistBetavsPTOFafterPID;//beta vs momentum after PID cuts (QA histogram) + TH2D *fHistProbTPCvsPtafterPID; //TPC probability vs pT after PID cuts (QA histogram) + TH2D *fHistProbTOFvsPtafterPID;//TOF probability vs pT after PID cuts (QA histogram) + TH2D *fHistProbTPCTOFvsPtafterPID;//TOF/TPC probability vs pT after PID cuts (QA histogram) + TH2D *fHistNSigmaTPCvsPtafterPID;//TPC nsigma vs pT after PID cuts (QA histogram) + TH2D *fHistNSigmaTOFvsPtafterPID;//TOF nsigma vs pT after PID cuts (QA histogram) + AliPIDResponse *fPIDResponse; //! PID response object AliPIDCombined *fPIDCombined; //! combined PID object - kParticleOfInterest fParticleOfInterest; - kDetectorUsedForPID fPidDetectorConfig; - - Bool_t fUsePID; // - Bool_t fUsePIDnSigma;// - Bool_t fUsePIDPropabilities;// - Double_t fPIDNSigma;// - Double_t fMinAcceptedPIDProbability;// + kParticleOfInterest fParticleOfInterest;//analyzed particle + kDetectorUsedForPID fPidDetectorConfig;//used detector for PID + + Bool_t fUsePID; //flag to use PID + Bool_t fUsePIDnSigma;//flag to use nsigma method for PID + Bool_t fUsePIDPropabilities;//flag to use probability method for PID + Double_t fPIDNSigma;//nsigma cut for PID + Double_t fMinAcceptedPIDProbability;//probability cut for PID //============PID============// AliESDtrackCuts *fESDtrackCuts; //ESD track cuts @@ -209,7 +206,7 @@ class AliAnalysisTaskBF : public AliAnalysisTaskSE { Double_t fVyMax;//vymax Double_t fVzMax;//vzmax - Int_t nAODtrackCutBit;//track cut bit from track selection (only used for AODs) + Int_t fAODtrackCutBit;//track cut bit from track selection (only used for AODs) Double_t fPtMin;//only used for AODs Double_t fPtMax;//only used for AODs diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx index 30e055aa722..0592e1af1ca 100755 --- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx +++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx @@ -731,11 +731,11 @@ TObjArray* AliAnalysisTaskBFPsi::GetAcceptedTracks(AliVEvent *event, Double_t fC TObjArray* tracksAccepted = new TObjArray; tracksAccepted->SetOwner(kTRUE); - Double_t v_charge; - Double_t v_eta; - Double_t v_y; - Double_t v_phi; - Double_t v_pt; + Double_t vCharge; + Double_t vEta; + Double_t vY; + Double_t vPhi; + Double_t vPt; if(gAnalysisLevel == "AOD") { // handling of TPC only tracks different in AOD and ESD @@ -755,23 +755,23 @@ TObjArray* AliAnalysisTaskBFPsi::GetAcceptedTracks(AliVEvent *event, Double_t fC fHistTrackStats->Fill(aodTrack->GetFilterMap()); if(!aodTrack->TestFilterBit(nAODtrackCutBit)) continue; - v_charge = aodTrack->Charge(); - v_eta = aodTrack->Eta(); - v_y = aodTrack->Y(); - v_phi = aodTrack->Phi() * TMath::RadToDeg(); - v_pt = aodTrack->Pt(); + vCharge = aodTrack->Charge(); + vEta = aodTrack->Eta(); + vY = aodTrack->Y(); + vPhi = aodTrack->Phi() * TMath::RadToDeg(); + vPt = aodTrack->Pt(); - Float_t DCAxy = aodTrack->DCA(); // this is the DCA from global track (not exactly what is cut on) - Float_t DCAz = aodTrack->ZAtDCA(); // this is the DCA from global track (not exactly what is cut on) + Float_t dcaXY = aodTrack->DCA(); // this is the DCA from global track (not exactly what is cut on) + Float_t dcaZ = aodTrack->ZAtDCA(); // this is the DCA from global track (not exactly what is cut on) // Kinematics cuts from ESD track cuts - if( v_pt < fPtMin || v_pt > fPtMax) continue; - if( v_eta < fEtaMin || v_eta > fEtaMax) continue; + if( vPt < fPtMin || vPt > fPtMax) continue; + if( vEta < fEtaMin || vEta > fEtaMax) continue; // Extra DCA cuts (for systematic studies [!= -1]) if( fDCAxyCut != -1 && fDCAzCut != -1){ - if(TMath::Sqrt((DCAxy*DCAxy)/(fDCAxyCut*fDCAxyCut)+(DCAz*DCAz)/(fDCAzCut*fDCAzCut)) > 1 ){ + if(TMath::Sqrt((dcaXY*dcaXY)/(fDCAxyCut*fDCAxyCut)+(dcaZ*dcaZ)/(fDCAzCut*fDCAzCut)) > 1 ){ continue; // 2D cut } } @@ -786,24 +786,24 @@ TObjArray* AliAnalysisTaskBFPsi::GetAcceptedTracks(AliVEvent *event, Double_t fC // fill QA histograms fHistClus->Fill(aodTrack->GetITSNcls(),aodTrack->GetTPCNcls()); - fHistDCA->Fill(DCAz,DCAxy); + fHistDCA->Fill(dcaZ,dcaXY); fHistChi2->Fill(aodTrack->Chi2perNDF(),fCentrality); - fHistPt->Fill(v_pt,fCentrality); - fHistEta->Fill(v_eta,fCentrality); - fHistRapidity->Fill(v_y,fCentrality); - if(v_charge > 0) fHistPhiPos->Fill(v_phi,fCentrality); - else if(v_charge < 0) fHistPhiNeg->Fill(v_phi,fCentrality); - fHistPhi->Fill(v_phi,fCentrality); + fHistPt->Fill(vPt,fCentrality); + fHistEta->Fill(vEta,fCentrality); + fHistRapidity->Fill(vY,fCentrality); + if(vCharge > 0) fHistPhiPos->Fill(vPhi,fCentrality); + else if(vCharge < 0) fHistPhiNeg->Fill(vPhi,fCentrality); + fHistPhi->Fill(vPhi,fCentrality); // add the track to the TObjArray - tracksAccepted->Add(new AliBFBasicParticle(v_eta, v_phi, v_pt, v_charge)); + tracksAccepted->Add(new AliBFBasicParticle(vEta, vPhi, vPt, vCharge)); }//track loop }// AOD analysis else if(gAnalysisLevel == "ESD" || gAnalysisLevel == "MCESD") { // handling of TPC only tracks different in AOD and ESD - AliESDtrack *track_TPC = NULL; + AliESDtrack *trackTPC = NULL; AliMCParticle *mcTrack = NULL; AliMCEvent* mcEvent = NULL; @@ -836,28 +836,28 @@ TObjArray* AliAnalysisTaskBFPsi::GetAcceptedTracks(AliVEvent *event, Double_t fC } // take only TPC only tracks - track_TPC = new AliESDtrack(); - if(!track->FillTPCOnlyTrack(*track_TPC)) continue; + trackTPC = new AliESDtrack(); + if(!track->FillTPCOnlyTrack(*trackTPC)) continue; //ESD track cuts if(fESDtrackCuts) - if(!fESDtrackCuts->AcceptTrack(track_TPC)) continue; + if(!fESDtrackCuts->AcceptTrack(trackTPC)) continue; // fill QA histograms Float_t b[2]; Float_t bCov[3]; - track_TPC->GetImpactParameters(b,bCov); + trackTPC->GetImpactParameters(b,bCov); if (bCov[0]<=0 || bCov[2]<=0) { AliDebug(1, "Estimated b resolution lower or equal zero!"); bCov[0]=0; bCov[2]=0; } Int_t nClustersTPC = -1; - nClustersTPC = track_TPC->GetTPCNclsIter1(); // TPC standalone + nClustersTPC = trackTPC->GetTPCNclsIter1(); // TPC standalone //nClustersTPC = track->GetTPCclusters(0); // global track Float_t chi2PerClusterTPC = -1; if (nClustersTPC!=0) { - chi2PerClusterTPC = track_TPC->GetTPCchi2Iter1()/Float_t(nClustersTPC); // TPC standalone + chi2PerClusterTPC = trackTPC->GetTPCchi2Iter1()/Float_t(nClustersTPC); // TPC standalone //chi2PerClusterTPC = track->GetTPCchi2()/Float_t(nClustersTPC); // global track } @@ -960,25 +960,25 @@ TObjArray* AliAnalysisTaskBFPsi::GetAcceptedTracks(AliVEvent *event, Double_t fC } } //===========================PID===============================// - v_charge = track_TPC->Charge(); - v_y = track_TPC->Y(); - v_eta = track_TPC->Eta(); - v_phi = track_TPC->Phi() * TMath::RadToDeg(); - v_pt = track_TPC->Pt(); - fHistClus->Fill(track_TPC->GetITSclusters(0),nClustersTPC); + vCharge = trackTPC->Charge(); + vY = trackTPC->Y(); + vEta = trackTPC->Eta(); + vPhi = trackTPC->Phi() * TMath::RadToDeg(); + vPt = trackTPC->Pt(); + fHistClus->Fill(trackTPC->GetITSclusters(0),nClustersTPC); fHistDCA->Fill(b[1],b[0]); fHistChi2->Fill(chi2PerClusterTPC,fCentrality); - fHistPt->Fill(v_pt,fCentrality); - fHistEta->Fill(v_eta,fCentrality); - fHistPhi->Fill(v_phi,fCentrality); - fHistRapidity->Fill(v_y,fCentrality); - if(v_charge > 0) fHistPhiPos->Fill(v_phi,fCentrality); - else if(v_charge < 0) fHistPhiNeg->Fill(v_phi,fCentrality); + fHistPt->Fill(vPt,fCentrality); + fHistEta->Fill(vEta,fCentrality); + fHistPhi->Fill(vPhi,fCentrality); + fHistRapidity->Fill(vY,fCentrality); + if(vCharge > 0) fHistPhiPos->Fill(vPhi,fCentrality); + else if(vCharge < 0) fHistPhiNeg->Fill(vPhi,fCentrality); // add the track to the TObjArray - tracksAccepted->Add(new AliBFBasicParticle(v_eta, v_phi, v_pt, v_charge)); + tracksAccepted->Add(new AliBFBasicParticle(vEta, vPhi, vPt, vCharge)); - delete track_TPC; + delete trackTPC; }//track loop }// ESD analysis @@ -995,17 +995,17 @@ TObjArray* AliAnalysisTaskBFPsi::GetAcceptedTracks(AliVEvent *event, Double_t fC //exclude non stable particles if(!(dynamic_cast(event)->IsPhysicalPrimary(iTracks))) continue; - v_eta = track->Eta(); - v_pt = track->Pt(); - v_y = track->Y(); + vEta = track->Eta(); + vPt = track->Pt(); + vY = track->Y(); - if( v_pt < fPtMin || v_pt > fPtMax) + if( vPt < fPtMin || vPt > fPtMax) continue; if (!fUsePID) { - if( v_eta < fEtaMin || v_eta > fEtaMax) continue; + if( vEta < fEtaMin || vEta > fEtaMax) continue; } else if (fUsePID){ - if( v_y < fEtaMin || v_y > fEtaMax) continue; + if( vY < fEtaMin || vY > fEtaMax) continue; } //analyze one set of particles @@ -1050,45 +1050,45 @@ TObjArray* AliAnalysisTaskBFPsi::GetAcceptedTracks(AliVEvent *event, Double_t fC if(kExcludeParticle) continue; } - v_charge = track->Charge(); - v_phi = track->Phi(); - //Printf("phi (before): %lf",v_phi); + vCharge = track->Charge(); + vPhi = track->Phi(); + //Printf("phi (before): %lf",vPhi); - fHistPt->Fill(v_pt,fCentrality); - fHistEta->Fill(v_eta,fCentrality); - fHistPhi->Fill(v_phi*TMath::RadToDeg(),fCentrality); - fHistRapidity->Fill(v_y,fCentrality); - if(v_charge > 0) fHistPhiPos->Fill(v_phi*TMath::RadToDeg(),fCentrality); - else if(v_charge < 0) fHistPhiNeg->Fill(v_phi*TMath::RadToDeg(),fCentrality); + fHistPt->Fill(vPt,fCentrality); + fHistEta->Fill(vEta,fCentrality); + fHistPhi->Fill(vPhi*TMath::RadToDeg(),fCentrality); + fHistRapidity->Fill(vY,fCentrality); + if(vCharge > 0) fHistPhiPos->Fill(vPhi*TMath::RadToDeg(),fCentrality); + else if(vCharge < 0) fHistPhiNeg->Fill(vPhi*TMath::RadToDeg(),fCentrality); //Flow after burner if(fUseFlowAfterBurner) { Double_t precisionPhi = 0.001; Int_t maxNumberOfIterations = 100; - Double_t phi0 = v_phi; - Double_t gV2 = fDifferentialV2->Eval(v_pt); + Double_t phi0 = vPhi; + Double_t gV2 = fDifferentialV2->Eval(vPt); for (Int_t j = 0; j < maxNumberOfIterations; j++) { - Double_t phiprev = v_phi; - Double_t fl = v_phi - phi0 + gV2*TMath::Sin(2.*(v_phi - gReactionPlane)); - Double_t fp = 1.0 + 2.0*gV2*TMath::Cos(2.*(v_phi - gReactionPlane)); - v_phi -= fl/fp; - if (TMath::AreEqualAbs(phiprev,v_phi,precisionPhi)) break; + Double_t phiprev = vPhi; + Double_t fl = vPhi - phi0 + gV2*TMath::Sin(2.*(vPhi - gReactionPlane)); + Double_t fp = 1.0 + 2.0*gV2*TMath::Cos(2.*(vPhi - gReactionPlane)); + vPhi -= fl/fp; + if (TMath::AreEqualAbs(phiprev,vPhi,precisionPhi)) break; } - //Printf("phi (after): %lf\n",v_phi); - Double_t v_DeltaphiBefore = phi0 - gReactionPlane; - if(v_DeltaphiBefore < 0) v_DeltaphiBefore += 2*TMath::Pi(); - fHistPhiBefore->Fill(v_DeltaphiBefore,fCentrality); + //Printf("phi (after): %lf\n",vPhi); + Double_t vDeltaphiBefore = phi0 - gReactionPlane; + if(vDeltaphiBefore < 0) vDeltaphiBefore += 2*TMath::Pi(); + fHistPhiBefore->Fill(vDeltaphiBefore,fCentrality); - Double_t v_DeltaphiAfter = v_phi - gReactionPlane; - if(v_DeltaphiAfter < 0) v_DeltaphiAfter += 2*TMath::Pi(); - fHistPhiAfter->Fill(v_DeltaphiAfter,fCentrality); + Double_t vDeltaphiAfter = vPhi - gReactionPlane; + if(vDeltaphiAfter < 0) vDeltaphiAfter += 2*TMath::Pi(); + fHistPhiAfter->Fill(vDeltaphiAfter,fCentrality); } - v_phi *= TMath::RadToDeg(); + vPhi *= TMath::RadToDeg(); - tracksAccepted->Add(new AliBFBasicParticle(v_eta, v_phi, v_pt, v_charge)); + tracksAccepted->Add(new AliBFBasicParticle(vEta, vPhi, vPt, vCharge)); } //track loop }//MC diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h index b1f1e46329f..4b7b134781c 100755 --- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h +++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h @@ -1,5 +1,5 @@ -#ifndef ALIANALYSISTASKBFPSI_CXX -#define ALIANALYSISTASKBFPSI_CXX +#ifndef ALIANALYSISTASKBFPSI_H +#define ALIANALYSISTASKBFPSI_H // Analysis task for the BF vs Psi code // Authors: Panos Cristakoglou@cern.ch @@ -59,11 +59,8 @@ class AliAnalysisTaskBFPsi : public AliAnalysisTaskSE { } void SetKinematicsCutsAOD(Double_t ptmin, Double_t ptmax, Double_t etamin, Double_t etamax){ - fPtMin = ptmin; - fPtMax = ptmax; - fEtaMin = etamin; - fEtaMax = etamax; - + fPtMin = ptmin; fPtMax = ptmax; + fEtaMin = etamin; fEtaMax = etamax; } void SetExtraDCACutsAOD(Double_t DCAxy, Double_t DCAz){ @@ -95,7 +92,7 @@ class AliAnalysisTaskBFPsi : public AliAnalysisTaskSE { //Centrality void SetCentralityEstimator(const char* centralityEstimator) {fCentralityEstimator = centralityEstimator;} - const char* GetCentralityEstimator(void) {return fCentralityEstimator;} + const char* GetCentralityEstimator(void) const {return fCentralityEstimator;} void SetCentralityPercentileRange(Double_t min, Double_t max) { fUseCentrality = kTRUE; fCentralityPercentileMin=min; @@ -166,47 +163,47 @@ class AliAnalysisTaskBFPsi : public AliAnalysisTaskSE { TH2F *fHistEventPlane; //event plane distribution - TH2F *fHistClus;// - TH2F *fHistDCA;// - TH2F *fHistChi2;// - TH2F *fHistPt;// - TH2F *fHistEta;// - TH2F *fHistRapidity;// - TH2F *fHistPhi;// - TH2F *fHistPhiBefore;// - TH2F *fHistPhiAfter;// - TH2F *fHistPhiPos;// - TH2F *fHistPhiNeg;// - TH2F *fHistV0M;// - TH2F *fHistRefTracks;// + TH2F *fHistClus;//number of clusters (QA histogram) + TH2F *fHistDCA;//DCA (QA histogram) + TH2F *fHistChi2;//track chi2 (QA histogram) + TH2F *fHistPt;//transverse momentum (QA histogram) + TH2F *fHistEta;//pseudorapidity (QA histogram) + TH2F *fHistRapidity;//rapidity (QA histogram) + TH2F *fHistPhi;//phi (QA histogram) + TH2F *fHistPhiBefore;//phi before v2 afterburner (QA histogram) + TH2F *fHistPhiAfter;//phi after v2 afterburner (QA histogram) + TH2F *fHistPhiPos;//phi for positive particles (QA histogram) + TH2F *fHistPhiNeg;//phi for negative particles (QA histogram) + TH2F *fHistV0M;//V0 multiplicities (QA histogram) + TH2F *fHistRefTracks;//reference track multiplicities (QA histogram) //============PID============// - TH2D *fHistdEdxVsPTPCbeforePID;// - TH2D *fHistBetavsPTOFbeforePID;// - TH2D *fHistProbTPCvsPtbeforePID; // - TH2D *fHistProbTOFvsPtbeforePID;// - TH2D *fHistProbTPCTOFvsPtbeforePID;// - TH2D *fHistNSigmaTPCvsPtbeforePID;// - TH2D *fHistNSigmaTOFvsPtbeforePID;// - TH2D *fHistdEdxVsPTPCafterPID;// - TH2D *fHistBetavsPTOFafterPID;// - TH2D *fHistProbTPCvsPtafterPID;// - TH2D *fHistProbTOFvsPtafterPID;// - TH2D *fHistProbTPCTOFvsPtafterPID;// - TH2D *fHistNSigmaTPCvsPtafterPID;// - TH2D *fHistNSigmaTOFvsPtafterPID; // + TH2D *fHistdEdxVsPTPCbeforePID;//TPC dEdx vs momentum before PID cuts (QA histogram) + TH2D *fHistBetavsPTOFbeforePID;//beta vs momentum before PID cuts (QA histogram) + TH2D *fHistProbTPCvsPtbeforePID; //TPC probability vs pT before PID cuts (QA histogram) + TH2D *fHistProbTOFvsPtbeforePID;//TOF probability vs pT before PID cuts (QA histogram) + TH2D *fHistProbTPCTOFvsPtbeforePID;//TOF/TPC probability vs pT before PID cuts (QA histogram) + TH2D *fHistNSigmaTPCvsPtbeforePID;//TPC nsigma vs pT before PID cuts (QA histogram) + TH2D *fHistNSigmaTOFvsPtbeforePID;//TOF nsigma vs pT before PID cuts (QA histogram) + TH2D *fHistdEdxVsPTPCafterPID;//TPC dEdx vs momentum after PID cuts (QA histogram) + TH2D *fHistBetavsPTOFafterPID;//beta vs momentum after PID cuts (QA histogram) + TH2D *fHistProbTPCvsPtafterPID; //TPC probability vs pT after PID cuts (QA histogram) + TH2D *fHistProbTOFvsPtafterPID;//TOF probability vs pT after PID cuts (QA histogram) + TH2D *fHistProbTPCTOFvsPtafterPID;//TOF/TPC probability vs pT after PID cuts (QA histogram) + TH2D *fHistNSigmaTPCvsPtafterPID;//TPC nsigma vs pT after PID cuts (QA histogram) + TH2D *fHistNSigmaTOFvsPtafterPID;//TOF nsigma vs pT after PID cuts (QA histogram) AliPIDResponse *fPIDResponse; //! PID response object AliPIDCombined *fPIDCombined; //! combined PID object - kParticleOfInterest fParticleOfInterest; - kDetectorUsedForPID fPidDetectorConfig; - - Bool_t fUsePID; // - Bool_t fUsePIDnSigma;// - Bool_t fUsePIDPropabilities;// - Double_t fPIDNSigma;// - Double_t fMinAcceptedPIDProbability;// + kParticleOfInterest fParticleOfInterest;//analyzed particle + kDetectorUsedForPID fPidDetectorConfig;//used detector for PID + + Bool_t fUsePID; //flag to use PID + Bool_t fUsePIDnSigma;//flag to use nsigma method for PID + Bool_t fUsePIDPropabilities;//flag to use probability method for PID + Double_t fPIDNSigma;//nsigma cut for PID + Double_t fMinAcceptedPIDProbability;//probability cut for PID //============PID============// AliESDtrackCuts *fESDtrackCuts; //ESD track cuts diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEventMixingBF.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEventMixingBF.cxx index dc18bc946e7..fa8d441d34d 100755 --- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEventMixingBF.cxx +++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEventMixingBF.cxx @@ -387,6 +387,7 @@ void AliAnalysisTaskEventMixingBF::Terminate(Option_t *) { void AliAnalysisTaskEventMixingBF::UserExecMix(Option_t *) { + // Main loop for event mixing TString gAnalysisLevel = fBalance->GetAnalysisLevel(); @@ -403,13 +404,13 @@ void AliAnalysisTaskEventMixingBF::UserExecMix(Option_t *) chargeVector[i] = new vector; } - Double_t v_charge; - Double_t v_y; - Double_t v_eta; - Double_t v_phi; - Double_t v_p[3]; - Double_t v_pt; - Double_t v_E; + Double_t vCharge; + Double_t vY; + Double_t vEta; + Double_t vPhi; + Double_t vP[3]; + Double_t vPt; + Double_t vE; Int_t iMainTrackUsed = -1; @@ -520,25 +521,25 @@ void AliAnalysisTaskEventMixingBF::UserExecMix(Option_t *) fHistTrackStats->Fill(aodTrackMain->GetFilterMap()); if(!aodTrackMain->TestFilterBit(nAODtrackCutBit)) continue; - v_charge = aodTrackMain->Charge(); - v_y = aodTrackMain->Y(); - v_eta = aodTrackMain->Eta(); - v_phi = aodTrackMain->Phi() * TMath::RadToDeg(); - v_E = aodTrackMain->E(); - v_pt = aodTrackMain->Pt(); - aodTrackMain->PxPyPz(v_p); + vCharge = aodTrackMain->Charge(); + vY = aodTrackMain->Y(); + vEta = aodTrackMain->Eta(); + vPhi = aodTrackMain->Phi() * TMath::RadToDeg(); + vE = aodTrackMain->E(); + vPt = aodTrackMain->Pt(); + aodTrackMain->PxPyPz(vP); - Float_t DCAxyMain = aodTrackMain->DCA(); // this is the DCA from global track (not exactly what is cut on) - Float_t DCAzMain = aodTrackMain->ZAtDCA(); // this is the DCA from global track (not exactly what is cut on) + Float_t dcaXYMain = aodTrackMain->DCA(); // this is the DCA from global track (not exactly what is cut on) + Float_t dcaZMain = aodTrackMain->ZAtDCA(); // this is the DCA from global track (not exactly what is cut on) // Kinematics cuts from ESD track cuts - if( v_pt < fPtMin || v_pt > fPtMax) continue; - if( v_eta < fEtaMin || v_eta > fEtaMax) continue; + if( vPt < fPtMin || vPt > fPtMax) continue; + if( vEta < fEtaMin || vEta > fEtaMax) continue; // Extra DCA cuts (for systematic studies [!= -1]) if( fDCAxyCut != -1 && fDCAzCut != -1){ - if(TMath::Sqrt((DCAxyMain*DCAxyMain)/(fDCAxyCut*fDCAxyCut)+(DCAzMain*DCAzMain)/(fDCAzCut*fDCAzCut)) > 1 ){ + if(TMath::Sqrt((dcaXYMain*dcaXYMain)/(fDCAxyCut*fDCAxyCut)+(dcaZMain*dcaZMain)/(fDCAzCut*fDCAzCut)) > 1 ){ continue; // 2D cut } } @@ -553,22 +554,22 @@ void AliAnalysisTaskEventMixingBF::UserExecMix(Option_t *) // fill QA histograms fHistClus->Fill(aodTrackMain->GetITSNcls(),aodTrackMain->GetTPCNcls()); - fHistDCA->Fill(DCAzMain,DCAxyMain); + fHistDCA->Fill(dcaZMain,dcaXYMain); fHistChi2->Fill(aodTrackMain->Chi2perNDF()); - fHistPt->Fill(v_pt); - fHistEta->Fill(v_eta); - fHistPhi->Fill(v_phi); + fHistPt->Fill(vPt); + fHistEta->Fill(vEta); + fHistPhi->Fill(vPhi); // fill charge vector - chargeVector[0]->push_back(v_charge); - chargeVector[1]->push_back(v_y); - chargeVector[2]->push_back(v_eta); - chargeVector[3]->push_back(v_phi); - chargeVector[4]->push_back(v_p[0]); - chargeVector[5]->push_back(v_p[1]); - chargeVector[6]->push_back(v_p[2]); - chargeVector[7]->push_back(v_pt); - chargeVector[8]->push_back(v_E); + chargeVector[0]->push_back(vCharge); + chargeVector[1]->push_back(vY); + chargeVector[2]->push_back(vEta); + chargeVector[3]->push_back(vPhi); + chargeVector[4]->push_back(vP[0]); + chargeVector[5]->push_back(vP[1]); + chargeVector[6]->push_back(vP[2]); + chargeVector[7]->push_back(vPt); + chargeVector[8]->push_back(vE); // ------------------------------------------------------------- // for each track in main event loop over all tracks in mix event @@ -587,25 +588,25 @@ void AliAnalysisTaskEventMixingBF::UserExecMix(Option_t *) fHistTrackStats->Fill(aodTrackMix->GetFilterMap()); if(!aodTrackMix->TestFilterBit(nAODtrackCutBit)) continue; - v_charge = aodTrackMix->Charge(); - v_y = aodTrackMix->Y(); - v_eta = aodTrackMix->Eta(); - v_phi = aodTrackMix->Phi() * TMath::RadToDeg(); - v_E = aodTrackMix->E(); - v_pt = aodTrackMix->Pt(); - aodTrackMix->PxPyPz(v_p); + vCharge = aodTrackMix->Charge(); + vY = aodTrackMix->Y(); + vEta = aodTrackMix->Eta(); + vPhi = aodTrackMix->Phi() * TMath::RadToDeg(); + vE = aodTrackMix->E(); + vPt = aodTrackMix->Pt(); + aodTrackMix->PxPyPz(vP); - Float_t DCAxyMix = aodTrackMix->DCA(); // this is the DCA from global track (not exactly what is cut on) - Float_t DCAzMix = aodTrackMix->ZAtDCA(); // this is the DCA from global track (not exactly what is cut on) + Float_t dcaXYMix = aodTrackMix->DCA(); // this is the DCA from global track (not exactly what is cut on) + Float_t dcaZMix = aodTrackMix->ZAtDCA(); // this is the DCA from global track (not exactly what is cut on) // Kinematics cuts from ESD track cuts - if( v_pt < fPtMin || v_pt > fPtMax) continue; - if( v_eta < fEtaMin || v_eta > fEtaMax) continue; + if( vPt < fPtMin || vPt > fPtMax) continue; + if( vEta < fEtaMin || vEta > fEtaMax) continue; // Extra DCA cuts (for systematic studies [!= -1]) if( fDCAxyCut != -1 && fDCAxyCut != -1){ - if(TMath::Sqrt((DCAxyMix*DCAxyMix)/(fDCAxyCut*fDCAxyCut)+(DCAzMix*DCAzMix)/(fDCAzCut*fDCAzCut)) > 1 ){ + if(TMath::Sqrt((dcaXYMix*dcaXYMix)/(fDCAxyCut*fDCAxyCut)+(dcaZMix*dcaZMix)/(fDCAzCut*fDCAzCut)) > 1 ){ continue; // 2D cut } } @@ -620,22 +621,22 @@ void AliAnalysisTaskEventMixingBF::UserExecMix(Option_t *) // fill QA histograms fHistClus->Fill(aodTrackMix->GetITSNcls(),aodTrackMix->GetTPCNcls()); - fHistDCA->Fill(DCAzMix,DCAxyMix); + fHistDCA->Fill(dcaZMix,dcaXYMix); fHistChi2->Fill(aodTrackMix->Chi2perNDF()); - fHistPt->Fill(v_pt); - fHistEta->Fill(v_eta); - fHistPhi->Fill(v_phi); + fHistPt->Fill(vPt); + fHistEta->Fill(vEta); + fHistPhi->Fill(vPhi); // fill charge vector - chargeVector[0]->push_back(v_charge); - chargeVector[1]->push_back(v_y); - chargeVector[2]->push_back(v_eta); - chargeVector[3]->push_back(v_phi); - chargeVector[4]->push_back(v_p[0]); - chargeVector[5]->push_back(v_p[1]); - chargeVector[6]->push_back(v_p[2]); - chargeVector[7]->push_back(v_pt); - chargeVector[8]->push_back(v_E); + chargeVector[0]->push_back(vCharge); + chargeVector[1]->push_back(vY); + chargeVector[2]->push_back(vEta); + chargeVector[3]->push_back(vPhi); + chargeVector[4]->push_back(vP[0]); + chargeVector[5]->push_back(vP[1]); + chargeVector[6]->push_back(vP[2]); + chargeVector[7]->push_back(vPt); + chargeVector[8]->push_back(vE); @@ -664,6 +665,7 @@ void AliAnalysisTaskEventMixingBF::UserExecMix(Option_t *) } AliMixInputEventHandler *AliAnalysisTaskEventMixingBF::SetupEventsForMixing() { + //sets the input handlers for event mixing AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager(); AliMultiInputEventHandler *inEvHMain = dynamic_cast(mgr->GetInputEventHandler()); diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEventMixingBF.h b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEventMixingBF.h index b0c06f53251..0755f0dae73 100755 --- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEventMixingBF.h +++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskEventMixingBF.h @@ -54,10 +54,8 @@ class AliAnalysisTaskEventMixingBF : public AliAnalysisTaskSE { } void SetKinematicsCutsAOD(Double_t ptmin, Double_t ptmax, Double_t etamin, Double_t etamax){ - fPtMin = ptmin; - fPtMax = ptmax; - fEtaMin = etamin; - fEtaMax = etamax; + fPtMin = ptmin; fPtMax = ptmax; + fEtaMin = etamin; fEtaMax = etamax; } @@ -90,7 +88,7 @@ class AliAnalysisTaskEventMixingBF : public AliAnalysisTaskSE { //Centrality void SetCentralityEstimator(const char* centralityEstimator) {fCentralityEstimator = centralityEstimator;} - const char* GetCentralityEstimator(void) {return fCentralityEstimator;} + const char* GetCentralityEstimator(void) const {return fCentralityEstimator;} void SetCentralityPercentileRange(Double_t min, Double_t max) { fUseCentrality = kTRUE; fCentralityPercentileMin=min; @@ -148,44 +146,44 @@ class AliAnalysisTaskEventMixingBF : public AliAnalysisTaskSE { TH1F *fHistVy; //y coordinate of the primary vertex TH1F *fHistVz; //z coordinate of the primary vertex - TH2F *fHistClus;// - TH2F *fHistDCA;// - TH1F *fHistChi2;// - TH1F *fHistPt;// - TH1F *fHistEta;// - TH1F *fHistPhi;// - TH1F *fHistPhiBefore;// - TH1F *fHistPhiAfter;// - TH2F *fHistV0M;// - TH2F *fHistRefTracks;// + TH2F *fHistClus;//number of clusters (QA histogram) + TH2F *fHistDCA;//DCA (QA histogram) + TH1F *fHistChi2;//track chi2 (QA histogram) + TH1F *fHistPt;//transverse momentum (QA histogram) + TH1F *fHistEta;//pseudorapidity (QA histogram) + TH1F *fHistPhi;//phi (QA histogram) + TH1F *fHistPhiBefore;//phi before v2 afterburner (QA histogram) + TH1F *fHistPhiAfter;//phi after v2 afterburner (QA histogram) + TH2F *fHistV0M;//V0 multiplicities (QA histogram) + TH2F *fHistRefTracks;//reference track multiplicities (QA histogram) //============PID============// - TH2D *fHistdEdxVsPTPCbeforePID;// - TH2D *fHistBetavsPTOFbeforePID;// - TH2D *fHistProbTPCvsPtbeforePID; // - TH2D *fHistProbTOFvsPtbeforePID;// - TH2D *fHistProbTPCTOFvsPtbeforePID;// - TH2D *fHistNSigmaTPCvsPtbeforePID;// - TH2D *fHistNSigmaTOFvsPtbeforePID;// - TH2D *fHistdEdxVsPTPCafterPID;// - TH2D *fHistBetavsPTOFafterPID;// - TH2D *fHistProbTPCvsPtafterPID;// - TH2D *fHistProbTOFvsPtafterPID;// - TH2D *fHistProbTPCTOFvsPtafterPID;// - TH2D *fHistNSigmaTPCvsPtafterPID;// - TH2D *fHistNSigmaTOFvsPtafterPID; // + TH2D *fHistdEdxVsPTPCbeforePID;//TPC dEdx vs momentum before PID cuts (QA histogram) + TH2D *fHistBetavsPTOFbeforePID;//beta vs momentum before PID cuts (QA histogram) + TH2D *fHistProbTPCvsPtbeforePID; //TPC probability vs pT before PID cuts (QA histogram) + TH2D *fHistProbTOFvsPtbeforePID;//TOF probability vs pT before PID cuts (QA histogram) + TH2D *fHistProbTPCTOFvsPtbeforePID;//TOF/TPC probability vs pT before PID cuts (QA histogram) + TH2D *fHistNSigmaTPCvsPtbeforePID;//TPC nsigma vs pT before PID cuts (QA histogram) + TH2D *fHistNSigmaTOFvsPtbeforePID;//TOF nsigma vs pT before PID cuts (QA histogram) + TH2D *fHistdEdxVsPTPCafterPID;//TPC dEdx vs momentum after PID cuts (QA histogram) + TH2D *fHistBetavsPTOFafterPID;//beta vs momentum after PID cuts (QA histogram) + TH2D *fHistProbTPCvsPtafterPID; //TPC probability vs pT after PID cuts (QA histogram) + TH2D *fHistProbTOFvsPtafterPID;//TOF probability vs pT after PID cuts (QA histogram) + TH2D *fHistProbTPCTOFvsPtafterPID;//TOF/TPC probability vs pT after PID cuts (QA histogram) + TH2D *fHistNSigmaTPCvsPtafterPID;//TPC nsigma vs pT after PID cuts (QA histogram) + TH2D *fHistNSigmaTOFvsPtafterPID;//TOF nsigma vs pT after PID cuts (QA histogram) AliPIDResponse *fPIDResponse; //! PID response object AliPIDCombined *fPIDCombined; //! combined PID object - kParticleOfInterest fParticleOfInterest; - kDetectorUsedForPID fPidDetectorConfig; - - Bool_t fUsePID; // - Bool_t fUsePIDnSigma;// - Bool_t fUsePIDPropabilities;// - Double_t fPIDNSigma;// - Double_t fMinAcceptedPIDProbability;// + kParticleOfInterest fParticleOfInterest;//analyzed particle + kDetectorUsedForPID fPidDetectorConfig;//used detector for PID + + Bool_t fUsePID; //flag to use PID + Bool_t fUsePIDnSigma;//flag to use nsigma method for PID + Bool_t fUsePIDPropabilities;//flag to use probability method for PID + Double_t fPIDNSigma;//nsigma cut for PID + Double_t fMinAcceptedPIDProbability;//probability cut for PID //============PID============// AliESDtrackCuts *fESDtrackCuts; //ESD track cuts @@ -231,8 +229,8 @@ class AliAnalysisTaskEventMixingBF : public AliAnalysisTaskSE { Int_t fPDGCodeToBeAnalyzed; //Analyze a set of particles in MC // Event Mixing - AliVEvent *fMainEvent; - AliVEvent *fMixEvent; + AliVEvent *fMainEvent;//main event in the event mixing loop + AliVEvent *fMixEvent;//second event in the event mixing loop AliMixInputEventHandler *SetupEventsForMixing(); diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskToyModel.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskToyModel.cxx index 580681972e1..1cd6ac8e702 100755 --- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskToyModel.cxx +++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskToyModel.cxx @@ -305,13 +305,13 @@ void AliAnalysisTaskToyModel::CreateOutputObjects() { void AliAnalysisTaskToyModel::Run(Int_t nEvents) { // Main loop // Called for each event - Double_t v_charge = 0; - Double_t v_y = 0.0; - Double_t v_eta = 0.0; - Double_t v_phi = 0.0; - Double_t v_p[3] = {0.,0.,0.}; - Double_t v_pt = 0.0; - Double_t v_E = 0.0; + Double_t vCharge = 0; + Double_t vY = 0.0; + Double_t vEta = 0.0; + Double_t vPhi = 0.0; + Double_t vP[3] = {0.,0.,0.}; + Double_t vPt = 0.0; + Double_t vE = 0.0; Bool_t isPion = kFALSE, isKaon = kFALSE, isProton = kFALSE; if(fUseAllCharges) { @@ -401,112 +401,112 @@ void AliAnalysisTaskToyModel::Run(Int_t nEvents) { Printf("Generating positive: %d(%d)",iParticleCount+1,nGeneratedPositive); //Pseudo-rapidity sampled from a Gaussian centered @ 0 - v_eta = gRandom->Gaus(0.0,4.0); + vEta = gRandom->Gaus(0.0,4.0); //Fill QA histograms (full phase space) - fHistEtaTotal->Fill(v_eta); + fHistEtaTotal->Fill(vEta); - v_charge = 1.0; + vCharge = 1.0; //nGeneratedPositive += 1; //Acceptance - if((v_eta < fEtaMin) || (v_eta > fEtaMax)) continue; + if((vEta < fEtaMin) || (vEta > fEtaMax)) continue; if(!fUseAllCharges) { //Decide the specie Double_t randomNumberSpecies = gRandom->Rndm(); if((randomNumberSpecies >= 0.0)&&(randomNumberSpecies < fPionPercentage)) { nGeneratedPions += 1; - v_pt = fPtSpectraPions->GetRandom(); - v_phi = fAzimuthalAnglePions->GetRandom(); + vPt = fPtSpectraPions->GetRandom(); + vPhi = fAzimuthalAnglePions->GetRandom(); fParticleMass = fPionMass; isPion = kTRUE; } else if((randomNumberSpecies >= fPionPercentage)&&(randomNumberSpecies < fPionPercentage + fKaonPercentage)) { nGeneratedKaons += 1; - v_pt = fPtSpectraKaons->GetRandom(); - v_phi = fAzimuthalAngleKaons->GetRandom(); + vPt = fPtSpectraKaons->GetRandom(); + vPhi = fAzimuthalAngleKaons->GetRandom(); fParticleMass = fKaonMass; isKaon = kTRUE; } else if((randomNumberSpecies >= fPionPercentage + fKaonPercentage)&&(randomNumberSpecies < fPionPercentage + fKaonPercentage + fProtonPercentage)) { nGeneratedProtons += 1; - v_pt = fPtSpectraProtons->GetRandom(); - v_phi = fAzimuthalAngleProtons->GetRandom(); + vPt = fPtSpectraProtons->GetRandom(); + vPhi = fAzimuthalAngleProtons->GetRandom(); fParticleMass = fProtonMass; isProton = kTRUE; } } else { - v_pt = fPtSpectraAllCharges->GetRandom(); - v_phi = fAzimuthalAngleAllCharges->GetRandom(); + vPt = fPtSpectraAllCharges->GetRandom(); + vPhi = fAzimuthalAngleAllCharges->GetRandom(); } - v_p[0] = v_pt*TMath::Cos(v_phi); - v_p[1] = v_pt*TMath::Sin(v_phi); - v_p[2] = v_pt*TMath::SinH(v_eta); - v_E = TMath::Sqrt(TMath::Power(fParticleMass,2) + - TMath::Power(v_p[0],2) + - TMath::Power(v_p[1],2) + - TMath::Power(v_p[2],2)); + vP[0] = vPt*TMath::Cos(vPhi); + vP[1] = vPt*TMath::Sin(vPhi); + vP[2] = vPt*TMath::SinH(vEta); + vE = TMath::Sqrt(TMath::Power(fParticleMass,2) + + TMath::Power(vP[0],2) + + TMath::Power(vP[1],2) + + TMath::Power(vP[2],2)); - v_y = 0.5*TMath::Log((v_E + v_p[2])/(v_E - v_p[2])); + vY = 0.5*TMath::Log((vE + vP[2])/(vE - vP[2])); //pt coverage - if((v_pt < fPtMin) || (v_pt > fPtMax)) continue; - //Printf("pt: %lf - mins: %lf - max: %lf",v_pt,fPtMin,fPtMax); + if((vPt < fPtMin) || (vPt > fPtMax)) continue; + //Printf("pt: %lf - mins: %lf - max: %lf",vPt,fPtMin,fPtMax); //acceptance filter if(fUseAcceptanceParameterization) { Double_t gRandomNumberForAcceptance = gRandom->Rndm(); - if(gRandomNumberForAcceptance > fAcceptanceParameterization->Eval(v_pt)) + if(gRandomNumberForAcceptance > fAcceptanceParameterization->Eval(vPt)) continue; } gNumberOfAcceptedPositiveParticles += 1; //Fill QA histograms (acceptance); - fHistEta->Fill(v_eta); - fHistRapidity->Fill(v_y); - fHistPhi->Fill(v_phi); - fHistPt->Fill(v_pt); + fHistEta->Fill(vEta); + fHistRapidity->Fill(vY); + fHistPhi->Fill(vPhi); + fHistPt->Fill(vPt); if(isPion) { - fHistRapidityPions->Fill(v_y); - fHistPhiPions->Fill(v_phi); - fHistPtPions->Fill(v_pt); + fHistRapidityPions->Fill(vY); + fHistPhiPions->Fill(vPhi); + fHistPtPions->Fill(vPt); } else if(isKaon) { - fHistRapidityKaons->Fill(v_y); - fHistPhiKaons->Fill(v_phi); - fHistPtKaons->Fill(v_pt); + fHistRapidityKaons->Fill(vY); + fHistPhiKaons->Fill(vPhi); + fHistPtKaons->Fill(vPt); } else if(isProton) { - fHistRapidityProtons->Fill(v_y); - fHistPhiProtons->Fill(v_phi); - fHistPtProtons->Fill(v_pt); + fHistRapidityProtons->Fill(vY); + fHistPhiProtons->Fill(vPhi); + fHistPtProtons->Fill(vPt); } // fill charge vector - chargeVector[0]->push_back(v_charge); - chargeVector[1]->push_back(v_y); - chargeVector[2]->push_back(v_eta); - chargeVector[3]->push_back(TMath::RadToDeg()*v_phi); - chargeVector[4]->push_back(v_p[0]); - chargeVector[5]->push_back(v_p[1]); - chargeVector[6]->push_back(v_p[2]); - chargeVector[7]->push_back(v_pt); - chargeVector[8]->push_back(v_E); + chargeVector[0]->push_back(vCharge); + chargeVector[1]->push_back(vY); + chargeVector[2]->push_back(vEta); + chargeVector[3]->push_back(TMath::RadToDeg()*vPhi); + chargeVector[4]->push_back(vP[0]); + chargeVector[5]->push_back(vP[1]); + chargeVector[6]->push_back(vP[2]); + chargeVector[7]->push_back(vPt); + chargeVector[8]->push_back(vE); if(fRunShuffling) { - chargeVectorShuffle[0]->push_back(v_charge); - chargeVectorShuffle[1]->push_back(v_y); - chargeVectorShuffle[2]->push_back(v_eta); - chargeVectorShuffle[3]->push_back(TMath::RadToDeg()*v_phi); - chargeVectorShuffle[4]->push_back(v_p[0]); - chargeVectorShuffle[5]->push_back(v_p[1]); - chargeVectorShuffle[6]->push_back(v_p[2]); - chargeVectorShuffle[7]->push_back(v_pt); - chargeVectorShuffle[8]->push_back(v_E); + chargeVectorShuffle[0]->push_back(vCharge); + chargeVectorShuffle[1]->push_back(vY); + chargeVectorShuffle[2]->push_back(vEta); + chargeVectorShuffle[3]->push_back(TMath::RadToDeg()*vPhi); + chargeVectorShuffle[4]->push_back(vP[0]); + chargeVectorShuffle[5]->push_back(vP[1]); + chargeVectorShuffle[6]->push_back(vP[2]); + chargeVectorShuffle[7]->push_back(vPt); + chargeVectorShuffle[8]->push_back(vE); } gNumberOfAcceptedParticles += 1; }//generated positive particle loop @@ -518,124 +518,124 @@ void AliAnalysisTaskToyModel::Run(Int_t nEvents) { Printf("Generating negative: %d(%d)",iParticleCount+1,nGeneratedNegative); //Pseudo-rapidity sampled from a Gaussian centered @ 0 - v_eta = gRandom->Gaus(0.0,4.0); + vEta = gRandom->Gaus(0.0,4.0); //Fill QA histograms (full phase space) - fHistEtaTotal->Fill(v_eta); + fHistEtaTotal->Fill(vEta); - v_charge = -1.0; + vCharge = -1.0; //nGeneratedNegative += 1; //Acceptance - if((v_eta < fEtaMin) || (v_eta > fEtaMax)) continue; + if((vEta < fEtaMin) || (vEta > fEtaMax)) continue; if(!fUseAllCharges) { //Decide the specie Double_t randomNumberSpecies = gRandom->Rndm(); if((randomNumberSpecies >= 0.0)&&(randomNumberSpecies < fPionPercentage)) { nGeneratedPions += 1; - v_pt = fPtSpectraPions->GetRandom(); - v_phi = fAzimuthalAnglePions->GetRandom(); + vPt = fPtSpectraPions->GetRandom(); + vPhi = fAzimuthalAnglePions->GetRandom(); fParticleMass = fPionMass; isPion = kTRUE; } else if((randomNumberSpecies >= fPionPercentage)&&(randomNumberSpecies < fPionPercentage + fKaonPercentage)) { nGeneratedKaons += 1; - v_pt = fPtSpectraKaons->GetRandom(); - v_phi = fAzimuthalAngleKaons->GetRandom(); + vPt = fPtSpectraKaons->GetRandom(); + vPhi = fAzimuthalAngleKaons->GetRandom(); fParticleMass = fKaonMass; isKaon = kTRUE; } else if((randomNumberSpecies >= fPionPercentage + fKaonPercentage)&&(randomNumberSpecies < fPionPercentage + fKaonPercentage + fProtonPercentage)) { nGeneratedProtons += 1; - v_pt = fPtSpectraProtons->GetRandom(); - v_phi = fAzimuthalAngleProtons->GetRandom(); + vPt = fPtSpectraProtons->GetRandom(); + vPhi = fAzimuthalAngleProtons->GetRandom(); fParticleMass = fProtonMass; isProton = kTRUE; } } else { - v_pt = fPtSpectraAllCharges->GetRandom(); - v_phi = fAzimuthalAngleAllCharges->GetRandom(); + vPt = fPtSpectraAllCharges->GetRandom(); + vPhi = fAzimuthalAngleAllCharges->GetRandom(); } - v_p[0] = v_pt*TMath::Cos(v_phi); - v_p[1] = v_pt*TMath::Sin(v_phi); - v_p[2] = v_pt*TMath::SinH(v_eta); - v_E = TMath::Sqrt(TMath::Power(fParticleMass,2) + - TMath::Power(v_p[0],2) + - TMath::Power(v_p[1],2) + - TMath::Power(v_p[2],2)); + vP[0] = vPt*TMath::Cos(vPhi); + vP[1] = vPt*TMath::Sin(vPhi); + vP[2] = vPt*TMath::SinH(vEta); + vE = TMath::Sqrt(TMath::Power(fParticleMass,2) + + TMath::Power(vP[0],2) + + TMath::Power(vP[1],2) + + TMath::Power(vP[2],2)); - v_y = 0.5*TMath::Log((v_E + v_p[2])/(v_E - v_p[2])); + vY = 0.5*TMath::Log((vE + vP[2])/(vE - vP[2])); //pt coverage - if((v_pt < fPtMin) || (v_pt > fPtMax)) continue; - //Printf("pt: %lf - mins: %lf - max: %lf",v_pt,fPtMin,fPtMax); + if((vPt < fPtMin) || (vPt > fPtMax)) continue; + //Printf("pt: %lf - mins: %lf - max: %lf",vPt,fPtMin,fPtMax); //acceptance filter if(fUseAcceptanceParameterization) { Double_t gRandomNumberForAcceptance = gRandom->Rndm(); - if(gRandomNumberForAcceptance > fAcceptanceParameterization->Eval(v_pt)) + if(gRandomNumberForAcceptance > fAcceptanceParameterization->Eval(vPt)) continue; } gNumberOfAcceptedNegativeParticles += 1; //Fill QA histograms (acceptance); - fHistEta->Fill(v_eta); - fHistRapidity->Fill(v_y); - fHistPhi->Fill(v_phi); - fHistPt->Fill(v_pt); + fHistEta->Fill(vEta); + fHistRapidity->Fill(vY); + fHistPhi->Fill(vPhi); + fHistPt->Fill(vPt); if(isPion) { - fHistRapidityPions->Fill(v_y); - fHistPhiPions->Fill(v_phi); - fHistPtPions->Fill(v_pt); + fHistRapidityPions->Fill(vY); + fHistPhiPions->Fill(vPhi); + fHistPtPions->Fill(vPt); } else if(isKaon) { - fHistRapidityKaons->Fill(v_y); - fHistPhiKaons->Fill(v_phi); - fHistPtKaons->Fill(v_pt); + fHistRapidityKaons->Fill(vY); + fHistPhiKaons->Fill(vPhi); + fHistPtKaons->Fill(vPt); } else if(isProton) { - fHistRapidityProtons->Fill(v_y); - fHistPhiProtons->Fill(v_phi); - fHistPtProtons->Fill(v_pt); + fHistRapidityProtons->Fill(vY); + fHistPhiProtons->Fill(vPhi); + fHistPtProtons->Fill(vPt); } // fill charge vector - chargeVector[0]->push_back(v_charge); - chargeVector[1]->push_back(v_y); - chargeVector[2]->push_back(v_eta); - chargeVector[3]->push_back(TMath::RadToDeg()*v_phi); - chargeVector[4]->push_back(v_p[0]); - chargeVector[5]->push_back(v_p[1]); - chargeVector[6]->push_back(v_p[2]); - chargeVector[7]->push_back(v_pt); - chargeVector[8]->push_back(v_E); + chargeVector[0]->push_back(vCharge); + chargeVector[1]->push_back(vY); + chargeVector[2]->push_back(vEta); + chargeVector[3]->push_back(TMath::RadToDeg()*vPhi); + chargeVector[4]->push_back(vP[0]); + chargeVector[5]->push_back(vP[1]); + chargeVector[6]->push_back(vP[2]); + chargeVector[7]->push_back(vPt); + chargeVector[8]->push_back(vE); if(fRunShuffling) { - chargeVectorShuffle[0]->push_back(v_charge); - chargeVectorShuffle[1]->push_back(v_y); - chargeVectorShuffle[2]->push_back(v_eta); - chargeVectorShuffle[3]->push_back(TMath::RadToDeg()*v_phi); - chargeVectorShuffle[4]->push_back(v_p[0]); - chargeVectorShuffle[5]->push_back(v_p[1]); - chargeVectorShuffle[6]->push_back(v_p[2]); - chargeVectorShuffle[7]->push_back(v_pt); - chargeVectorShuffle[8]->push_back(v_E); + chargeVectorShuffle[0]->push_back(vCharge); + chargeVectorShuffle[1]->push_back(vY); + chargeVectorShuffle[2]->push_back(vEta); + chargeVectorShuffle[3]->push_back(TMath::RadToDeg()*vPhi); + chargeVectorShuffle[4]->push_back(vP[0]); + chargeVectorShuffle[5]->push_back(vP[1]); + chargeVectorShuffle[6]->push_back(vP[2]); + chargeVectorShuffle[7]->push_back(vPt); + chargeVectorShuffle[8]->push_back(vE); } gNumberOfAcceptedParticles += 1; }//generated negative particle loop //Dynamical correlations - Double_t v_chargePrime = 0; - Double_t v_yPrime = 0.0; - Double_t v_etaPrime = 0.0; - Double_t v_phiPrime = 0.0; - Double_t v_pPrime[3] = {0.,0.,0.}; - Double_t v_ptPrime = 0.0; - Double_t v_EPrime = 0.0; + Double_t vChargePrime = 0; + Double_t vYPrime = 0.0; + Double_t vEtaPrime = 0.0; + Double_t vPhiPrime = 0.0; + Double_t vPPrime[3] = {0.,0.,0.}; + Double_t vPtPrime = 0.0; + Double_t vEPrime = 0.0; Int_t nGeneratedPositiveDynamicalCorrelations = 0; Int_t nGeneratedNegativeDynamicalCorrelations = 0; //Generate "correlated" particles @@ -645,130 +645,130 @@ void AliAnalysisTaskToyModel::Run(Int_t nEvents) { isPion = kFALSE; isKaon = kFALSE; isProton = kFALSE; //Pseudo-rapidity sampled from a Gaussian centered @ 0 - v_eta = gRandom->Gaus(0.0,0.1); - v_charge = 1.0; + vEta = gRandom->Gaus(0.0,0.1); + vCharge = 1.0; nGeneratedPositiveDynamicalCorrelations += 1; - v_etaPrime = -v_eta; - v_chargePrime = -1.0; + vEtaPrime = -vEta; + vChargePrime = -1.0; nGeneratedNegativeDynamicalCorrelations += 1; //Acceptance - if((v_eta < fEtaMin) || (v_eta > fEtaMax)) continue; - if((v_etaPrime < fEtaMin) || (v_etaPrime > fEtaMax)) continue; + if((vEta < fEtaMin) || (vEta > fEtaMax)) continue; + if((vEtaPrime < fEtaMin) || (vEtaPrime > fEtaMax)) continue; if(!fUseAllCharges) { //Decide the specie Double_t randomNumberSpecies = gRandom->Rndm(); if((randomNumberSpecies >= 0.0)&&(randomNumberSpecies < fPionPercentage)) { nGeneratedPions += 1; - v_pt = fPtSpectraPions->GetRandom(); - v_phi = fAzimuthalAnglePions->GetRandom(); + vPt = fPtSpectraPions->GetRandom(); + vPhi = fAzimuthalAnglePions->GetRandom(); fParticleMass = fPionMass; isPion = kTRUE; } else if((randomNumberSpecies >= fPionPercentage)&&(randomNumberSpecies < fPionPercentage + fKaonPercentage)) { nGeneratedKaons += 1; - v_pt = fPtSpectraKaons->GetRandom(); - v_phi = fAzimuthalAngleKaons->GetRandom(); + vPt = fPtSpectraKaons->GetRandom(); + vPhi = fAzimuthalAngleKaons->GetRandom(); fParticleMass = fKaonMass; isKaon = kTRUE; } else if((randomNumberSpecies >= fPionPercentage + fKaonPercentage)&&(randomNumberSpecies < fPionPercentage + fKaonPercentage + fProtonPercentage)) { nGeneratedProtons += 1; - v_pt = fPtSpectraProtons->GetRandom(); - v_ptPrime = v_pt; - v_phi = fAzimuthalAngleProtons->GetRandom(); + vPt = fPtSpectraProtons->GetRandom(); + vPtPrime = vPt; + vPhi = fAzimuthalAngleProtons->GetRandom(); fParticleMass = fProtonMass; isProton = kTRUE; } } else { - v_pt = fPtSpectraAllCharges->GetRandom(); - v_phi = fAzimuthalAngleAllCharges->GetRandom(); + vPt = fPtSpectraAllCharges->GetRandom(); + vPhi = fAzimuthalAngleAllCharges->GetRandom(); } - v_ptPrime = v_pt; - v_phiPrime = v_phi; - - v_p[0] = v_pt*TMath::Cos(v_phi); - v_p[1] = v_pt*TMath::Sin(v_phi); - v_p[2] = v_pt*TMath::SinH(v_eta); - v_E = TMath::Sqrt(TMath::Power(fParticleMass,2) + - TMath::Power(v_p[0],2) + - TMath::Power(v_p[1],2) + - TMath::Power(v_p[2],2)); + vPtPrime = vPt; + vPhiPrime = vPhi; + + vP[0] = vPt*TMath::Cos(vPhi); + vP[1] = vPt*TMath::Sin(vPhi); + vP[2] = vPt*TMath::SinH(vEta); + vE = TMath::Sqrt(TMath::Power(fParticleMass,2) + + TMath::Power(vP[0],2) + + TMath::Power(vP[1],2) + + TMath::Power(vP[2],2)); - v_y = 0.5*TMath::Log((v_E + v_p[2])/(v_E - v_p[2])); - - v_pPrime[0] = v_ptPrime*TMath::Cos(v_phiPrime); - v_pPrime[1] = v_ptPrime*TMath::Sin(v_phiPrime); - v_pPrime[2] = v_ptPrime*TMath::SinH(v_etaPrime); - v_EPrime = TMath::Sqrt(TMath::Power(fParticleMass,2) + - TMath::Power(v_pPrime[0],2) + - TMath::Power(v_pPrime[1],2) + - TMath::Power(v_pPrime[2],2)); + vY = 0.5*TMath::Log((vE + vP[2])/(vE - vP[2])); + + vPPrime[0] = vPtPrime*TMath::Cos(vPhiPrime); + vPPrime[1] = vPtPrime*TMath::Sin(vPhiPrime); + vPPrime[2] = vPtPrime*TMath::SinH(vEtaPrime); + vEPrime = TMath::Sqrt(TMath::Power(fParticleMass,2) + + TMath::Power(vPPrime[0],2) + + TMath::Power(vPPrime[1],2) + + TMath::Power(vPPrime[2],2)); - v_yPrime = 0.5*TMath::Log((v_EPrime + v_pPrime[2])/(v_EPrime - v_pPrime[2])); + vYPrime = 0.5*TMath::Log((vEPrime + vPPrime[2])/(vEPrime - vPPrime[2])); //pt coverage - if((v_pt < fPtMin) || (v_pt > fPtMax)) continue; - if((v_ptPrime < fPtMin) || (v_ptPrime > fPtMax)) continue; + if((vPt < fPtMin) || (vPt > fPtMax)) continue; + if((vPtPrime < fPtMin) || (vPtPrime > fPtMax)) continue; //acceptance filter if(fUseAcceptanceParameterization) { Double_t gRandomNumberForAcceptance = gRandom->Rndm(); - if(gRandomNumberForAcceptance > fAcceptanceParameterization->Eval(v_pt)) + if(gRandomNumberForAcceptance > fAcceptanceParameterization->Eval(vPt)) continue; Double_t gRandomNumberForAcceptancePrime = gRandom->Rndm(); - if(gRandomNumberForAcceptancePrime > fAcceptanceParameterization->Eval(v_ptPrime)) + if(gRandomNumberForAcceptancePrime > fAcceptanceParameterization->Eval(vPtPrime)) continue; } // fill charge vector (positive) - chargeVector[0]->push_back(v_charge); - chargeVector[1]->push_back(v_y); - chargeVector[2]->push_back(v_eta); - chargeVector[3]->push_back(TMath::RadToDeg()*v_phi); - chargeVector[4]->push_back(v_p[0]); - chargeVector[5]->push_back(v_p[1]); - chargeVector[6]->push_back(v_p[2]); - chargeVector[7]->push_back(v_pt); - chargeVector[8]->push_back(v_E); + chargeVector[0]->push_back(vCharge); + chargeVector[1]->push_back(vY); + chargeVector[2]->push_back(vEta); + chargeVector[3]->push_back(TMath::RadToDeg()*vPhi); + chargeVector[4]->push_back(vP[0]); + chargeVector[5]->push_back(vP[1]); + chargeVector[6]->push_back(vP[2]); + chargeVector[7]->push_back(vPt); + chargeVector[8]->push_back(vE); if(fRunShuffling) { - chargeVectorShuffle[0]->push_back(v_charge); - chargeVectorShuffle[1]->push_back(v_y); - chargeVectorShuffle[2]->push_back(v_eta); - chargeVectorShuffle[3]->push_back(TMath::RadToDeg()*v_phi); - chargeVectorShuffle[4]->push_back(v_p[0]); - chargeVectorShuffle[5]->push_back(v_p[1]); - chargeVectorShuffle[6]->push_back(v_p[2]); - chargeVectorShuffle[7]->push_back(v_pt); - chargeVectorShuffle[8]->push_back(v_E); + chargeVectorShuffle[0]->push_back(vCharge); + chargeVectorShuffle[1]->push_back(vY); + chargeVectorShuffle[2]->push_back(vEta); + chargeVectorShuffle[3]->push_back(TMath::RadToDeg()*vPhi); + chargeVectorShuffle[4]->push_back(vP[0]); + chargeVectorShuffle[5]->push_back(vP[1]); + chargeVectorShuffle[6]->push_back(vP[2]); + chargeVectorShuffle[7]->push_back(vPt); + chargeVectorShuffle[8]->push_back(vE); } // fill charge vector (negative) - chargeVector[0]->push_back(v_chargePrime); - chargeVector[1]->push_back(v_yPrime); - chargeVector[2]->push_back(v_etaPrime); - chargeVector[3]->push_back(TMath::RadToDeg()*v_phiPrime); - chargeVector[4]->push_back(v_pPrime[0]); - chargeVector[5]->push_back(v_pPrime[1]); - chargeVector[6]->push_back(v_pPrime[2]); - chargeVector[7]->push_back(v_ptPrime); - chargeVector[8]->push_back(v_EPrime); + chargeVector[0]->push_back(vChargePrime); + chargeVector[1]->push_back(vYPrime); + chargeVector[2]->push_back(vEtaPrime); + chargeVector[3]->push_back(TMath::RadToDeg()*vPhiPrime); + chargeVector[4]->push_back(vPPrime[0]); + chargeVector[5]->push_back(vPPrime[1]); + chargeVector[6]->push_back(vPPrime[2]); + chargeVector[7]->push_back(vPtPrime); + chargeVector[8]->push_back(vEPrime); if(fRunShuffling) { - chargeVectorShuffle[0]->push_back(v_chargePrime); - chargeVectorShuffle[1]->push_back(v_yPrime); - chargeVectorShuffle[2]->push_back(v_etaPrime); - chargeVectorShuffle[3]->push_back(TMath::RadToDeg()*v_phiPrime); - chargeVectorShuffle[4]->push_back(v_pPrime[0]); - chargeVectorShuffle[5]->push_back(v_pPrime[1]); - chargeVectorShuffle[6]->push_back(v_pPrime[2]); - chargeVectorShuffle[7]->push_back(v_ptPrime); - chargeVectorShuffle[8]->push_back(v_EPrime); + chargeVectorShuffle[0]->push_back(vChargePrime); + chargeVectorShuffle[1]->push_back(vYPrime); + chargeVectorShuffle[2]->push_back(vEtaPrime); + chargeVectorShuffle[3]->push_back(TMath::RadToDeg()*vPhiPrime); + chargeVectorShuffle[4]->push_back(vPPrime[0]); + chargeVectorShuffle[5]->push_back(vPPrime[1]); + chargeVectorShuffle[6]->push_back(vPPrime[2]); + chargeVectorShuffle[7]->push_back(vPtPrime); + chargeVectorShuffle[8]->push_back(vEPrime); } gNumberOfAcceptedParticles += 2; diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.cxx index f428ada0765..351d8e474e2 100755 --- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.cxx +++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.cxx @@ -698,10 +698,10 @@ TObjArray* AliAnalysisTaskTriggeredBF::GetAcceptedTracks(AliVEvent *event){ TObjArray* tracksAccepted = new TObjArray; tracksAccepted->SetOwner(kTRUE); - Double_t v_charge; - Double_t v_eta; - Double_t v_phi; - Double_t v_pt; + Double_t vCharge; + Double_t vEta; + Double_t vPhi; + Double_t vPt; // Loop over tracks in event for (Int_t iTracks = 0; iTracks < event->GetNumberOfTracks(); iTracks++) { @@ -718,22 +718,22 @@ TObjArray* AliAnalysisTaskTriggeredBF::GetAcceptedTracks(AliVEvent *event){ fHistTrackStats->Fill(aodTrack->GetFilterMap()); if(!aodTrack->TestFilterBit(nAODtrackCutBit)) continue; - v_charge = aodTrack->Charge(); - v_eta = aodTrack->Eta(); - v_phi = aodTrack->Phi() * TMath::RadToDeg(); - v_pt = aodTrack->Pt(); + vCharge = aodTrack->Charge(); + vEta = aodTrack->Eta(); + vPhi = aodTrack->Phi() * TMath::RadToDeg(); + vPt = aodTrack->Pt(); - Float_t DCAxy = aodTrack->DCA(); // this is the DCA from global track (not exactly what is cut on) - Float_t DCAz = aodTrack->ZAtDCA(); // this is the DCA from global track (not exactly what is cut on) + Float_t dcaXY = aodTrack->DCA(); // this is the DCA from global track (not exactly what is cut on) + Float_t dcaZ = aodTrack->ZAtDCA(); // this is the DCA from global track (not exactly what is cut on) // Kinematics cuts from ESD track cuts - if( v_pt < fPtMin || v_pt > fPtMax) continue; - if( v_eta < fEtaMin || v_eta > fEtaMax) continue; + if( vPt < fPtMin || vPt > fPtMax) continue; + if( vEta < fEtaMin || vEta > fEtaMax) continue; // Extra DCA cuts (for systematic studies [!= -1]) if( fDCAxyCut != -1 && fDCAzCut != -1){ - if(TMath::Sqrt((DCAxy*DCAxy)/(fDCAxyCut*fDCAxyCut)+(DCAz*DCAz)/(fDCAzCut*fDCAzCut)) > 1 ){ + if(TMath::Sqrt((dcaXY*dcaXY)/(fDCAxyCut*fDCAxyCut)+(dcaZ*dcaZ)/(fDCAzCut*fDCAzCut)) > 1 ){ continue; // 2D cut } } @@ -748,14 +748,14 @@ TObjArray* AliAnalysisTaskTriggeredBF::GetAcceptedTracks(AliVEvent *event){ // fill QA histograms fHistClus->Fill(aodTrack->GetITSNcls(),aodTrack->GetTPCNcls()); - fHistDCA->Fill(DCAz,DCAxy); + fHistDCA->Fill(dcaZ,dcaXY); fHistChi2->Fill(aodTrack->Chi2perNDF()); - fHistPt->Fill(v_pt); - fHistEta->Fill(v_eta); - fHistPhi->Fill(v_phi); + fHistPt->Fill(vPt); + fHistEta->Fill(vEta); + fHistPhi->Fill(vPhi); // add the track to the TObjArray - tracksAccepted->Add(new AliBFBasicParticle(v_eta, v_phi, v_pt, v_charge)); + tracksAccepted->Add(new AliBFBasicParticle(vEta, vPhi, vPt, vCharge)); } return tracksAccepted; @@ -770,10 +770,10 @@ TObjArray* AliAnalysisTaskTriggeredBF::GetAcceptedV0s(AliVEvent *event){ TObjArray* tracksAccepted = new TObjArray; tracksAccepted->SetOwner(kTRUE); - Double_t v_charge; - Double_t v_eta; - Double_t v_phi; - Double_t v_pt; + Double_t vCharge; + Double_t vEta; + Double_t vPhi; + Double_t vPt; //------------------------------------------------ // MAIN LAMBDA LOOP STARTS HERE (basically a copy of AliAnalysisTaskExtractV0AOD) @@ -1019,19 +1019,19 @@ TObjArray* AliAnalysisTaskTriggeredBF::GetAcceptedV0s(AliVEvent *event){ fHistV0SelArmenteros->Fill(lAlphaV0,lPtArmV0); - v_eta = lEta; - v_phi = lPhi; - v_pt = lPt; - if(lAlphaV0 > 0) v_charge = 1; - if(lAlphaV0 < 0) v_charge = -1; + vEta = lEta; + vPhi = lPhi; + vPt = lPt; + if(lAlphaV0 > 0) vCharge = 1; + if(lAlphaV0 < 0) vCharge = -1; // fill QA histograms - fHistPt->Fill(v_pt); - fHistEta->Fill(v_eta); - fHistPhi->Fill(v_phi); + fHistPt->Fill(vPt); + fHistEta->Fill(vEta); + fHistPhi->Fill(vPhi); // add the track to the TObjArray - tracksAccepted->Add(new AliBFBasicParticle(v_eta, v_phi, v_pt, v_charge)); + tracksAccepted->Add(new AliBFBasicParticle(vEta, vPhi, vPt, vCharge)); } } } @@ -1073,7 +1073,7 @@ TObjArray* AliAnalysisTaskTriggeredBF::GetShuffledTracks(TObjArray *tracks){ //________________________________________________________________________ void AliAnalysisTaskTriggeredBF::FinishTaskOutput(){ - + //checks if Balance Function objects are there (needed to write the histograms) if (!fBalance) { AliError("fBalance not available"); return; diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.h b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.h index db5a6a81dcf..42743225c15 100755 --- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.h +++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskTriggeredBF.h @@ -57,10 +57,8 @@ class AliAnalysisTaskTriggeredBF : public AliAnalysisTaskSE { } void SetKinematicsCutsAOD(Double_t ptmin, Double_t ptmax, Double_t etamin, Double_t etamax){ - fPtMin = ptmin; - fPtMax = ptmax; - fEtaMin = etamin; - fEtaMax = etamax; + fPtMin = ptmin; fPtMax = ptmax; + fEtaMin = etamin; fEtaMax = etamax; } @@ -76,7 +74,7 @@ class AliAnalysisTaskTriggeredBF : public AliAnalysisTaskSE { //Centrality void SetCentralityEstimator(const char* centralityEstimator) {fCentralityEstimator = centralityEstimator;} - const char* GetCentralityEstimator(void) {return fCentralityEstimator;} + const char* GetCentralityEstimator(void) const {return fCentralityEstimator;} void SetCentralityPercentileRange(Double_t min, Double_t max) { fUseCentrality = kTRUE; fCentralityPercentileMin=min; @@ -107,7 +105,7 @@ class AliAnalysisTaskTriggeredBF : public AliAnalysisTaskSE { Bool_t fRunShuffling;//run shuffling or not AliBalanceTriggered *fShuffledBalance; //TriggeredBF object (shuffled) Bool_t fRunMixing;//run mixing or not - Int_t fMixingTracks; + Int_t fMixingTracks;//number of tracks to mix AliBalanceTriggered *fMixedBalance; //TriggeredBF object (mixed) AliEventPoolManager* fPoolMgr; //! event pool manager Bool_t fRunV0; @@ -130,16 +128,16 @@ class AliAnalysisTaskTriggeredBF : public AliAnalysisTaskSE { TH1F *fHistVy; //y coordinate of the primary vertex TH1F *fHistVz; //z coordinate of the primary vertex - TH2F *fHistClus;// - TH2F *fHistDCA;// - TH1F *fHistChi2;// - TH1F *fHistPt;// - TH1F *fHistEta;// - TH1F *fHistPhi;// - TH1F *fHistPhiBefore;// - TH1F *fHistPhiAfter;// - TH2F *fHistV0M;// - TH2F *fHistRefTracks;// + TH2F *fHistClus;//number of clusters (QA histogram) + TH2F *fHistDCA;//DCA (QA histogram) + TH1F *fHistChi2;//track chi2 (QA histogram) + TH1F *fHistPt;//transverse momentum (QA histogram) + TH1F *fHistEta;//pseudorapidity (QA histogram) + TH1F *fHistPhi;//phi (QA histogram) + TH1F *fHistPhiBefore;//phi before v2 afterburner (QA histogram) + TH1F *fHistPhiAfter;//phi after v2 afterburner (QA histogram) + TH2F *fHistV0M;//V0 multiplicities (QA histogram) + TH2F *fHistRefTracks;//reference track multiplicities (QA histogram) // V0 histograms TH1F *fHistV0MultiplicityBeforeTrigSel; //! V0 multiplicity distribution @@ -149,10 +147,10 @@ class AliAnalysisTaskTriggeredBF : public AliAnalysisTaskSE { TH1F *fHistV0MultiplicityForSelEvtNoTPCOnlyNoPileup;//! V0 multiplicity distribution TH1F *fHistMultiplicityBeforeTrigSel; //! multiplicity distribution - TH1F *fHistMultiplicityForTrigEvt; //! multiplicity distribution - TH1F *fHistMultiplicity; //! multiplicity distribution - TH1F *fHistMultiplicityNoTPCOnly; //! multiplicity distribution - TH1F *fHistMultiplicityNoTPCOnlyNoPileup; //! multiplicity distribution + TH1F *fHistMultiplicityForTrigEvt; //! multiplicity distribution + TH1F *fHistMultiplicity; //! multiplicity distribution + TH1F *fHistMultiplicityNoTPCOnly; //! multiplicity distribution + TH1F *fHistMultiplicityNoTPCOnlyNoPileup; //! multiplicity distribution //before selection TH1F* fHistV0InvMassK0; // Invariant mass K0 diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalance.cxx b/PWGCF/EBYE/BalanceFunctions/AliBalance.cxx index 2a36e1a3808..ad314d25783 100644 --- a/PWGCF/EBYE/BalanceFunctions/AliBalance.cxx +++ b/PWGCF/EBYE/BalanceFunctions/AliBalance.cxx @@ -46,9 +46,9 @@ ClassImp(AliBalance) //____________________________________________________________________// AliBalance::AliBalance() : TObject(), - bShuffle(kFALSE), - bHBTcut(kFALSE), - bConversionCut(kFALSE), + fShuffle(kFALSE), + fHBTcut(kFALSE), + fConversionCut(kFALSE), fAnalysisLevel("ESD"), fAnalyzedEvents(0) , fCentralityId(0) , @@ -110,9 +110,9 @@ AliBalance::AliBalance() : //____________________________________________________________________// AliBalance::AliBalance(const AliBalance& balance): TObject(balance), - bShuffle(balance.bShuffle), - bHBTcut(balance.bHBTcut), - bConversionCut(balance.bConversionCut), + fShuffle(balance.fShuffle), + fHBTcut(balance.fHBTcut), + fConversionCut(balance.fConversionCut), fAnalysisLevel(balance.fAnalysisLevel), fAnalyzedEvents(balance.fAnalyzedEvents), fCentralityId(balance.fCentralityId), @@ -203,33 +203,33 @@ void AliBalance::InitHistograms() { //Initialize the histograms TString histName; for(Int_t iAnalysisType = 0; iAnalysisType < ANALYSIS_TYPES; iAnalysisType++) { - histName = "fHistP"; histName += gBFAnalysisType[iAnalysisType]; - if(bShuffle) histName.Append("_shuffle"); + histName = "fHistP"; histName += kBFAnalysisType[iAnalysisType]; + if(fShuffle) histName.Append("_shuffle"); if(fCentralityId) histName += fCentralityId.Data(); fHistP[iAnalysisType] = new TH2D(histName.Data(),"",fCentStop-fCentStart,fCentStart,fCentStop,100,fP1Start[iAnalysisType],fP1Stop[iAnalysisType]); - histName = "fHistN"; histName += gBFAnalysisType[iAnalysisType]; - if(bShuffle) histName.Append("_shuffle"); + histName = "fHistN"; histName += kBFAnalysisType[iAnalysisType]; + if(fShuffle) histName.Append("_shuffle"); if(fCentralityId) histName += fCentralityId.Data(); fHistN[iAnalysisType] = new TH2D(histName.Data(),"",fCentStop-fCentStart,fCentStart,fCentStop,100,fP1Start[iAnalysisType],fP1Stop[iAnalysisType]); - histName = "fHistPN"; histName += gBFAnalysisType[iAnalysisType]; - if(bShuffle) histName.Append("_shuffle"); + histName = "fHistPN"; histName += kBFAnalysisType[iAnalysisType]; + if(fShuffle) histName.Append("_shuffle"); if(fCentralityId) histName += fCentralityId.Data(); fHistPN[iAnalysisType] = new TH2D(histName.Data(),"",fCentStop-fCentStart,fCentStart,fCentStop,fNumberOfBins[iAnalysisType],fP2Start[iAnalysisType],fP2Stop[iAnalysisType]); - histName = "fHistNP"; histName += gBFAnalysisType[iAnalysisType]; - if(bShuffle) histName.Append("_shuffle"); + histName = "fHistNP"; histName += kBFAnalysisType[iAnalysisType]; + if(fShuffle) histName.Append("_shuffle"); if(fCentralityId) histName += fCentralityId.Data(); fHistNP[iAnalysisType] = new TH2D(histName.Data(),"",fCentStop-fCentStart,fCentStart,fCentStop,fNumberOfBins[iAnalysisType],fP2Start[iAnalysisType],fP2Stop[iAnalysisType]); - histName = "fHistPP"; histName += gBFAnalysisType[iAnalysisType]; - if(bShuffle) histName.Append("_shuffle"); + histName = "fHistPP"; histName += kBFAnalysisType[iAnalysisType]; + if(fShuffle) histName.Append("_shuffle"); if(fCentralityId) histName += fCentralityId.Data(); fHistPP[iAnalysisType] = new TH2D(histName.Data(),"",fCentStop-fCentStart,fCentStart,fCentStop,fNumberOfBins[iAnalysisType],fP2Start[iAnalysisType],fP2Stop[iAnalysisType]); - histName = "fHistNN"; histName += gBFAnalysisType[iAnalysisType]; - if(bShuffle) histName.Append("_shuffle"); + histName = "fHistNN"; histName += kBFAnalysisType[iAnalysisType]; + if(fShuffle) histName.Append("_shuffle"); if(fCentralityId) histName += fCentralityId.Data(); fHistNN[iAnalysisType] = new TH2D(histName.Data(),"",fCentStop-fCentStart,fCentStart,fCentStop,fNumberOfBins[iAnalysisType],fP2Start[iAnalysisType],fP2Stop[iAnalysisType]); } @@ -244,6 +244,7 @@ void AliBalance::InitHistograms() { //____________________________________________________________________// void AliBalance::PrintAnalysisSettings() { + //prints the analysis settings Printf("======================================"); Printf("Analysis level: %s",fAnalysisLevel.Data()); @@ -412,7 +413,7 @@ void AliBalance::CalculateBalance(Float_t fCentrality,vector **chargeV if(dphi>180) dphi = 360 - dphi; //dphi should be between 0 and 180! // HBT like cut - if(bHBTcut && charge1 * charge2 > 0){ + if(fHBTcut && charge1 * charge2 > 0){ //if( dphi < 3 || deta < 0.01 ){ // VERSION 1 // continue; @@ -464,7 +465,7 @@ void AliBalance::CalculateBalance(Float_t fCentrality,vector **chargeV } // conversions - if(bConversionCut){ + if(fConversionCut){ if (charge1 * charge2 < 0) { @@ -803,7 +804,7 @@ void AliBalance::PrintResults(Int_t iAnalysisType, TH1D *gHistBalance) { Double_t delta = gSumBiXi / gSumBi; Double_t deltaError = (gSumBiXi / gSumBi) * TMath::Sqrt(TMath::Power((TMath::Sqrt(gSumXi2DeltaBi2)/gSumBiXi),2) + TMath::Power((gSumDeltaBi2/gSumBi),2) ); - cout<<"Analysis type: "<180) dphi = 360 - dphi; //dphi should be between 0 and 180! // HBT like cut - if(bHBTcut && charge1 * charge2 > 0){ + if(fHBTcut && charge1 * charge2 > 0){ //if( dphi < 3 || deta < 0.01 ){ // VERSION 1 // continue; @@ -458,7 +459,7 @@ void AliBalanceEventMixing::CalculateBalance(Float_t fCentrality,vectorSetBinLimits(j, dBinsSingle[j]); fHistP->SetVarTitle(j, axisTitleSingle[j]); } //- triggered particles histName = "fHistN"; - if(bShuffle) histName.Append("_shuffle"); + if(fShuffle) histName.Append("_shuffle"); if(fCentralityId) histName += fCentralityId.Data(); - fHistN = new AliTHn(histName.Data(),histName.Data(),anaSteps,nTrackVariablesSingle,iBinSingle); - for (Int_t j=0; jSetBinLimits(j, dBinsSingle[j]); fHistN->SetVarTitle(j, axisTitleSingle[j]); } //+- pairs histName = "fHistPN"; - if(bShuffle) histName.Append("_shuffle"); + if(fShuffle) histName.Append("_shuffle"); if(fCentralityId) histName += fCentralityId.Data(); - fHistPN = new AliTHn(histName.Data(),histName.Data(),anaSteps, nTrackVariablesPair, iBinPair); - for (Int_t j=0; jSetBinLimits(j, dBinsPair[j]); fHistPN->SetVarTitle(j, axisTitlePair[j]); } //-+ pairs histName = "fHistNP"; - if(bShuffle) histName.Append("_shuffle"); + if(fShuffle) histName.Append("_shuffle"); if(fCentralityId) histName += fCentralityId.Data(); - fHistNP = new AliTHn(histName.Data(),histName.Data(),anaSteps, nTrackVariablesPair, iBinPair); - for (Int_t j=0; jSetBinLimits(j, dBinsPair[j]); fHistNP->SetVarTitle(j, axisTitlePair[j]); } //++ pairs histName = "fHistPP"; - if(bShuffle) histName.Append("_shuffle"); + if(fShuffle) histName.Append("_shuffle"); if(fCentralityId) histName += fCentralityId.Data(); - fHistPP = new AliTHn(histName.Data(),histName.Data(),anaSteps, nTrackVariablesPair, iBinPair); - for (Int_t j=0; jSetBinLimits(j, dBinsPair[j]); fHistPP->SetVarTitle(j, axisTitlePair[j]); } //-- pairs histName = "fHistNN"; - if(bShuffle) histName.Append("_shuffle"); + if(fShuffle) histName.Append("_shuffle"); if(fCentralityId) histName += fCentralityId.Data(); - fHistNN = new AliTHn(histName.Data(),histName.Data(),anaSteps, nTrackVariablesPair, iBinPair); - for (Int_t j=0; jSetBinLimits(j, dBinsPair[j]); fHistNN->SetVarTitle(j, axisTitlePair[j]); } @@ -237,8 +237,8 @@ void AliBalancePsi::CalculateBalance(Double_t gReactionPlane, InitHistograms(); } - Double_t trackVariablesSingle[nTrackVariablesSingle]; - Double_t trackVariablesPair[nTrackVariablesPair]; + Double_t trackVariablesSingle[kTrackVariablesSingle]; + Double_t trackVariablesPair[kTrackVariablesPair]; if (!particles){ AliWarning("particles TObjArray is NULL pointer --> return"); diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h index 5e766012143..190ebcc4da1 100644 --- a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h +++ b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h @@ -28,8 +28,8 @@ class TH1D; class TH2D; class TH3D; -const Int_t nTrackVariablesSingle = 2; // track variables in histogram (centrality, phi-Psi2, eta, phi, pTtrig) -const Int_t nTrackVariablesPair = 5; // track variables in histogram (centrality, phi-Psi2, dEta, dPhi, pTtrig, ptAssociated) +const Int_t kTrackVariablesSingle = 2; // track variables in histogram (centrality, phi-Psi2, eta, phi, pTtrig) +const Int_t kTrackVariablesPair = 5; // track variables in histogram (centrality, phi-Psi2, dEta, dPhi, pTtrig, ptAssociated) const TString gBFPsiAnalysisType[ANALYSIS_TYPES] = {"y","eta","qlong","qout","qside","qinv","phi"}; class AliBalancePsi : public TObject { @@ -53,7 +53,7 @@ class AliBalancePsi : public TObject { void SetAnalysisLevel(const char* analysisLevel) { fAnalysisLevel = analysisLevel;} - void SetShuffle(Bool_t shuffle) {bShuffle = shuffle;} + void SetShuffle(Bool_t shuffle) {fShuffle = shuffle;} void SetCentralityInterval(Double_t cStart, Double_t cStop) { fCentStart = cStart; fCentStop = cStop;}; void InitHistograms(void); @@ -97,7 +97,7 @@ class AliBalancePsi : public TObject { TH2D *GetBalanceFunctionDeltaEtaDeltaPhi(Double_t psiMin, Double_t psiMax); private: - Bool_t bShuffle; //shuffled balance function object + Bool_t fShuffle; //shuffled balance function object TString fAnalysisLevel; //ESD, AOD or MC Int_t fAnalyzedEvents; //number of events that have been analyzed diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.cxx b/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.cxx index 8f889f20f40..f2e2b700db1 100644 --- a/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.cxx +++ b/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.cxx @@ -96,14 +96,14 @@ void AliBalanceTriggered::InitHistograms() { Int_t anaSteps = 1; // analysis steps // single particle histograms - Int_t iBinSingle[nTrackVarsSingle]; // binning for track variables - Double_t* dBinsSingle[nTrackVarsSingle]; // bins for track variables - TString axisTitleSingle[nTrackVarsSingle]; // axis titles for track variables + Int_t iBinSingle[kTrackVarsSingle]; // binning for track variables + Double_t* dBinsSingle[kTrackVarsSingle]; // bins for track variables + TString axisTitleSingle[kTrackVarsSingle]; // axis titles for track variables // two particle histograms - Int_t iBinPair[nTrackVarsPair]; // binning for track variables - Double_t* dBinsPair[nTrackVarsPair]; // bins for track variables - TString axisTitlePair[nTrackVarsPair]; // axis titles for track variables + Int_t iBinPair[kTrackVarsPair]; // binning for track variables + Double_t* dBinsPair[kTrackVarsPair]; // bins for track variables + TString axisTitlePair[kTrackVarsPair]; // axis titles for track variables //----------------------------------------------------------- @@ -191,48 +191,48 @@ void AliBalanceTriggered::InitHistograms() { // Histogram creation // histogram for negative particles - fHistN = new AliTHn(Form("fHistN"), Form("%s_N",title.Data()), anaSteps, nTrackVarsSingle, iBinSingle); - for (Int_t j=0; jSetBinLimits(j, dBinsSingle[j]); fHistN->SetVarTitle(j, axisTitleSingle[j]); } // histogram for positive particles - fHistP = new AliTHn(Form("fHistP"), Form("%s_P",title.Data()), anaSteps, nTrackVarsSingle, iBinSingle); - for (Int_t j=0; jSetBinLimits(j, dBinsSingle[j]); fHistP->SetVarTitle(j, axisTitleSingle[j]); } // histogram for +- pairs - fHistPN = new AliTHn(Form("fHistPN"), Form("%s_PN",title.Data()), anaSteps, nTrackVarsPair, iBinPair); - for (Int_t j=0; jSetBinLimits(j, dBinsPair[j]); fHistPN->SetVarTitle(j, axisTitlePair[j]); } // histogram for -+ pairs - fHistNP = new AliTHn(Form("fHistNP"), Form("%s_NP",title.Data()), anaSteps, nTrackVarsPair, iBinPair); - for (Int_t j=0; jSetBinLimits(j, dBinsPair[j]); fHistNP->SetVarTitle(j, axisTitlePair[j]); } // histogram for ++ pairs - fHistPP = new AliTHn(Form("fHistPP"), Form("%s_PP",title.Data()), anaSteps, nTrackVarsPair, iBinPair); - for (Int_t j=0; jSetBinLimits(j, dBinsPair[j]); fHistPP->SetVarTitle(j, axisTitlePair[j]); } // histogram for -- pairs - fHistNN = new AliTHn(Form("fHistNN"), Form("%s_NN",title.Data()), anaSteps, nTrackVarsPair, iBinPair); - for (Int_t j=0; jSetBinLimits(j, dBinsPair[j]); fHistNN->SetVarTitle(j, axisTitlePair[j]); @@ -256,8 +256,8 @@ void AliBalanceTriggered::FillBalance(Float_t fCentrality,TObjArray *particles, InitHistograms(); } - Double_t trackVarsSingle[nTrackVarsSingle]; - Double_t trackVarsPair[nTrackVarsPair]; + Double_t trackVarsSingle[kTrackVarsSingle]; + Double_t trackVarsPair[kTrackVarsPair]; if (!particles){ AliWarning("particles TObjArray is NULL pointer --> return"); diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.h b/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.h index 83f944012a3..943c3631105 100644 --- a/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.h +++ b/PWGCF/EBYE/BalanceFunctions/AliBalanceTriggered.h @@ -18,8 +18,8 @@ class TGraphErrors; class TH1D; class AliTHn; -const Int_t nTrackVarsSingle = 4; // track variables in histogram (eta, phi, pTtrig, centrality) -const Int_t nTrackVarsPair = 5; // track variables in histogram (dEta, dPhi, pT, pTtrig, centrality) +const Int_t kTrackVarsSingle = 4; // track variables in histogram (eta, phi, pTtrig, centrality) +const Int_t kTrackVarsPair = 5; // track variables in histogram (dEta, dPhi, pT, pTtrig, centrality) class AliBalanceTriggered : public TObject { public: -- 2.43.0