Updated code for the pid + coverity (Alis)

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx
index 72ef420fd0bce5176f609079a8b4743a11afdb6d..fba192f69a5ef9b0b0706f1debb519fd8d41aecf 100755 (executable)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.cxx
@@ -61,9 +61,12 @@ AliAnalysisTaskBF::AliAnalysisTaskBF(const char *name)
   fHistChi2(0),\r
   fHistPt(0),\r
   fHistEta(0),\r
+  fHistRapidity(0),\r
   fHistPhi(0),\r
   fHistPhiBefore(0),\r
   fHistPhiAfter(0),\r
+  fHistPhiPos(0),\r
+  fHistPhiNeg(0),\r
   fHistV0M(0),\r
   fHistRefTracks(0),\r
   fHistdEdxVsPTPCbeforePID(NULL),\r
@@ -242,12 +245,18 @@ void AliAnalysisTaskBF::UserCreateOutputObjects() {
   fList->Add(fHistPt);\r
   fHistEta  = new TH1F("fHistEta","#eta distribution",200,-2,2);\r
   fList->Add(fHistEta);\r
+  fHistRapidity  = new TH1F("fHistRapidity","y distribution",200,-2,2);\r
+  fList->Add(fHistRapidity);\r
   fHistPhi  = new TH1F("fHistPhi","#phi distribution",200,-20,380);\r
   fList->Add(fHistPhi);\r
   fHistPhiBefore  = new TH1F("fHistPhiBefore","#phi distribution",200,0.,2*TMath::Pi());\r
   fList->Add(fHistPhiBefore);\r
   fHistPhiAfter  = new TH1F("fHistPhiAfter","#phi distribution",200,0.,2*TMath::Pi());\r
   fList->Add(fHistPhiAfter);\r
+  fHistPhiPos  = new TH1F("fHistPhiPos","#phi distribution for positive particles",200,-20,380);\r
+  fList->Add(fHistPhiPos);\r
+  fHistPhiNeg  = new TH1F("fHistPhiNeg","#phi distribution for negative particles",200,-20,380);\r
+  fList->Add(fHistPhiNeg);\r
   fHistV0M  = new TH2F("fHistV0M","V0 Multiplicity C vs. A",500, 0, 20000, 500, 0, 20000);\r
   fList->Add(fHistV0M);\r
   TString gRefTrackName[6] = {"tracks","tracksPos","tracksNeg","tracksTPConly","clusITS0","clusITS1"};\r
@@ -576,6 +585,9 @@ void AliAnalysisTaskBF::UserExec(Option_t *) {
                    fHistPt->Fill(v_pt);\r
                    fHistEta->Fill(v_eta);\r
                    fHistPhi->Fill(v_phi);\r
+                   fHistRapidity->Fill(v_y);\r
+                   if(v_charge > 0) fHistPhiPos->Fill(v_phi);\r
+                   else if(v_charge < 0) fHistPhiNeg->Fill(v_phi);\r
 \r
                    // fill charge vector\r
                    chargeVector[0]->push_back(v_charge);\r
@@ -713,8 +725,13 @@ void AliAnalysisTaskBF::UserExec(Option_t *) {
                    \r
                    // Kinematics cuts from ESD track cuts\r
                    if( v_pt < fPtMin || v_pt > fPtMax)      continue;\r
-                   if( v_eta < fEtaMin || v_eta > fEtaMax)  continue;\r
-                   \r
+                   if (!fUsePID) {\r
+                     if( v_eta < fEtaMin || v_eta > fEtaMax)  continue;\r
+                   }\r
+                   else if (fUsePID){\r
+                     if( v_y < fEtaMin || v_y > fEtaMax)  continue;\r
+                   }\r
+\r
                    // Extra DCA cuts (for systematic studies [!= -1])\r
                    if( fDCAxyCut != -1 && fDCAxyCut != -1){\r
                      if(TMath::Sqrt((DCAxy*DCAxy)/(fDCAxyCut*fDCAxyCut)+(DCAz*DCAz)/(fDCAzCut*fDCAzCut)) > 1 ){\r
@@ -737,6 +754,9 @@ void AliAnalysisTaskBF::UserExec(Option_t *) {
                    fHistPt->Fill(v_pt);\r
                    fHistEta->Fill(v_eta);\r
                    fHistPhi->Fill(v_phi);\r
+                   fHistRapidity->Fill(v_y);\r
+                   if(v_charge > 0) fHistPhiPos->Fill(v_phi);\r
+                   else if(v_charge < 0) fHistPhiNeg->Fill(v_phi);\r
 \r
                    // fill charge vector\r
                    chargeVector[0]->push_back(v_charge);\r
@@ -882,6 +902,9 @@ void AliAnalysisTaskBF::UserExec(Option_t *) {
                    fHistPt->Fill(v_pt);\r
                    fHistEta->Fill(v_eta);\r
                    fHistPhi->Fill(v_phi);\r
+                   fHistRapidity->Fill(v_y);\r
+                   if(v_charge > 0) fHistPhiPos->Fill(v_phi);\r
+                   else if(v_charge < 0) fHistPhiNeg->Fill(v_phi);\r
 \r
                    // fill charge vector\r
                    chargeVector[0]->push_back(v_charge);\r
@@ -980,12 +1003,17 @@ void AliAnalysisTaskBF::UserExec(Option_t *) {
 \r
            v_eta    = track->Eta();\r
            v_pt     = track->Pt();\r
-           \r
+           v_y      = track->Y();\r
+\r
            if( v_pt < fPtMin || v_pt > fPtMax)      \r
              continue;\r
-           if( v_eta < fEtaMin || v_eta > fEtaMax)  \r
-             continue;\r
-           \r
+           if (!fUsePID) {\r
+             if( v_eta < fEtaMin || v_eta > fEtaMax)  continue;\r
+           }\r
+           else if (fUsePID){\r
+             if( v_y < fEtaMin || v_y > fEtaMax)  continue;\r
+           }\r
+\r
            //analyze one set of particles\r
            if(fUseMCPdgCode) {\r
              TParticle *particle = track->Particle();\r
@@ -1029,7 +1057,6 @@ void AliAnalysisTaskBF::UserExec(Option_t *) {
            }\r
 \r
            v_charge = track->Charge();\r
-           v_y      = track->Y();\r
            v_phi    = track->Phi();\r
            v_E      = track->E();\r
            track->PxPyPz(v_p);\r
@@ -1038,6 +1065,9 @@ void AliAnalysisTaskBF::UserExec(Option_t *) {
            fHistPt->Fill(v_pt);\r
            fHistEta->Fill(v_eta);\r
            fHistPhi->Fill(v_phi);\r
+           fHistRapidity->Fill(v_y);\r
+           if(v_charge > 0) fHistPhiPos->Fill(v_phi);\r
+           else if(v_charge < 0) fHistPhiNeg->Fill(v_phi);\r
 \r
            //Flow after burner\r
            if(fUseFlowAfterBurner) {\r

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.h b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.h
index e822c0f1f17dfbca9a262eef51db1d08abdd0aa5..40281205bcc218d72b9438023734ec05b1903f61 100755 (executable)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.h
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBF.h
@@ -151,9 +151,12 @@ class AliAnalysisTaskBF : public AliAnalysisTaskSE {
   TH1F *fHistChi2;//\r
   TH1F *fHistPt;//\r
   TH1F *fHistEta;//\r
+  TH1F *fHistRapidity;//\r
   TH1F *fHistPhi;//\r
   TH1F *fHistPhiBefore;//\r
   TH1F *fHistPhiAfter;//\r
+  TH1F *fHistPhiPos;//\r
+  TH1F *fHistPhiNeg;//\r
   TH2F *fHistV0M;//\r
   TH2F *fHistRefTracks;//\r
 \r

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx
index 63aa6a4f05c2bed3ca531beec5653faf0ecbb79b..74ef47158616dd1cf1d91a59ec0219020c9ee767 100755 (executable)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx
@@ -64,9 +64,12 @@ AliAnalysisTaskBFPsi::AliAnalysisTaskBFPsi(const char *name)
   fHistChi2(0),\r
   fHistPt(0),\r
   fHistEta(0),\r
+  fHistRapidity(0),\r
   fHistPhi(0),\r
   fHistPhiBefore(0),\r
   fHistPhiAfter(0),\r
+  fHistPhiPos(0),\r
+  fHistPhiNeg(0),\r
   fHistV0M(0),\r
   fHistRefTracks(0),\r
   fHistdEdxVsPTPCbeforePID(NULL),\r
@@ -249,12 +252,18 @@ void AliAnalysisTaskBFPsi::UserCreateOutputObjects() {
   fList->Add(fHistPt);\r
   fHistEta  = new TH1F("fHistEta","#eta distribution",200,-2,2);\r
   fList->Add(fHistEta);\r
+  fHistRapidity  = new TH1F("fHistRapidity","y distribution",200,-2,2);\r
+  fList->Add(fHistRapidity);\r
   fHistPhi  = new TH1F("fHistPhi","#phi distribution",200,-20,380);\r
   fList->Add(fHistPhi);\r
   fHistPhiBefore  = new TH1F("fHistPhiBefore","#phi distribution",200,0.,2*TMath::Pi());\r
   fList->Add(fHistPhiBefore);\r
   fHistPhiAfter  = new TH1F("fHistPhiAfter","#phi distribution",200,0.,2*TMath::Pi());\r
   fList->Add(fHistPhiAfter);\r
+  fHistPhiPos  = new TH1F("fHistPhiPos","#phi distribution for positive particles",200,-20,380);\r
+  fList->Add(fHistPhiPos);\r
+  fHistPhiNeg  = new TH1F("fHistPhiNeg","#phi distribution for negative particles",200,-20,380);\r
+  fList->Add(fHistPhiNeg);\r
   fHistV0M  = new TH2F("fHistV0M","V0 Multiplicity C vs. A",500, 0, 20000, 500, 0, 20000);\r
   fList->Add(fHistV0M);\r
   TString gRefTrackName[6] = {"tracks","tracksPos","tracksNeg","tracksTPConly","clusITS0","clusITS1"};\r
@@ -443,8 +452,8 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
                  if(ep) \r
                    gVZEROEventPlane = ep->CalculateVZEROEventPlane(gESD,10,2,qxTot,qyTot);\r
                  if(gVZEROEventPlane < 0.) gVZEROEventPlane += TMath::Pi();\r
-                 fHistEventPlane->Fill(gVZEROEventPlane);\r
                  gReactionPlane = gVZEROEventPlane*TMath::RadToDeg();\r
+                 fHistEventPlane->Fill(gReactionPlane);\r
                  //========Get the VZERO event plane========//\r
 \r
                  //Printf("There are %d tracks in this event", gESD->GetNumberOfTracks());\r
@@ -595,6 +604,9 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
                    fHistPt->Fill(v_pt);\r
                    fHistEta->Fill(v_eta);\r
                    fHistPhi->Fill(v_phi);\r
+                   fHistRapidity->Fill(v_y);\r
+                   if(v_charge > 0) fHistPhiPos->Fill(v_phi);\r
+                   else if(v_charge < 0) fHistPhiNeg->Fill(v_phi);\r
 \r
                    // fill charge vector\r
                    chargeVector[0]->push_back(v_charge);\r
@@ -710,8 +722,8 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
                  if(ep) \r
                    gVZEROEventPlane = ep->CalculateVZEROEventPlane(gAOD,10,2,qxTot,qyTot);\r
                  if(gVZEROEventPlane < 0.) gVZEROEventPlane += TMath::Pi();\r
-                 fHistEventPlane->Fill(gVZEROEventPlane);\r
                  gReactionPlane = gVZEROEventPlane*TMath::RadToDeg();\r
+                 fHistEventPlane->Fill(gReactionPlane);\r
                  //========Get the VZERO event plane========//\r
 \r
                  //Printf("There are %d tracks in this event", gAOD->GetNumberOfTracks());\r
@@ -743,8 +755,13 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
                    \r
                    // Kinematics cuts from ESD track cuts\r
                    if( v_pt < fPtMin || v_pt > fPtMax)      continue;\r
-                   if( v_eta < fEtaMin || v_eta > fEtaMax)  continue;\r
-                   \r
+                   if (!fUsePID) {\r
+                     if( v_eta < fEtaMin || v_eta > fEtaMax)  continue;\r
+                   }\r
+                   else if (fUsePID){\r
+                     if( v_y < fEtaMin || v_y > fEtaMax)  continue;\r
+                   }\r
+\r
                    // Extra DCA cuts (for systematic studies [!= -1])\r
                    if( fDCAxyCut != -1 && fDCAxyCut != -1){\r
                      if(TMath::Sqrt((DCAxy*DCAxy)/(fDCAxyCut*fDCAxyCut)+(DCAz*DCAz)/(fDCAzCut*fDCAzCut)) > 1 ){\r
@@ -767,6 +784,9 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
                    fHistPt->Fill(v_pt);\r
                    fHistEta->Fill(v_eta);\r
                    fHistPhi->Fill(v_phi);\r
+                   fHistRapidity->Fill(v_y);\r
+                   if(v_charge > 0) fHistPhiPos->Fill(v_phi);\r
+                   else if(v_charge < 0) fHistPhiNeg->Fill(v_phi);\r
 \r
                    // fill charge vector\r
                    chargeVector[0]->push_back(v_charge);\r
@@ -864,8 +884,8 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
                  if(ep) \r
                    gVZEROEventPlane = ep->CalculateVZEROEventPlane(gESD,10,2,qxTot,qyTot);\r
                  if(gVZEROEventPlane < 0.) gVZEROEventPlane += TMath::Pi();\r
-                 fHistEventPlane->Fill(gVZEROEventPlane);\r
                  gReactionPlane = gVZEROEventPlane*TMath::RadToDeg();\r
+                 fHistEventPlane->Fill(gReactionPlane);\r
                  //========Get the VZERO event plane========//\r
 \r
                  //Printf("There are %d tracks in this event", gESD->GetNumberOfTracks());\r
@@ -923,6 +943,9 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
                    fHistPt->Fill(v_pt);\r
                    fHistEta->Fill(v_eta);\r
                    fHistPhi->Fill(v_phi);\r
+                   fHistRapidity->Fill(v_y);\r
+                   if(v_charge > 0) fHistPhiPos->Fill(v_phi);\r
+                   else if(v_charge < 0) fHistPhiNeg->Fill(v_phi);\r
 \r
                    // fill charge vector\r
                    chargeVector[0]->push_back(v_charge);\r
@@ -1022,12 +1045,17 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
 \r
            v_eta    = track->Eta();\r
            v_pt     = track->Pt();\r
-           \r
+           v_y      = track->Y();\r
+\r
            if( v_pt < fPtMin || v_pt > fPtMax)      \r
              continue;\r
-           if( v_eta < fEtaMin || v_eta > fEtaMax)  \r
-             continue;\r
-           \r
+           if (!fUsePID) {\r
+             if( v_eta < fEtaMin || v_eta > fEtaMax)  continue;\r
+           }\r
+           else if (fUsePID){\r
+             if( v_y < fEtaMin || v_y > fEtaMax)  continue;\r
+           }\r
+\r
            //analyze one set of particles\r
            if(fUseMCPdgCode) {\r
              TParticle *particle = track->Particle();\r
@@ -1071,7 +1099,6 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
            }\r
 \r
            v_charge = track->Charge();\r
-           v_y      = track->Y();\r
            v_phi    = track->Phi();\r
            v_E      = track->E();\r
            track->PxPyPz(v_p);\r
@@ -1079,7 +1106,10 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
 \r
            fHistPt->Fill(v_pt);\r
            fHistEta->Fill(v_eta);\r
-           fHistPhi->Fill(v_phi);\r
+           fHistPhi->Fill(v_phi*TMath::RadToDeg());\r
+           fHistRapidity->Fill(v_y);\r
+           if(v_charge > 0) fHistPhiPos->Fill(v_phi*TMath::RadToDeg());\r
+           else if(v_charge < 0) fHistPhiNeg->Fill(v_phi*TMath::RadToDeg());\r
 \r
            //Flow after burner\r
            if(fUseFlowAfterBurner) {\r
@@ -1133,6 +1163,7 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
            gNumberOfAcceptedTracks += 1;\r
                    \r
          } //track loop\r
+         gReactionPlane *= TMath::RadToDeg();\r
        }//Vz cut\r
       }//Vy cut\r
     }//Vx cut\r
@@ -1147,9 +1178,9 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
   \r
   // calculate balance function\r
   if(fUseMultiplicity) \r
-    fBalance->CalculateBalance(gNumberOfAcceptedTracks,gReactionPlane*TMath::RadToDeg(),chargeVector);\r
+    fBalance->CalculateBalance(gNumberOfAcceptedTracks,gReactionPlane,chargeVector);\r
   else                 \r
-    fBalance->CalculateBalance(fCentrality,gReactionPlane*TMath::RadToDeg(),chargeVector);\r
+    fBalance->CalculateBalance(fCentrality,gReactionPlane,chargeVector);\r
 \r
   if(fRunShuffling) {\r
     // shuffle charges\r

diff --git a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h
index 5491da4dab3ba8e8bf2725e592b625c23fac8177..f310133ba0346f8fafd53f8c383d8fef6a5ba74c 100755 (executable)
--- a/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h
+++ b/PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h
@@ -153,9 +153,12 @@ class AliAnalysisTaskBFPsi : public AliAnalysisTaskSE {
   TH1F *fHistChi2;//\r
   TH1F *fHistPt;//\r
   TH1F *fHistEta;//\r
+  TH1F *fHistRapidity;//\r
   TH1F *fHistPhi;//\r
   TH1F *fHistPhiBefore;//\r
   TH1F *fHistPhiAfter;//\r
+  TH1F *fHistPhiPos;//\r
+  TH1F *fHistPhiNeg;//\r
   TH2F *fHistV0M;//\r
   TH2F *fHistRefTracks;//\r
 \r

diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
index 3fc8aa17584388db89cc65007c0f5800fb8660b5..33d41e737357e11aa7ff0a5901d5d3cb21894bce 100644 (file)
--- a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
@@ -400,7 +400,7 @@ void AliBalancePsi::CalculateBalance(Float_t fCentrality,
        qInv = TMath::Sqrt(TMath::Abs(-q0Tot2 + qTot2 ));
        
        //phi
-       dphi = phi1 - phi2;
+       dphi = phi2 - phi1;
        if(dphi < -180.) dphi = 360. + dphi;  //dphi should be between -180 and 180!
        else if(dphi > 180.) dphi = -360. + dphi;  //dphi should be between -180 and 180!
 

diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h
index a5aa8a447a994ad13b22e69633cfa980137d7c7f..db8c51acb678efac62111fcc7a8b194a8632348a 100644 (file)
--- a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h
+++ b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h
@@ -145,8 +145,8 @@ class AliBalancePsi : public TObject {
   Double_t fNnp[ANALYSIS_TYPES][MAXIMUM_STEPS_IN_PSI][MAXIMUM_NUMBER_OF_STEPS]; //N(-+)
   Double_t fNn[ANALYSIS_TYPES][MAXIMUM_STEPS_IN_PSI], fNp[ANALYSIS_TYPES][MAXIMUM_STEPS_IN_PSI]; //number of pos./neg. inside the analyzed interval
   
-  Double_t fB[ANALYSIS_TYPES][MAXIMUM_NUMBER_OF_STEPS][MAXIMUM_STEPS_IN_PSI]; //BF matrix
-  Double_t ferror[ANALYSIS_TYPES][MAXIMUM_NUMBER_OF_STEPS][MAXIMUM_STEPS_IN_PSI]; //error of the BF
+  Double_t fB[ANALYSIS_TYPES][MAXIMUM_STEPS_IN_PSI][MAXIMUM_NUMBER_OF_STEPS]; //BF matrix
+  Double_t ferror[ANALYSIS_TYPES][MAXIMUM_STEPS_IN_PSI][MAXIMUM_NUMBER_OF_STEPS]; //error of the BF
   
   TH3D *fHistP[ANALYSIS_TYPES]; //N+
   TH3D *fHistN[ANALYSIS_TYPES]; //N-