From: sjena <sjena@cern.ch>
Date: Fri, 12 Sep 2014 16:34:51 +0000 (+0200)
Subject: Update PRTask: drathee
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=bdb6c35e9867c59de578e3efa700fef3ed89a7a9;p=u%2Fmrichter%2FAliRoot.git

Update PRTask: drathee
---

diff --git a/PWGCF/EBYE/PIDFluctuation/macros/AddEbyEPidRatioTask.C b/PWGCF/EBYE/PIDFluctuation/macros/AddEbyEPidRatioTask.C
index bdd1ca38e5d..ff8ef443f57 100644
--- a/PWGCF/EBYE/PIDFluctuation/macros/AddEbyEPidRatioTask.C
+++ b/PWGCF/EBYE/PIDFluctuation/macros/AddEbyEPidRatioTask.C
@@ -114,7 +114,7 @@ AliAnalysisTask *AddEbyEPidRatioTask(const Char_t *name   = "TPC_NuDyn",
   task->SetPtRange(minPt, maxPt);           // pt cut range for the analysis
   task->SetPtRangeEff(minPtEff, maxPtEff);  // pt cut range for the correction / efficiency / contamination creation
   helper->SetVertexZMax(10.);   
-  helper->SetCentralityBinMax(7);
+  helper->SetCentralityBinMax(11);
   helper->SetRapidityMax(0.5); 
   helper->SetMinTrackLengthMC(70.);  
   helper->SetNSigmaMaxCdd(0.);    //  3. ||   ->> Turn off sigmaDCA cuts for now
diff --git a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx
index 17ace1046b5..1b977b075f5 100644
--- a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx
+++ b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx
@@ -63,7 +63,7 @@ AliEbyEPidRatioHelper::AliEbyEPidRatioHelper() :
   fCentralityBin(-1),
   fCentralityPercentile(-1.),
 
-  fCentralityBinMax(7),
+  fCentralityBinMax(11),
   fVertexZMax(10.),
   fRapidityMax(0.5),
   fPhiMin(0.),
@@ -88,7 +88,7 @@ AliEbyEPidRatioHelper::AliEbyEPidRatioHelper() :
   fNTriggers(5),
 
   fHCentralityStat(NULL),
-  fNCentralityBins(10),
+  fNCentralityBins(11),
   
   fRandom(NULL) {
   // Constructor   
@@ -119,7 +119,7 @@ const Int_t   AliEbyEPidRatioHelper::fgkfHistNBinsPt      = Int_t((AliEbyEPidRat
 const Float_t AliEbyEPidRatioHelper::fgkfHistRangeSign[]  = {-1.5, 1.5};
 const Int_t   AliEbyEPidRatioHelper::fgkfHistNBinsSign    =  3;
 
-const Char_t* AliEbyEPidRatioHelper::fgkEventNames[]         = {"All", "IsTriggered", "HasVertex", "Vz<Vz_{Max}", "Centrality [0,90]%"};
+const Char_t* AliEbyEPidRatioHelper::fgkEventNames[]         = {"All", "IsTriggered", "HasVertex", "Vz<Vz_{Max}", "Centrality [0,100]%"};
 const Char_t* AliEbyEPidRatioHelper::fgkCentralityMaxNames[] = {"5", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"};
 const Char_t* AliEbyEPidRatioHelper::fgkTriggerNames[]       = {"kMB", "kCentral", "kSemiCentral", "kEMCEJE", "kEMCEGA" }; 
 const Char_t* AliEbyEPidRatioHelper::fgkCentralityNames[]    = {"0-5%", "5-10%", "10-20%", "20-30%", "30-40%", "40-50%","50-60%", "60-70%", "70-80%", "80-90%", "90-100%"};
@@ -253,8 +253,8 @@ Int_t AliEbyEPidRatioHelper::SetupEvent(AliESDInputHandler *esdHandler, AliAODIn
     fStack     = fMCEvent->Stack();
 
   // -- Get event centrality
-  // >  0-5|5-10|10-20|20-30|30-40|40-50|50-60|60-70|70-80|80-90 --> 10 bins
-  // >   0   1     2     3     4     5     6     7     8     9
+  // >  0-5|5-10|10-20|20-30|30-40|40-50|50-60|60-70|70-80|80-90|90-100 --> 11 bins
+  // >   0   1     2     3     4     5     6     7     8     9     10
 
   AliCentrality *centrality = NULL;
 
@@ -269,21 +269,15 @@ Int_t AliEbyEPidRatioHelper::SetupEvent(AliESDInputHandler *esdHandler, AliAODIn
   }
 
   Int_t centBin = centrality->GetCentralityClass10("V0M");
-  if (centBin == 0)
-    fCentralityBin = centrality->GetCentralityClass5("V0M");
-  else if (centBin == 10 || centBin == -1.)
-    fCentralityBin = -1;
-  else if (centBin > 0 && centBin < fNCentralityBins)
-    fCentralityBin = centBin + 1;
-  else
-    fCentralityBin = -2;
-
-  // -- Stay within the max centrality bin
+  if (centBin == 0) { fCentralityBin = centrality->GetCentralityClass5("V0M"); }
+  else if (centBin == 11 || centBin == -1.)           { fCentralityBin = -1; }
+  else if (centBin > 0 && centBin < fNCentralityBins) { fCentralityBin = centBin + 1; }
+  else {  fCentralityBin = -2; }
+  
   if (fCentralityBin >= fCentralityBinMax)
     fCentralityBin = -2;
 
   fCentralityPercentile = centrality->GetCentralityPercentile("V0M");
-
   
   return 0;
 }
diff --git a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioTask.cxx b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioTask.cxx
index 59a592a92c3..726ff48e771 100644
--- a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioTask.cxx
+++ b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioTask.cxx
@@ -370,18 +370,8 @@ Int_t AliEbyEPidRatioTask::Initialize() {
   return 0;
 }
 
-/*
- * ---------------------------------------------------------------------------------
- *                            Setup/Reset Methods - private
- * ---------------------------------------------------------------------------------
- */
-
 //________________________________________________________________________
 Int_t AliEbyEPidRatioTask::SetupEvent() {
-  // Setup Reading of event
-  // > return 0 for success / accepted event
-  // > return -1 for failed setup
-  // > return -2 for rejected event
 
   ResetEvent();