disabling vtx bins by default

diff --git a/PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.cxx b/PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.cxx
index 3011bd8bfa7f509f04e4b442e70f62c5f6ff36df..dbf704c46d3b6350f4d430dd8fadd2b8106b044e 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.cxx
@@ -216,12 +216,17 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
   Int_t nCentralityBins  = fHistos->GetUEHist(2)->GetEventHist()->GetNBins(1);
   Double_t* centralityBins = (Double_t*) fHistos->GetUEHist(2)->GetEventHist()->GetAxis(1, 0)->GetXbins()->GetArray();
   
-  Int_t nZvtxBins  = fHistos->GetUEHist(2)->GetEventHist()->GetNBins(2);
-  Double_t* zvtxbin = (Double_t*) fHistos->GetUEHist(2)->GetEventHist()->GetAxis(2, 0)->GetXbins()->GetArray();
+  Int_t nZvtxBins  = 7;
+  Double_t vertexBins[] = { -7, -5, -3, -1, 1, 3, 5, 7 };
+  Double_t* zvtxbin = vertexBins;
+  
+  if (fHistos->GetUEHist(2)->GetEventHist()->GetNVar() > 2)
+  {
+    nZvtxBins = fHistos->GetUEHist(2)->GetEventHist()->GetNBins(2);
+    zvtxbin = (Double_t*) fHistos->GetUEHist(2)->GetEventHist()->GetAxis(2, 0)->GetXbins()->GetArray();
+  }
 
   fPoolMgr = new AliEventPoolManager(poolsize, trackDepth, nCentralityBins, centralityBins, nZvtxBins, zvtxbin);
-  
-  delete[] zvtxbin;
 }
 
 //____________________________________________________________________

diff --git a/PWG4/JetTasks/AliUEHist.cxx b/PWG4/JetTasks/AliUEHist.cxx
index f74935d8b84ed93311e3250592fb2b5b3f91ae90..5f503c25d3a9c8650f2da7cbdec62db0601f5d53 100644 (file)
--- a/PWG4/JetTasks/AliUEHist.cxx
+++ b/PWG4/JetTasks/AliUEHist.cxx
@@ -163,6 +163,8 @@ AliUEHist::AliUEHist(const char* reqHist) :
   
   UInt_t initRegions = fkRegions;
   
+  Bool_t useVtxAxis = kFALSE;
+  
   if (axis == 0)
   {
     trackBins[2] = leadingpTBins;
@@ -185,7 +187,7 @@ AliUEHist::AliUEHist(const char* reqHist) :
   }
   else if (axis == 2)
   {
-    nTrackVars = 6;
+    nTrackVars = 5;
     initRegions = 1;
   
     iTrackBin[0] = kNDeltaEtaBins;
@@ -204,9 +206,13 @@ AliUEHist::AliUEHist(const char* reqHist) :
     trackBins[4] = leadingPhiBins;
     trackAxisTitle[4] = "#Delta#phi (rad.)";
 
-    iTrackBin[5] = kNVertexBins;
-    trackBins[5] = vertexBins;
-    trackAxisTitle[5] = "z-vtx (cm)";
+    if (useVtxAxis)
+    {
+      nTrackVars = 6;
+      iTrackBin[5] = kNVertexBins;
+      trackBins[5] = vertexBins;
+      trackAxisTitle[5] = "z-vtx (cm)";
+    }
   }
     
   for (UInt_t i=0; i<initRegions; i++)
@@ -234,7 +240,7 @@ AliUEHist::AliUEHist(const char* reqHist) :
   iEventBin[1] = iTrackBin[3];
   
   // plus track 5th axis (in certain cases)
-  if (axis == 2)
+  if (axis == 2 && useVtxAxis)
   {
     nEventVars = 3;
     iEventBin[2] = iTrackBin[5];
@@ -248,7 +254,7 @@ AliUEHist::AliUEHist(const char* reqHist) :
   fEventHist->SetBinLimits(1, trackBins[3]);
   fEventHist->SetVarTitle(1, trackAxisTitle[3]);
   
-  if (axis == 2)
+  if (axis == 2 && useVtxAxis)
   {
     fEventHist->SetBinLimits(2, trackBins[5]);
     fEventHist->SetVarTitle(2, trackAxisTitle[5]);