Enlarging window for DCS DPs retrieval for short runs for GRP + Keeping connection...

[u/mrichter/AliRoot.git] / PWGCF / EBYE / PIDFluctuation / task / AliEbyEPidRatioHelper.cxx

diff --git a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx
index bad94cc006813e0b22c3bc742498f85f2e914e33..477c27028d77237e8040ef3dd3b10ff8752a883a 100644 (file)
--- a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx
+++ b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx
@@ -92,7 +92,10 @@ AliEbyEPidRatioHelper::AliEbyEPidRatioHelper() :
   fHCentralityPerAll(NULL),
   fNCentralityBins(11),
   
+  fSubSamples(25),
   fRandom(NULL),
+  fSubSampleIdx(1), 
+
   fIsRatio(kFALSE), 
   fIsPtBin(kFALSE), fIsDetectorWise(kFALSE) {
   // Constructor   
@@ -114,7 +117,7 @@ const Int_t   AliEbyEPidRatioHelper::fgkfHistNBinsEta     = Int_t((AliEbyEPidRat
 const Float_t AliEbyEPidRatioHelper::fgkfHistRangeRap[]   = {-0.8, 0.8};
 const Int_t   AliEbyEPidRatioHelper::fgkfHistNBinsRap     = Int_t((AliEbyEPidRatioHelper::fgkfHistRangeRap[1] - AliEbyEPidRatioHelper::fgkfHistRangeRap[0]) / AliEbyEPidRatioHelper::fgkfHistBinWitdthRap) +1;
 
-const Float_t AliEbyEPidRatioHelper::fgkfHistRangePhi[]   = {0.0, TMath::TwoPi()};
+const Float_t AliEbyEPidRatioHelper::fgkfHistRangePhi[]   = {0.0, static_cast<Float_t>(TMath::TwoPi())};
 const Int_t   AliEbyEPidRatioHelper::fgkfHistNBinsPhi     = 21 ;
 
 const Float_t AliEbyEPidRatioHelper::fgkfHistRangePt[]    = {0.2, 2.9}; // {0.2, 5.}; // was {0.3, 2.22}
@@ -271,7 +274,7 @@ Int_t AliEbyEPidRatioHelper::SetupEvent(AliESDInputHandler *esdHandler, AliAODIn
   if(esdHandler)
     centrality = fESD->GetCentrality();
   else if(aodHandler)
-    centrality = fAOD->GetHeader()->GetCentralityP();
+    centrality = ((AliVAODHeader*)fAOD->GetHeader())->GetCentralityP();
 
   if (!centrality) {
     AliError("Centrality not available");
@@ -300,6 +303,7 @@ Int_t AliEbyEPidRatioHelper::SetupEvent(AliESDInputHandler *esdHandler, AliAODIn
 
   fCentralityPercentile = centrality->GetCentralityPercentile("V0M");
   
+  fSubSampleIdx = fRandom->Integer(fSubSamples);
 
   return 0;
 }
@@ -369,7 +373,7 @@ Bool_t AliEbyEPidRatioHelper::IsEventRejected() {
   // -- 3 - Vertex z outside cut window
   ++iCut;
   if (vtxESD){
-    if(TMath::Abs(vtxESD->GetZv()) > fVertexZMax) 
+    if(TMath::Abs(vtxESD->GetZ()) > fVertexZMax) 
       aEventCuts[iCut] = 1;
   }
   else if(vtxAOD){