]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Adding some more QA plots + trying to fix the delta phi analysis
authorpchrist <pchrist@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 8 May 2012 22:04:35 +0000 (22:04 +0000)
committerpchrist <pchrist@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 8 May 2012 22:04:35 +0000 (22:04 +0000)
PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.cxx
PWGCF/EBYE/BalanceFunctions/AliAnalysisTaskBFPsi.h
PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx

index 256fed3f2fcbdc56948d152b2be214de8fd79ea2..3fc7bfc90508520793898e48a14c1dab455eceff 100755 (executable)
@@ -205,9 +205,9 @@ void AliAnalysisTaskBFPsi::UserCreateOutputObjects() {
   //Event stats.\r
   TString gCutName[4] = {"Total","Offline trigger",\r
                          "Vertex","Analyzed"};\r
-  fHistEventStats = new TH1F("fHistEventStats",\r
-                             "Event statistics;;N_{events}",\r
-                             4,0.5,4.5);\r
+  fHistEventStats = new TH2F("fHistEventStats",\r
+                             "Event statistics;;Centrality percentile;N_{events}",\r
+                             4,0.5,4.5,220,-5,105);\r
   for(Int_t i = 1; i <= 4; i++)\r
     fHistEventStats->GetXaxis()->SetBinLabel(i,gCutName[i-1].Data());\r
   fList->Add(fHistEventStats);\r
@@ -226,7 +226,7 @@ void AliAnalysisTaskBFPsi::UserCreateOutputObjects() {
   fHistTrackStats = new TH1F("fHistTrackStats","Event statistics;TrackFilterBit;N_{events}",130,0,130);\r
   fList->Add(fHistTrackStats);\r
 \r
-  fHistNumberOfAcceptedTracks = new TH1F("fHistNumberOfAcceptedTracks",";N_{acc.};Entries",4001,-0.5,4000.5);\r
+  fHistNumberOfAcceptedTracks = new TH2F("fHistNumberOfAcceptedTracks",";N_{acc.};Centrality percentile;Entries",4001,-0.5,4000.5,220,-5,105);\r
   fList->Add(fHistNumberOfAcceptedTracks);\r
 \r
   // Vertex distributions\r
@@ -234,35 +234,35 @@ void AliAnalysisTaskBFPsi::UserCreateOutputObjects() {
   fList->Add(fHistVx);\r
   fHistVy = new TH1F("fHistVy","Primary vertex distribution - y coordinate;V_{y} (cm);Entries",100,-0.5,0.5);\r
   fList->Add(fHistVy);\r
-  fHistVz = new TH1F("fHistVz","Primary vertex distribution - z coordinate;V_{z} (cm);Entries",100,-20.,20.);\r
+  fHistVz = new TH2F("fHistVz","Primary vertex distribution - z coordinate;V_{z} (cm);Centrality percentile;Entries",100,-20.,20.,220,-5,105);\r
   fList->Add(fHistVz);\r
 \r
   //Event plane\r
-  fHistEventPlane = new TH1F("fHistEventPlane",";#Psi_{2} [deg.];Counts",100,0,360.);\r
+  fHistEventPlane = new TH2F("fHistEventPlane",";#Psi_{2} [deg.];Centrality percentile;Counts",100,0,360.,220,-5,105);\r
   fList->Add(fHistEventPlane);\r
 \r
   // QA histograms\r
   fHistClus = new TH2F("fHistClus","# Cluster (TPC vs. ITS)",10,0,10,200,0,200);\r
   fList->Add(fHistClus);\r
-  fHistChi2 = new TH1F("fHistChi2","Chi2/NDF distribution",200,0,10);\r
+  fHistChi2 = new TH2F("fHistChi2","Chi2/NDF distribution;#chi^{2}/ndf;Centrality percentile",200,0,10,220,-5,105);\r
   fList->Add(fHistChi2);\r
   fHistDCA  = new TH2F("fHistDCA","DCA (xy vs. z)",400,-5,5,400,-5,5); \r
   fList->Add(fHistDCA);\r
-  fHistPt   = new TH1F("fHistPt","p_{T} distribution",200,0,10);\r
+  fHistPt   = new TH2F("fHistPt","p_{T} distribution;p_{T} (GeV/c);Centrality percentile",200,0,10,220,-5,105);\r
   fList->Add(fHistPt);\r
-  fHistEta  = new TH1F("fHistEta","#eta distribution",200,-2,2);\r
+  fHistEta  = new TH2F("fHistEta","#eta distribution;#eta;Centrality percentile",200,-2,2,220,-5,105);\r
   fList->Add(fHistEta);\r
-  fHistRapidity  = new TH1F("fHistRapidity","y distribution",200,-2,2);\r
+  fHistRapidity  = new TH2F("fHistRapidity","y distribution;y;Centrality percentile",200,-2,2,220,-5,105);\r
   fList->Add(fHistRapidity);\r
-  fHistPhi  = new TH1F("fHistPhi","#phi distribution",200,-20,380);\r
+  fHistPhi  = new TH2F("fHistPhi","#phi distribution;#phi;Centrality percentile",200,-20,380,220,-5,105);\r
   fList->Add(fHistPhi);\r
-  fHistPhiBefore  = new TH1F("fHistPhiBefore","#phi distribution",200,0.,2*TMath::Pi());\r
+  fHistPhiBefore  = new TH2F("fHistPhiBefore","#phi distribution;#phi;Centrality percentile",200,0.,2*TMath::Pi(),220,-5,105);\r
   fList->Add(fHistPhiBefore);\r
-  fHistPhiAfter  = new TH1F("fHistPhiAfter","#phi distribution",200,0.,2*TMath::Pi());\r
+  fHistPhiAfter  = new TH2F("fHistPhiAfter","#phi distribution;#phi;Centrality percentile",200,0.,2*TMath::Pi(),220,-5,105);\r
   fList->Add(fHistPhiAfter);\r
-  fHistPhiPos  = new TH1F("fHistPhiPos","#phi distribution for positive particles",200,-20,380);\r
+  fHistPhiPos  = new TH2F("fHistPhiPos","#phi distribution for positive particles;#phi;Centrality percentile",200,-20,380,220,-5,105);\r
   fList->Add(fHistPhiPos);\r
-  fHistPhiNeg  = new TH1F("fHistPhiNeg","#phi distribution for negative particles",200,-20,380);\r
+  fHistPhiNeg  = new TH2F("fHistPhiNeg","#phi distribution for negative particles;#phi;Centrality percentile",200,-20,380,220,-5,105);\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
@@ -409,12 +409,12 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
     fHistTriggerStats->Fill(((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected());\r
 \r
     // event selection done in AliAnalysisTaskSE::Exec() --> this is not used\r
-    fHistEventStats->Fill(1); //all events\r
+    fHistEventStats->Fill(1,fCentrality); //all events\r
     Bool_t isSelected = kTRUE;\r
     if(fUseOfflineTrigger)\r
       isSelected = ((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected();\r
     if(isSelected) {\r
-      fHistEventStats->Fill(2); //triggered events\r
+      fHistEventStats->Fill(2,fCentrality); //triggered events\r
 \r
       if(fUseCentrality) {\r
        //Centrality stuff\r
@@ -436,14 +436,14 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
       if(vertex) {\r
        if(vertex->GetNContributors() > 0) {\r
          if(vertex->GetZRes() != 0) {\r
-           fHistEventStats->Fill(3); //events with a proper vertex\r
+           fHistEventStats->Fill(3,fCentrality); //events with a proper vertex\r
            if(TMath::Abs(vertex->GetXv()) < fVxMax) {\r
              if(TMath::Abs(vertex->GetYv()) < fVyMax) {\r
                if(TMath::Abs(vertex->GetZv()) < fVzMax) {\r
-                 fHistEventStats->Fill(4); //analayzed events\r
+                 fHistEventStats->Fill(4,fCentrality); //analayzed events\r
                  fHistVx->Fill(vertex->GetXv());\r
                  fHistVy->Fill(vertex->GetYv());\r
-                 fHistVz->Fill(vertex->GetZv());\r
+                 fHistVz->Fill(vertex->GetZv(),fCentrality);\r
                  \r
                  //========Get the VZERO event plane========//\r
                  Double_t gVZEROEventPlane = -10.0;\r
@@ -453,7 +453,7 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
                    gVZEROEventPlane = ep->CalculateVZEROEventPlane(gESD,10,2,qxTot,qyTot);\r
                  if(gVZEROEventPlane < 0.) gVZEROEventPlane += TMath::Pi();\r
                  gReactionPlane = gVZEROEventPlane*TMath::RadToDeg();\r
-                 fHistEventPlane->Fill(gReactionPlane);\r
+                 fHistEventPlane->Fill(gReactionPlane,fCentrality);\r
                  //========Get the VZERO event plane========//\r
 \r
                  //Printf("There are %d tracks in this event", gESD->GetNumberOfTracks());\r
@@ -600,13 +600,13 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
                    track_TPC->PxPyPz(v_p);\r
                    fHistClus->Fill(track_TPC->GetITSclusters(0),nClustersTPC);\r
                    fHistDCA->Fill(b[1],b[0]);\r
-                   fHistChi2->Fill(chi2PerClusterTPC);\r
-                   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
+                   fHistChi2->Fill(chi2PerClusterTPC,fCentrality);\r
+                   fHistPt->Fill(v_pt,fCentrality);\r
+                   fHistEta->Fill(v_eta,fCentrality);\r
+                   fHistPhi->Fill(v_phi,fCentrality);\r
+                   fHistRapidity->Fill(v_y,fCentrality);\r
+                   if(v_charge > 0) fHistPhiPos->Fill(v_phi,fCentrality);\r
+                   else if(v_charge < 0) fHistPhiNeg->Fill(v_phi,fCentrality);\r
 \r
                    // fill charge vector\r
                    chargeVector[0]->push_back(v_charge);\r
@@ -657,12 +657,12 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
     fHistTriggerStats->Fill(aodHeader->GetOfflineTrigger());\r
     \r
     // event selection done in AliAnalysisTaskSE::Exec() --> this is not used\r
-    fHistEventStats->Fill(1); //all events\r
+    fHistEventStats->Fill(1,fCentrality); //all events\r
     Bool_t isSelected = kTRUE;\r
     if(fUseOfflineTrigger)\r
       isSelected = ((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected();\r
     if(isSelected) {\r
-      fHistEventStats->Fill(2); //triggered events\r
+      fHistEventStats->Fill(2,fCentrality); //triggered events\r
                  \r
       //Centrality stuff (centrality in AOD header)\r
       if(fUseCentrality) {\r
@@ -706,14 +706,14 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
        \r
        if(vertex->GetNContributors() > 0) {\r
          if(fCov[5] != 0) {\r
-           fHistEventStats->Fill(3); //events with a proper vertex\r
+           fHistEventStats->Fill(3,fCentrality); //events with a proper vertex\r
            if(TMath::Abs(vertex->GetX()) < fVxMax) {\r
              if(TMath::Abs(vertex->GetY()) < fVyMax) {\r
                if(TMath::Abs(vertex->GetZ()) < fVzMax) {\r
-                 fHistEventStats->Fill(4); //analyzed events\r
+                 fHistEventStats->Fill(4,fCentrality); //analyzed events\r
                  fHistVx->Fill(vertex->GetX());\r
                  fHistVy->Fill(vertex->GetY());\r
-                 fHistVz->Fill(vertex->GetZ());\r
+                 fHistVz->Fill(vertex->GetZ(),fCentrality);\r
        \r
                  //========Get the VZERO event plane========//\r
                  Double_t gVZEROEventPlane = -10.0;\r
@@ -780,13 +780,13 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
                    // fill QA histograms\r
                    fHistClus->Fill(aodTrack->GetITSNcls(),aodTrack->GetTPCNcls());\r
                    fHistDCA->Fill(DCAz,DCAxy);\r
-                   fHistChi2->Fill(aodTrack->Chi2perNDF());\r
-                   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
+                   fHistChi2->Fill(aodTrack->Chi2perNDF(),fCentrality);\r
+                   fHistPt->Fill(v_pt,fCentrality);\r
+                   fHistEta->Fill(v_eta,fCentrality);\r
+                   fHistPhi->Fill(v_phi,fCentrality);\r
+                   fHistRapidity->Fill(v_y,fCentrality);\r
+                   if(v_charge > 0) fHistPhiPos->Fill(v_phi,fCentrality);\r
+                   else if(v_charge < 0) fHistPhiNeg->Fill(v_phi,fCentrality);\r
 \r
                    // fill charge vector\r
                    chargeVector[0]->push_back(v_charge);\r
@@ -841,12 +841,12 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
     fHistTriggerStats->Fill(((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected());\r
 \r
     // event selection done in AliAnalysisTaskSE::Exec() --> this is not used\r
-    fHistEventStats->Fill(1); //all events\r
+    fHistEventStats->Fill(1,fCentrality); //all events\r
     Bool_t isSelected = kTRUE;\r
     if(fUseOfflineTrigger)\r
       isSelected = ((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected();\r
     if(isSelected) {\r
-      fHistEventStats->Fill(2); //triggered events\r
+      fHistEventStats->Fill(2,fCentrality); //triggered events\r
 \r
       if(fUseCentrality) {\r
        //Centrality stuff\r
@@ -868,14 +868,14 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
       if(vertex) {\r
        if(vertex->GetNContributors() > 0) {\r
          if(vertex->GetZRes() != 0) {\r
-           fHistEventStats->Fill(3); //events with a proper vertex\r
+           fHistEventStats->Fill(3,fCentrality); //events with a proper vertex\r
            if(TMath::Abs(vertex->GetXv()) < fVxMax) {\r
              if(TMath::Abs(vertex->GetYv()) < fVyMax) {\r
                if(TMath::Abs(vertex->GetZv()) < fVzMax) {\r
-                 fHistEventStats->Fill(4); //analayzed events\r
+                 fHistEventStats->Fill(4,fCentrality); //analayzed events\r
                  fHistVx->Fill(vertex->GetXv());\r
                  fHistVy->Fill(vertex->GetYv());\r
-                 fHistVz->Fill(vertex->GetZv());\r
+                 fHistVz->Fill(vertex->GetZv(),fCentrality);\r
                  \r
                  //========Get the VZERO event plane========//\r
                  Double_t gVZEROEventPlane = -10.0;\r
@@ -885,7 +885,7 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
                    gVZEROEventPlane = ep->CalculateVZEROEventPlane(gESD,10,2,qxTot,qyTot);\r
                  if(gVZEROEventPlane < 0.) gVZEROEventPlane += TMath::Pi();\r
                  gReactionPlane = gVZEROEventPlane*TMath::RadToDeg();\r
-                 fHistEventPlane->Fill(gReactionPlane);\r
+                 fHistEventPlane->Fill(gReactionPlane,fCentrality);\r
                  //========Get the VZERO event plane========//\r
 \r
                  //Printf("There are %d tracks in this event", gESD->GetNumberOfTracks());\r
@@ -939,13 +939,13 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
 \r
                    fHistClus->Fill(track_TPC->GetITSclusters(0),nClustersTPC);\r
                    fHistDCA->Fill(b[1],b[0]);\r
-                   fHistChi2->Fill(chi2PerClusterTPC);\r
-                   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
+                   fHistChi2->Fill(chi2PerClusterTPC,fCentrality);\r
+                   fHistPt->Fill(v_pt,fCentrality);\r
+                   fHistEta->Fill(v_eta,fCentrality);\r
+                   fHistPhi->Fill(v_phi,fCentrality);\r
+                   fHistRapidity->Fill(v_y,fCentrality);\r
+                   if(v_charge > 0) fHistPhiPos->Fill(v_phi,fCentrality);\r
+                   else if(v_charge < 0) fHistPhiNeg->Fill(v_phi,fCentrality);\r
 \r
                    // fill charge vector\r
                    chargeVector[0]->push_back(v_charge);\r
@@ -990,8 +990,8 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
       Printf("ERROR: mcEvent not available");\r
       return;\r
     }\r
-    fHistEventStats->Fill(1); //total events\r
-    fHistEventStats->Fill(2); //offline trigger\r
+    fHistEventStats->Fill(1,fCentrality); //total events\r
+    fHistEventStats->Fill(2,fCentrality); //offline trigger\r
 \r
     Double_t gImpactParameter = 0.;\r
     if(fUseCentrality) {\r
@@ -1007,7 +1007,7 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
        fCentrality = gImpactParameter;\r
       }\r
       fCentrality = gImpactParameter;\r
-      fHistEventPlane->Fill(gReactionPlane*TMath::RadToDeg());\r
+      fHistEventPlane->Fill(gReactionPlane*TMath::RadToDeg(),fCentrality);\r
 \r
       // take only events inside centrality class (DIDN'T CHANGE THIS UP TO NOW)\r
       if((fImpactParameterMin > gImpactParameter) || (fImpactParameterMax < gImpactParameter))\r
@@ -1023,14 +1023,14 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
     //gVertexArray.At(0),\r
     //gVertexArray.At(1),\r
     //gVertexArray.At(2));\r
-    fHistEventStats->Fill(3); //events with a proper vertex\r
+    fHistEventStats->Fill(3,fCentrality); //events with a proper vertex\r
     if(TMath::Abs(gVertexArray.At(0)) < fVxMax) {\r
       if(TMath::Abs(gVertexArray.At(1)) < fVyMax) {\r
        if(TMath::Abs(gVertexArray.At(2)) < fVzMax) {\r
-         fHistEventStats->Fill(4); //analayzed events\r
+         fHistEventStats->Fill(4,fCentrality); //analayzed events\r
          fHistVx->Fill(gVertexArray.At(0));\r
          fHistVy->Fill(gVertexArray.At(1));\r
-         fHistVz->Fill(gVertexArray.At(2));\r
+         fHistVz->Fill(gVertexArray.At(2),fCentrality);\r
          \r
          Printf("There are %d tracks in this event", mcEvent->GetNumberOfPrimaries());\r
          for (Int_t iTracks = 0; iTracks < mcEvent->GetNumberOfPrimaries(); iTracks++) {\r
@@ -1104,12 +1104,12 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
            track->PxPyPz(v_p);\r
            //Printf("phi (before): %lf",v_phi);\r
 \r
-           fHistPt->Fill(v_pt);\r
-           fHistEta->Fill(v_eta);\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
+           fHistPt->Fill(v_pt,fCentrality);\r
+           fHistEta->Fill(v_eta,fCentrality);\r
+           fHistPhi->Fill(v_phi*TMath::RadToDeg(),fCentrality);\r
+           fHistRapidity->Fill(v_y,fCentrality);\r
+           if(v_charge > 0) fHistPhiPos->Fill(v_phi*TMath::RadToDeg(),fCentrality);\r
+           else if(v_charge < 0) fHistPhiNeg->Fill(v_phi*TMath::RadToDeg(),fCentrality);\r
 \r
            //Flow after burner\r
            if(fUseFlowAfterBurner) {\r
@@ -1129,11 +1129,11 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
              //Printf("phi (after): %lf\n",v_phi);\r
                      Double_t v_DeltaphiBefore = phi0 - gReactionPlane;\r
              if(v_DeltaphiBefore < 0) v_DeltaphiBefore += 2*TMath::Pi();\r
-             fHistPhiBefore->Fill(v_DeltaphiBefore);\r
+             fHistPhiBefore->Fill(v_DeltaphiBefore,fCentrality);\r
 \r
              Double_t v_DeltaphiAfter = v_phi - gReactionPlane;\r
              if(v_DeltaphiAfter < 0) v_DeltaphiAfter += 2*TMath::Pi();\r
-             fHistPhiAfter->Fill(v_DeltaphiAfter);\r
+             fHistPhiAfter->Fill(v_DeltaphiAfter,fCentrality);\r
            }\r
            \r
            v_phi *= TMath::RadToDeg();\r
@@ -1174,7 +1174,7 @@ void AliAnalysisTaskBFPsi::UserExec(Option_t *) {
     if((gNumberOfAcceptedTracks < fNumberOfAcceptedTracksMin)||(gNumberOfAcceptedTracks > fNumberOfAcceptedTracksMax))\r
       return;\r
   }\r
-  fHistNumberOfAcceptedTracks->Fill(gNumberOfAcceptedTracks);\r
+  fHistNumberOfAcceptedTracks->Fill(gNumberOfAcceptedTracks,fCentrality);\r
   \r
   // calculate balance function\r
   if(fUseMultiplicity) \r
index f310133ba0346f8fafd53f8c383d8fef6a5ba74c..1be5ee9ddb036791d728a3342170bf693dcab033 100755 (executable)
@@ -138,27 +138,27 @@ class AliAnalysisTaskBFPsi : public AliAnalysisTaskSE {
   TList *fListBFS; //fList object\r
   TList *fHistListPIDQA;  //! list of histograms\r
 \r
-  TH1F *fHistEventStats; //event stats\r
+  TH2F *fHistEventStats; //event stats\r
   TH2F *fHistCentStats; //centrality stats\r
   TH1F *fHistTriggerStats; //trigger stats\r
   TH1F *fHistTrackStats; //Track filter bit stats\r
   TH1F *fHistVx; //x coordinate of the primary vertex\r
   TH1F *fHistVy; //y coordinate of the primary vertex\r
-  TH1F *fHistVz; //z coordinate of the primary vertex\r
+  TH2F *fHistVz; //z coordinate of the primary vertex\r
 \r
-  TH1F *fHistEventPlane; //event plane distribution\r
+  TH2F *fHistEventPlane; //event plane distribution\r
 \r
   TH2F *fHistClus;//\r
   TH2F *fHistDCA;//\r
-  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 *fHistChi2;//\r
+  TH2F *fHistPt;//\r
+  TH2F *fHistEta;//\r
+  TH2F *fHistRapidity;//\r
+  TH2F *fHistPhi;//\r
+  TH2F *fHistPhiBefore;//\r
+  TH2F *fHistPhiAfter;//\r
+  TH2F *fHistPhiPos;//\r
+  TH2F *fHistPhiNeg;//\r
   TH2F *fHistV0M;//\r
   TH2F *fHistRefTracks;//\r
 \r
@@ -203,7 +203,7 @@ class AliAnalysisTaskBFPsi : public AliAnalysisTaskSE {
   Bool_t fUseMultiplicity;//use the multiplicity cuts\r
   Int_t fNumberOfAcceptedTracksMin;//min. number of number of accepted tracks (used for the multiplicity dependence study - pp)\r
   Int_t fNumberOfAcceptedTracksMax;//max. number of number of accepted tracks (used for the multiplicity dependence study - pp)\r
-  TH1F *fHistNumberOfAcceptedTracks;//hisot to store the number of accepted tracks\r
+  TH2F *fHistNumberOfAcceptedTracks;//hisot to store the number of accepted tracks\r
 \r
   Bool_t fUseOfflineTrigger;//Usage of the offline trigger selection\r
 \r
index 33d41e737357e11aa7ff0a5901d5d3cb21894bce..d72f81d0db619b0c978cb4049c3fb52d5e8b4e97 100644 (file)
@@ -401,8 +401,8 @@ void AliBalancePsi::CalculateBalance(Float_t fCentrality,
        
        //phi
        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!
+       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!
 
        //0:y - 1:eta - 2:Qlong - 3:Qout - 4:Qside - 5:Qinv - 6:phi
        if((rap1 >= fP1Start[kRapidity]) && (rap1 <= fP1Stop[kRapidity]) && (rap2 >= fP1Start[kRapidity]) && (rap2 <= fP1Stop[kRapidity])) {