changing correlation loop over tracks in mixing mode (not breaking if N2 gt N1)

diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
index 148b8d4133984bbd1ae827950606a6d28d0b6d52..7d4adede9551bf3543b905bc4581cf5b0d4a805b 100644 (file)
--- a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
@@ -344,13 +344,8 @@ void AliBalancePsi::CalculateBalance(Double_t gReactionPlane,
     if(charge1 > 0)      fHistP->Fill(trackVariablesSingle,0,1.); 
     else if(charge1 < 0) fHistN->Fill(trackVariablesSingle,0,1.);  
     
-    // 2nd particle loop (only for j < i for non double counting in the same pT region)
-    // --> SAME pT region for trigger and assoc: NO double counting with this
-    // --> DIFF pT region for trigger and assoc: Missing assoc. particles with j > i to a trigger i 
-    //                          --> can be handled afterwards by using assoc. as trigger as well ?!     
-    for(Int_t j = 0; j < iMax; j++) {  
-      if (particlesMixed && j == jMax-1 )  // if the mixed track number is smaller than the main event one 
-       break;
+    // 2nd particle loop 
+    for(Int_t j = 0; j < jMax; j++) {  
 
       if(j == i) continue; // no auto correlations
       

diff --git a/PWGCF/EBYE/macros/drawCorrelationFunctionPsi.C b/PWGCF/EBYE/macros/drawCorrelationFunctionPsi.C
index feb5a0f2ae42221362f7ae63dec37a274cd97fcc..152c854fead4386892df00ffd7c02a27a5ebb56c 100644 (file)
--- a/PWGCF/EBYE/macros/drawCorrelationFunctionPsi.C
+++ b/PWGCF/EBYE/macros/drawCorrelationFunctionPsi.C
@@ -1,5 +1,5 @@
-const Int_t numberOfCentralityBins = 9;
-TString centralityArray[numberOfCentralityBins] = {"0-10","10-20","20-30","30-40","40-50","50-60","60-70","70-80","0-100"};
+const Int_t numberOfCentralityBins = 12;
+TString centralityArray[numberOfCentralityBins] = {"0-10","10-20","20-30","30-40","40-50","50-60","60-70","70-80","0-100","0-1","1-2","2-3"};
 
 const Int_t gRebin = 1;
 
@@ -385,27 +385,35 @@ void draw(TList *list, TList *listBFShuffled, TList *listBFMixed, TList *listQA,
 
   // if no mixing then divide by convoluted histograms
   if(!listBFMixed && listQA){
-    
-    TH2D* fHistPos = (TH2D*)((TH3D*)listQA->FindObject("fHistEtaPhiPos"))->Project3D("xy");
-    fHistPos->GetYaxis()->SetRangeUser(-0.79,0.79);
-    //fHistPos->Rebin2D(3,2);
-    
-    TH2D* fHistNeg = (TH2D*)((TH3D*)listQA->FindObject("fHistEtaPhiNeg"))->Project3D("xy");
-    fHistNeg->GetYaxis()->SetRangeUser(-0.79,0.79);
-    //fHistNeg->Rebin2D(3,2);
-
-    gHistPN[2] = convolute2D(fHistPos, fHistNeg, "hConvPN");
-    gHistPN[2]->Scale(1./gHistPN[2]->GetBinContent(gHistPN[2]->FindBin(0,0)));
 
-    gHistNP[2] = convolute2D(fHistNeg, fHistPos, "hConvNP");
-    gHistNP[2]->Scale(1./gHistNP[2]->GetBinContent(gHistNP[2]->FindBin(0,0)));
+    if(!listQA->FindObject("fHistEtaPhiPos") || !listQA->FindObject("fHistEtaPhiNeg")){
 
-    gHistNN[2] = convolute2D(fHistNeg, fHistNeg, "hConvNN");
-    gHistNN[2]->Scale(1./gHistNN[2]->GetBinContent(gHistNN[2]->FindBin(0,0)));
+      Printf("fHistEtaPhiPos or fHistEtaPhiNeg not found! --> no convolution");
+      listQA = NULL;
 
-    gHistPP[2] = convolute2D(fHistPos, fHistPos, "hConvPP");
-    gHistPP[2]->Scale(1./gHistPP[2]->GetBinContent(gHistPP[2]->FindBin(0,0)));
+    }
+    else{ 
 
+      TH2D* fHistPos = (TH2D*)((TH3D*)listQA->FindObject("fHistEtaPhiPos"))->Project3D("xy");
+      fHistPos->GetYaxis()->SetRangeUser(-0.79,0.79);
+      //fHistPos->Rebin2D(3,2);
+      
+      TH2D* fHistNeg = (TH2D*)((TH3D*)listQA->FindObject("fHistEtaPhiNeg"))->Project3D("xy");
+      fHistNeg->GetYaxis()->SetRangeUser(-0.79,0.79);
+      //fHistNeg->Rebin2D(3,2);
+      
+      gHistPN[2] = convolute2D(fHistPos, fHistNeg, "hConvPN");
+      gHistPN[2]->Scale(1./gHistPN[2]->GetBinContent(gHistPN[2]->FindBin(0,0)));
+      
+      gHistNP[2] = convolute2D(fHistNeg, fHistPos, "hConvNP");
+      gHistNP[2]->Scale(1./gHistNP[2]->GetBinContent(gHistNP[2]->FindBin(0,0)));
+      
+      gHistNN[2] = convolute2D(fHistNeg, fHistNeg, "hConvNN");
+      gHistNN[2]->Scale(1./gHistNN[2]->GetBinContent(gHistNN[2]->FindBin(0,0)));
+      
+      gHistPP[2] = convolute2D(fHistPos, fHistPos, "hConvPP");
+      gHistPP[2]->Scale(1./gHistPP[2]->GetBinContent(gHistPP[2]->FindBin(0,0)));
+    }
   }
   
   //(+-)