]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG2/SPECTRA/AliProtonQAAnalysis.cxx
added ration ITS global/TPC
[u/mrichter/AliRoot.git] / PWG2 / SPECTRA / AliProtonQAAnalysis.cxx
index 7ef1cd7212b116ea19c6772d58ccfc8e0959c45e..d7e2e06c3cae28b109b8944a93ed50287fe1020c 100644 (file)
@@ -19,7 +19,6 @@
 //   Origin: Panos Christakoglou | Panos.Christakoglou@cern.ch
 //-----------------------------------------------------------------
 #include <Riostream.h>
-#include <TFile.h>
 #include <TSystem.h>
 #include <TF1.h>
 #include <TH2D.h>
@@ -27,9 +26,9 @@
 #include <TH1D.h>
 #include <TArrayI.h>
 #include <TParticle.h>
-#include <TClonesArray.h>
 
 #include "AliProtonQAAnalysis.h"
+#include "AliProtonAnalysisBase.h"
 
 #include <AliExternalTrackParam.h>
 #include <AliESDEvent.h>
@@ -44,29 +43,9 @@ ClassImp(AliProtonQAAnalysis)
 
 //____________________________________________________________________//
 AliProtonQAAnalysis::AliProtonQAAnalysis() : 
-  TObject(), fAnalysisEtaMode(kFALSE),
-  fNBinsY(0), fMinY(0), fMaxY(0),
-  fNBinsPt(0), fMinPt(0), fMaxPt(0),
-  fMinTPCClusters(0), fMinITSClusters(0),
-  fMaxChi2PerTPCCluster(0), fMaxChi2PerITSCluster(0),
-  fMaxCov11(0), fMaxCov22(0), fMaxCov33(0), fMaxCov44(0), fMaxCov55(0),
-  fMaxSigmaToVertex(0), fMaxSigmaToVertexTPC(0),
-  fMaxDCAXY(0), fMaxDCAXYTPC(0),
-  fMaxDCAZ(0), fMaxDCAZTPC(0),
-  fMaxConstrainChi2(0),
-  fMinTPCClustersFlag(kFALSE), fMinITSClustersFlag(kFALSE),
-  fMaxChi2PerTPCClusterFlag(kFALSE), fMaxChi2PerITSClusterFlag(kFALSE),
-  fMaxCov11Flag(kFALSE), fMaxCov22Flag(kFALSE), 
-  fMaxCov33Flag(kFALSE), fMaxCov44Flag(kFALSE), fMaxCov55Flag(kFALSE),
-  fMaxSigmaToVertexFlag(kFALSE), fMaxSigmaToVertexTPCFlag(kFALSE),
-  fMaxDCAXYFlag(kFALSE), fMaxDCAXYTPCFlag(kFALSE),
-  fMaxDCAZFlag(kFALSE), fMaxDCAZTPCFlag(kFALSE),
-  fMaxConstrainChi2Flag(kFALSE),
-  fITSRefitFlag(kFALSE), fTPCRefitFlag(kFALSE),
-  fESDpidFlag(kFALSE), fTPCpidFlag(kFALSE),
-  fPointOnITSLayer1Flag(0), fPointOnITSLayer2Flag(0),
-  fPointOnITSLayer3Flag(0), fPointOnITSLayer4Flag(0),
-  fPointOnITSLayer5Flag(0), fPointOnITSLayer6Flag(0),
+  TObject(), fProtonAnalysisBase(0),
+  fNBinsY(0), fMinY(0), fMaxY(0), fY(0),
+  fNBinsPt(0), fMinPt(0), fMaxPt(0), fPt(0), fUseAsymmetricBinning(kFALSE),
   fGlobalQAList(0), fQAVertexList(0), fQA2DList(0),
   fQAPrimaryProtonsAcceptedList(0),
   fQAPrimaryProtonsRejectedList(0),
@@ -76,10 +55,6 @@ AliProtonQAAnalysis::AliProtonQAAnalysis() :
   fQAPrimaryAntiProtonsRejectedList(0),
   fQASecondaryAntiProtonsAcceptedList(0),
   fQASecondaryAntiProtonsRejectedList(0),
-  fFunctionProbabilityFlag(kFALSE), 
-  fElectronFunction(0), fMuonFunction(0),
-  fPionFunction(0), fKaonFunction(0), fProtonFunction(0),
-  fUseTPCOnly(kFALSE), fUseHybridTPC(kFALSE),
   fPDGList(0), fMCProcessesList(0),
   fRunMCAnalysis(kFALSE),
   fMCProcessIdFlag(kFALSE), fMCProcessId(0),
@@ -88,14 +63,14 @@ AliProtonQAAnalysis::AliProtonQAAnalysis() :
   fAcceptedDCAList(0), fRejectedDCAList(0),
   fRunEfficiencyAnalysis(kFALSE),
   fUseCutsInEfficiency(kFALSE),
-  fEfficiencyList(0) {
+  fEfficiencyList(0), fCutEfficiencyList(0) {
   //Default constructor
-  for(Int_t i = 0; i < 5; i++) fPartFrac[i] = 0.0;
 }
 
 //____________________________________________________________________//
 AliProtonQAAnalysis::~AliProtonQAAnalysis() {
   //Default destructor
+  if(fProtonAnalysisBase) delete fProtonAnalysisBase;
   if(fGlobalQAList) delete fGlobalQAList;
   if(fQAVertexList) delete fQAVertexList;
   if(fQA2DList) delete fQA2DList;
@@ -121,72 +96,22 @@ AliProtonQAAnalysis::~AliProtonQAAnalysis() {
   if(fRejectedDCAList) delete fRejectedDCAList;
  
   if(fEfficiencyList) delete fEfficiencyList;
+  if(fCutEfficiencyList) delete fCutEfficiencyList;
 }
 
 //____________________________________________________________________//
-Double_t AliProtonQAAnalysis::GetParticleFraction(Int_t i, Double_t p) {
-  Double_t partFrac=0;
-  if(fFunctionProbabilityFlag) {
-    if(i == 0) partFrac = fElectronFunction->Eval(p);
-    if(i == 1) partFrac = fMuonFunction->Eval(p);
-    if(i == 2) partFrac = fPionFunction->Eval(p);
-    if(i == 3) partFrac = fKaonFunction->Eval(p);
-    if(i == 4) partFrac = fProtonFunction->Eval(p);
-  }
-  else partFrac = fPartFrac[i];
-
-  return partFrac;
-}
-
-//____________________________________________________________________//
-Bool_t AliProtonQAAnalysis::IsInPhaseSpace(AliESDtrack* const track) {
-  // Checks if the track is outside the analyzed y-Pt phase space
-  Double_t gPt = 0.0, gPx = 0.0, gPy = 0.0, gPz = 0.0;
-  Double_t eta = 0.0;
-
-  if(fUseTPCOnly) {
-    AliExternalTrackParam *tpcTrack = (AliExternalTrackParam *)track->GetTPCInnerParam();
-    if(!tpcTrack) {
-      gPt = 0.0; gPx = 0.0; gPy = 0.0; gPz = 0.0; eta = -10.0;
-    }
-    else {
-      gPt = tpcTrack->Pt();
-      gPx = tpcTrack->Px();
-      gPy = tpcTrack->Py();
-      gPz = tpcTrack->Pz();
-      eta = tpcTrack->Eta();
-    }
-  }
-  else {
-    gPt = track->Pt();
-    gPx = track->Px();
-    gPy = track->Py();
-    gPz = track->Pz();
-    eta = track->Eta();
-  }
-  
-  if((gPt < fMinPt) || (gPt > fMaxPt)) return kFALSE;
-  if(fAnalysisEtaMode) {
-    if((eta < fMinY) || (eta > fMaxY)) 
-      return kFALSE;
-  }
-  else {
-    if((Rapidity(gPx,gPy,gPz) < fMinY) || (Rapidity(gPx,gPy,gPz) > fMaxY)) 
-      return kFALSE;
-  }
-
-  return kTRUE;
-}
-
-//____________________________________________________________________//
-Bool_t AliProtonQAAnalysis::IsAccepted(AliESDEvent *esd,
-                                      const AliESDVertex *vertex, 
-                                      AliESDtrack* track) {
+void AliProtonQAAnalysis::FillQA(AliStack *const stack,
+                                AliESDEvent *esd,
+                                const AliESDVertex *vertex, 
+                                AliESDtrack* track) {
   // Checks if the track is excluded from the cuts
+  Int_t nPrimaries = stack->GetNprimary();
+  Int_t label = TMath::Abs(track->GetLabel());
+
   Double_t gPt = 0.0, gPx = 0.0, gPy = 0.0, gPz = 0.0;
   Double_t dca[2] = {0.0,0.0}, cov[3] = {0.0,0.0,0.0};  //The impact parameters and their covariance.
-  
-  if((fUseTPCOnly)&&(!fUseHybridTPC)) {
+
+  if((fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kTPC)||(fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kHybrid)) {
     AliExternalTrackParam *tpcTrack = (AliExternalTrackParam *)track->GetTPCInnerParam();
     if(!tpcTrack) {
       gPt = 0.0; gPx = 0.0; gPy = 0.0; gPz = 0.0;
@@ -203,23 +128,6 @@ Bool_t AliProtonQAAnalysis::IsAccepted(AliESDEvent *esd,
                               100.,dca,cov);
     }
   }
-  else if(fUseHybridTPC) {
-     AliExternalTrackParam *tpcTrack = (AliExternalTrackParam *)track->GetTPCInnerParam();
-    if(!tpcTrack) {
-      gPt = 0.0; gPx = 0.0; gPy = 0.0; gPz = 0.0;
-      dca[0] = -100.; dca[1] = -100.;
-      cov[0] = -100.; cov[1] = -100.; cov[2] = -100.;
-    }
-    else {
-      gPt = tpcTrack->Pt();
-      gPx = tpcTrack->Px();
-      gPy = tpcTrack->Py();
-      gPz = tpcTrack->Pz();
-      tpcTrack->PropagateToDCA(vertex,
-                              esd->GetMagneticField(),
-                              100.,dca,cov);
-    }
-  }
   else{
     gPt = track->Pt();
     gPx = track->Px();
@@ -229,1049 +137,890 @@ Bool_t AliProtonQAAnalysis::IsAccepted(AliESDEvent *esd,
                          esd->GetMagneticField(),
                          100.,dca,cov);
   }
-     
-  Int_t  fIdxInt[200];
-  Int_t nClustersITS = track->GetITSclusters(fIdxInt);
-  Int_t nClustersTPC = track->GetTPCclusters(fIdxInt);
-
-  Float_t chi2PerClusterITS = -1;
-  if (nClustersITS!=0)
-    chi2PerClusterITS = track->GetITSchi2()/Float_t(nClustersITS);
-  Float_t chi2PerClusterTPC = -1;
-  if (nClustersTPC!=0)
-    chi2PerClusterTPC = track->GetTPCchi2()/Float_t(nClustersTPC);
-
-  Double_t extCov[15];
-  track->GetExternalCovariance(extCov);
-
-  if(fPointOnITSLayer1Flag)
-    if(!track->HasPointOnITSLayer(0)) return kFALSE;
-  if(fPointOnITSLayer2Flag)
-    if(!track->HasPointOnITSLayer(1)) return kFALSE;
-  if(fPointOnITSLayer3Flag)
-    if(!track->HasPointOnITSLayer(2)) return kFALSE;
-  if(fPointOnITSLayer4Flag)
-    if(!track->HasPointOnITSLayer(3)) return kFALSE;
-  if(fPointOnITSLayer5Flag)
-    if(!track->HasPointOnITSLayer(4)) return kFALSE;
-  if(fPointOnITSLayer6Flag)
-    if(!track->HasPointOnITSLayer(5)) return kFALSE;
-  if(fMinITSClustersFlag)
-    if(nClustersITS < fMinITSClusters) return kFALSE;
-  if(fMaxChi2PerITSClusterFlag)
-    if(chi2PerClusterITS > fMaxChi2PerITSCluster) return kFALSE; 
-  if(fMinTPCClustersFlag)
-    if(nClustersTPC < fMinTPCClusters) return kFALSE;
-  if(fMaxChi2PerTPCClusterFlag)
-    if(chi2PerClusterTPC > fMaxChi2PerTPCCluster) return kFALSE; 
-  if(fMaxCov11Flag)
-    if(extCov[0] > fMaxCov11) return kFALSE;
-  if(fMaxCov22Flag)
-    if(extCov[2] > fMaxCov22) return kFALSE;
-  if(fMaxCov33Flag)
-    if(extCov[5] > fMaxCov33) return kFALSE;
-  if(fMaxCov44Flag)
-    if(extCov[9] > fMaxCov44) return kFALSE;
-  if(fMaxCov55Flag)
-    if(extCov[14] > fMaxCov55) return kFALSE;
-  if(fMaxSigmaToVertexFlag)
-    if(GetSigmaToVertex(track) > fMaxSigmaToVertex) return kFALSE;
-  if(fMaxSigmaToVertexTPCFlag)
-    if(GetSigmaToVertex(track) > fMaxSigmaToVertexTPC) return kFALSE;
-  if(fMaxDCAXYFlag) 
-    if(TMath::Abs(dca[0]) > fMaxDCAXY) return kFALSE;
-  if(fMaxDCAXYTPCFlag) 
-    if(TMath::Abs(dca[0]) > fMaxDCAXYTPC) return kFALSE;
-    if(fMaxDCAZFlag) 
-    if(TMath::Abs(dca[1]) > fMaxDCAZ) return kFALSE;
-  if(fMaxDCAZTPCFlag) 
-    if(TMath::Abs(dca[1]) > fMaxDCAZTPC) return kFALSE;
-  if(fMaxConstrainChi2Flag) {
-    if(track->GetConstrainedChi2() > 0) 
-      if(TMath::Log(track->GetConstrainedChi2()) > fMaxConstrainChi2) return kFALSE;
-  }
-  if(fITSRefitFlag)
-    if ((track->GetStatus() & AliESDtrack::kITSrefit) == 0) return kFALSE;
-  if(fTPCRefitFlag)
-    if ((track->GetStatus() & AliESDtrack::kTPCrefit) == 0) return kFALSE;
-  if(fESDpidFlag)
-    if ((track->GetStatus() & AliESDtrack::kESDpid) == 0) return kFALSE;
-  if(fTPCpidFlag)
-    if ((track->GetStatus() & AliESDtrack::kTPCpid) == 0) return kFALSE;
-
-  return kTRUE;
-}
-
-//____________________________________________________________________//
-Float_t AliProtonQAAnalysis::GetSigmaToVertex(AliESDtrack* esdTrack) const {
-  // Calculates the number of sigma to the vertex.
-  
-  Float_t b[2];
-  Float_t bRes[2];
-  Float_t bCov[3];
-  if((fUseTPCOnly)&&(!fUseHybridTPC))
-    esdTrack->GetImpactParametersTPC(b,bCov);
-  else
-    esdTrack->GetImpactParameters(b,bCov);
-  
-  if (bCov[0]<=0 || bCov[2]<=0) {
-    //AliDebug(1, "Estimated b resolution lower or equal zero!");
-    bCov[0]=0; bCov[2]=0;
-  }
-  bRes[0] = TMath::Sqrt(bCov[0]);
-  bRes[1] = TMath::Sqrt(bCov[2]);
-  
-  if (bRes[0] == 0 || bRes[1] ==0) return -1;
-  
-  Float_t d = TMath::Sqrt(TMath::Power(b[0]/bRes[0],2) + TMath::Power(b[1]/bRes[1],2));
-  
-  if (TMath::Exp(-d * d / 2) < 1e-10) return 1000;
-  
-  d = TMath::ErfInverse(1 - TMath::Exp(-d * d / 2)) * TMath::Sqrt(2);
-  
-  return d;
-}
-
-//____________________________________________________________________//
-Double_t AliProtonQAAnalysis::Rapidity(Double_t gPx, 
-                                      Double_t gPy, 
-                                      Double_t gPz) const {
-  //returns the rapidity of the proton - to be removed
-  Double_t fMass = 9.38270000000000048e-01;
-  
-  Double_t gP = TMath::Sqrt(TMath::Power(gPx,2) + 
-                           TMath::Power(gPy,2) + 
-                          TMath::Power(gPz,2));
-  Double_t energy = TMath::Sqrt(gP*gP + fMass*fMass);
-  Double_t y = -999;
-  if(energy != gPz) 
-    y = 0.5*TMath::Log((energy + gPz)/(energy - gPz));
-
-  return y;
-}
-
-//____________________________________________________________________//
-void AliProtonQAAnalysis::FillQA(AliStack *stack,
-                                AliESDEvent *esd,
-                                const AliESDVertex *vertex, 
-                                AliESDtrack* track) {
-  // Checks if the track is excluded from the cuts
-  Int_t nPrimaries = stack->GetNprimary();
-  Int_t label = TMath::Abs(track->GetLabel());
-
-  Double_t Pt = 0.0, Px = 0.0, Py = 0.0, Pz = 0.0;
-  Double_t dca[2] = {0.0,0.0}, cov[3] = {0.0,0.0,0.0};  //The impact parameters and their covariance.
-
-  if((fUseTPCOnly)&&(!fUseHybridTPC)) {
-    AliExternalTrackParam *tpcTrack = (AliExternalTrackParam *)track->GetTPCInnerParam();
-    if(!tpcTrack) {
-      Pt = 0.0; Px = 0.0; Py = 0.0; Pz = 0.0;
-      dca[0] = -100.; dca[1] = -100.;
-      cov[0] = -100.; cov[1] = -100.; cov[2] = -100.;
-    }
-    else {
-      Pt = tpcTrack->Pt();
-      Px = tpcTrack->Px();
-      Py = tpcTrack->Py();
-      Pz = tpcTrack->Pz();
-      tpcTrack->PropagateToDCA(vertex,
-                              esd->GetMagneticField(),
-                              100.,dca,cov);
-    }
-  }
-  else if(fUseHybridTPC) {
-     AliExternalTrackParam *tpcTrack = (AliExternalTrackParam *)track->GetTPCInnerParam();
-    if(!tpcTrack) {
-      Pt = 0.0; Px = 0.0; Py = 0.0; Pz = 0.0;
-      dca[0] = -100.; dca[1] = -100.;
-      cov[0] = -100.; cov[1] = -100.; cov[2] = -100.;
-    }
-    else {
-      Pt = tpcTrack->Pt();
-      Px = tpcTrack->Px();
-      Py = tpcTrack->Py();
-      Pz = tpcTrack->Pz();
-      tpcTrack->PropagateToDCA(vertex,
-                              esd->GetMagneticField(),
-                              100.,dca,cov);
-    }
-  }
-  else{
-    Pt = track->Pt();
-    Px = track->Px();
-    Py = track->Py();
-    Pz = track->Pz();
-    track->PropagateToDCA(vertex,
-                         esd->GetMagneticField(),
-                         100.,dca,cov);
-  }
 
+  //TParticle *particle = stack->Particle(label);
+  //if(particle) {
+  //Int_t pdgcode = particle->GetPdgCode();
+  //Int_t gProcess = particle->GetUniqueID();
   Int_t  fIdxInt[200];
   Int_t nClustersITS = track->GetITSclusters(fIdxInt);
   Int_t nClustersTPC = track->GetTPCclusters(fIdxInt);
-
+  
   Float_t chi2PerClusterITS = -1;
   if (nClustersITS!=0)
     chi2PerClusterITS = track->GetITSchi2()/Float_t(nClustersITS);
   Float_t chi2PerClusterTPC = -1;
   if (nClustersTPC!=0)
     chi2PerClusterTPC = track->GetTPCchi2()/Float_t(nClustersTPC);
-
-  Double_t extCov[15];
-  track->GetExternalCovariance(extCov);
   
-  //cout<<"Charge: "<<track->Charge()<<
-  //" - Label/Primaries: "<<label<<"/"<<nPrimaries<<
-  //" - TPC clusters: "<<nClustersTPC<<endl;
-  //protons
-  if(track->Charge() > 0) {
-    //Primaries
-    if(label <= nPrimaries) {
-      if(fMinITSClustersFlag) {
-       if(nClustersITS < fMinITSClusters) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(0)))->Fill(nClustersITS);
-         //status = kFALSE;
-       }
-       else if(nClustersITS >= fMinITSClusters) 
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(0)))->Fill(nClustersITS);
-      }//ITS clusters
-      if(fMaxChi2PerITSClusterFlag) {
-       if(chi2PerClusterITS > fMaxChi2PerITSCluster) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(1)))->Fill(chi2PerClusterITS);
-         //status = kFALSE;
-       }
-       else if(chi2PerClusterITS <= fMaxChi2PerITSCluster)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(1)))->Fill(chi2PerClusterITS);
-      }//chi2 per ITS cluster
-      if(fMinTPCClustersFlag) {
-       if(nClustersTPC < fMinTPCClusters) {
-         //cout<<"Primary proton rejected"<<endl;
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(2)))->Fill(nClustersTPC);
-         //status = kFALSE;
-       }
-       else if(nClustersTPC >= fMinTPCClusters) {
-         //cout<<"Primary proton accepted"<<endl;
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(2)))->Fill(nClustersTPC);
-       }
-      }//TPC clusters
-      if(fMaxChi2PerTPCClusterFlag) {
-       if(chi2PerClusterTPC > fMaxChi2PerTPCCluster) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(3)))->Fill(chi2PerClusterTPC);
-         //status = kFALSE;
-       }
-       else if(chi2PerClusterTPC <= fMaxChi2PerTPCCluster)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(3)))->Fill(chi2PerClusterTPC);
-      }//chi2 per TPC cluster
-      if(fMaxCov11Flag) {
-       if(extCov[0] > fMaxCov11) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(4)))->Fill(extCov[0]);
-         //status = kFALSE;
-       }
-       else if(extCov[0] <= fMaxCov11)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(4)))->Fill(extCov[0]);
-      }//cov11
-      if(fMaxCov22Flag) {
-       if(extCov[2] > fMaxCov22) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(5)))->Fill(extCov[2]);
-         //status = kFALSE;
-       }
-       else if(extCov[2] <= fMaxCov22)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(5)))->Fill(extCov[2]);
-      }//cov11
-      if(fMaxCov33Flag) {
-       if(extCov[5] > fMaxCov33) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(6)))->Fill(extCov[5]);
-         //status = kFALSE;
-       }
-       else if(extCov[5] <= fMaxCov33)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(6)))->Fill(extCov[5]);
-      }//cov11
-      if(fMaxCov44Flag) {
-       if(extCov[9] > fMaxCov44) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(7)))->Fill(extCov[9]);
-         //status = kFALSE;
-       }
-       else if(extCov[9] <= fMaxCov44)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(7)))->Fill(extCov[9]);
-      }//cov11
-      if(fMaxCov55Flag) {
-       if(extCov[14] > fMaxCov55) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(8)))->Fill(extCov[14]);
-         //status = kFALSE;
-       }
-       else if(extCov[14] <= fMaxCov55)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(8)))->Fill(extCov[14]);
-      }//cov55
-      if(fMaxSigmaToVertexFlag) {
-       if(GetSigmaToVertex(track) > fMaxSigmaToVertex) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(9)))->Fill(GetSigmaToVertex(track));
-         //status = kFALSE;
-       }
-       else if(GetSigmaToVertex(track) <= fMaxSigmaToVertex)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(9)))->Fill(GetSigmaToVertex(track));
-      }//sigma to vertex
-      if(fMaxSigmaToVertexTPCFlag) {
-       if(GetSigmaToVertex(track) > fMaxSigmaToVertexTPC) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(10)))->Fill(GetSigmaToVertex(track));
-         //status = kFALSE;
-       }
-       else if(GetSigmaToVertex(track) <= fMaxSigmaToVertexTPC)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(10)))->Fill(GetSigmaToVertex(track));
-      }//sigma to vertex TPC
-      if(fMaxDCAXYFlag) {
-       if(TMath::Abs(dca[0]) > fMaxDCAXY) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(11)))->Fill(TMath::Abs(dca[0]));
-         //status = kFALSE;
-       }
-       else if(TMath::Abs(dca[0]) <= fMaxDCAXY)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(11)))->Fill(TMath::Abs(dca[0]));
-      }//DCA xy global tracking
-      if(fMaxDCAXYTPCFlag) {
-       if(TMath::Abs(dca[0]) > fMaxDCAXYTPC) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(12)))->Fill(TMath::Abs(dca[0]));
-         //status = kFALSE;
-       }
-       else if(TMath::Abs(dca[0]) <= fMaxDCAXYTPC)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(12)))->Fill(TMath::Abs(dca[0]));
-      }//DCA xy TPC tracking
-      if(fMaxDCAZFlag) {
-       if(TMath::Abs(dca[1]) > fMaxDCAZ) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(13)))->Fill(TMath::Abs(dca[1]));
-         //status = kFALSE;
-       }
-       else if(TMath::Abs(dca[1]) <= fMaxDCAZ)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(13)))->Fill(TMath::Abs(dca[1]));
-      }//DCA z global tracking
-      if(fMaxDCAZTPCFlag) {
-       if(TMath::Abs(dca[1]) > fMaxDCAZTPC) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(14)))->Fill(TMath::Abs(dca[1]));
-         //status = kFALSE;
-       }
-       else if(TMath::Abs(dca[1]) <= fMaxDCAZTPC)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(14)))->Fill(TMath::Abs(dca[1]));
-      }//DCA z TPC tracking
-      if(fMaxConstrainChi2Flag) {
-       if(track->GetConstrainedChi2() > 0) {
-         if(TMath::Log(track->GetConstrainedChi2()) > fMaxConstrainChi2) {
-           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
-           //status = kFALSE;
+  Double_t extCov[15];
+    track->GetExternalCovariance(extCov);
+    
+    //protons
+    if(track->Charge() > 0) {
+      //Primaries
+      if(label <= nPrimaries) {
+       if(fProtonAnalysisBase->IsUsedMinITSClusters()) {
+         if(nClustersITS < fProtonAnalysisBase->GetMinITSClusters()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(0)))->Fill(nClustersITS);
          }
-         else if(TMath::Log(track->GetConstrainedChi2()) <= fMaxConstrainChi2)
-           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
-       }
-      }//constrain chi2 - vertex
-      if(fITSRefitFlag) {
-       if ((track->GetStatus() & AliESDtrack::kITSrefit) == 0) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(16)))->Fill(0);
-       //status = kFALSE;
-       }
-       else if((track->GetStatus() & AliESDtrack::kITSrefit) != 0)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(16)))->Fill(0);
-      }//ITS refit
-      if(fTPCRefitFlag) {
-       if ((track->GetStatus() & AliESDtrack::kTPCrefit) == 0) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(17)))->Fill(0);
-         //status = kFALSE;
-       }
-       else if((track->GetStatus() & AliESDtrack::kTPCrefit) != 0)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(17)))->Fill(0);
-      }//TPC refit
-      if(fESDpidFlag) {
-       if ((track->GetStatus() & AliESDtrack::kESDpid) == 0) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(18)))->Fill(0);
-         //status = kFALSE;
-       }
-       else if((track->GetStatus() & AliESDtrack::kESDpid) != 0)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(18)))->Fill(0);
-      }//ESD pid
-      if(fTPCpidFlag) {
-       if ((track->GetStatus() & AliESDtrack::kTPCpid) == 0) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(19)))->Fill(0);
-         //status = kFALSE;
-       }
-       else if((track->GetStatus() & AliESDtrack::kTPCpid) != 0)
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(19)))->Fill(0);
-      }//TPC pid
-      if(fPointOnITSLayer1Flag) {
-       if(!track->HasPointOnITSLayer(0)) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(20)))->Fill(0);
-       }
-       else if(track->HasPointOnITSLayer(0))
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(20)))->Fill(0);
-      }//point on SPD1
-      if(fPointOnITSLayer2Flag) {
-       if(!track->HasPointOnITSLayer(1)) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(21)))->Fill(0);
-       }
-       else if(track->HasPointOnITSLayer(1))
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(21)))->Fill(0);
-      }//point on SPD2
-      if(fPointOnITSLayer3Flag) {
-       if(!track->HasPointOnITSLayer(2)) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(22)))->Fill(0);
-       }
-       else if(track->HasPointOnITSLayer(2))
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(22)))->Fill(0);
-      }//point on SDD1
-      if(fPointOnITSLayer4Flag) {
-       if(!track->HasPointOnITSLayer(3)) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(23)))->Fill(0);
-       }
-       else if(track->HasPointOnITSLayer(3))
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(23)))->Fill(0);
-      }//point on SDD2
-      if(fPointOnITSLayer5Flag) {
-       if(!track->HasPointOnITSLayer(4)) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(24)))->Fill(0);
-       }
-       else if(track->HasPointOnITSLayer(4))
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(24)))->Fill(0);
-      }//point on SSD1
-      if(fPointOnITSLayer6Flag) {
-       if(!track->HasPointOnITSLayer(5)) {
-         ((TH1F *)(fQAPrimaryProtonsRejectedList->At(25)))->Fill(0);
-       }
-       else if(track->HasPointOnITSLayer(5))
-         ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(25)))->Fill(0);
-      }//point on SSD2
-    }//primary particle cut
-
-    //Secondaries
-    if(label > nPrimaries) {
-      if(fMinITSClustersFlag) {
-       if(nClustersITS < fMinITSClusters) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(0)))->Fill(nClustersITS);
-         //status = kFALSE;
-       }
-       else if(nClustersITS >= fMinITSClusters) 
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(0)))->Fill(nClustersITS);
-      }//ITS clusters
-      if(fMaxChi2PerITSClusterFlag) {
-       if(chi2PerClusterITS > fMaxChi2PerITSCluster) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(1)))->Fill(chi2PerClusterITS);
-         //status = kFALSE;
-       }
-       else if(chi2PerClusterITS <= fMaxChi2PerITSCluster)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(1)))->Fill(chi2PerClusterITS);
-      }//chi2 per ITS cluster
-      if(fMinTPCClustersFlag) {
-       if(nClustersTPC < fMinTPCClusters) {
-         //cout<<"Secondary proton rejected"<<endl;
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(2)))->Fill(nClustersTPC);
-         //status = kFALSE;
-       }
-       else if(nClustersTPC >= fMinTPCClusters) {
-         //cout<<"Secondary proton accepted"<<endl;
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(2)))->Fill(nClustersTPC);
-       }
-      }//TPC clusters
-      if(fMaxChi2PerTPCClusterFlag) {
-       if(chi2PerClusterTPC > fMaxChi2PerTPCCluster) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(3)))->Fill(chi2PerClusterTPC);
-         //status = kFALSE;
-       }
-       else if(chi2PerClusterTPC <= fMaxChi2PerTPCCluster)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(3)))->Fill(chi2PerClusterTPC);
-      }//chi2 per TPC cluster
-      if(fMaxCov11Flag) {
-       if(extCov[0] > fMaxCov11) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(4)))->Fill(extCov[0]);
-         //status = kFALSE;
-       }
-       else if(extCov[0] <= fMaxCov11)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(4)))->Fill(extCov[0]);
-      }//cov11
-      if(fMaxCov22Flag) {
-       if(extCov[2] > fMaxCov22) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(5)))->Fill(extCov[2]);
-         //status = kFALSE;
-       }
-       else if(extCov[2] <= fMaxCov22)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(5)))->Fill(extCov[2]);
-      }//cov11
-      if(fMaxCov33Flag) {
-       if(extCov[5] > fMaxCov33) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(6)))->Fill(extCov[5]);
-         //status = kFALSE;
-       }
-       else if(extCov[5] <= fMaxCov33)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(6)))->Fill(extCov[5]);
-      }//cov11
-      if(fMaxCov44Flag) {
-       if(extCov[9] > fMaxCov44) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(7)))->Fill(extCov[9]);
-         //status = kFALSE;
-       }
-       else if(extCov[9] <= fMaxCov44)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(7)))->Fill(extCov[9]);
-      }//cov11
-      if(fMaxCov55Flag) {
-       if(extCov[14] > fMaxCov55) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(8)))->Fill(extCov[14]);
-         //status = kFALSE;
-       }
-       else if(extCov[14] <= fMaxCov55)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(8)))->Fill(extCov[14]);
-      }//cov55
-      if(fMaxSigmaToVertexFlag) {
-       if(GetSigmaToVertex(track) > fMaxSigmaToVertex) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(9)))->Fill(GetSigmaToVertex(track));
-         //status = kFALSE;
-       }
-       else if(GetSigmaToVertex(track) <= fMaxSigmaToVertex)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(9)))->Fill(GetSigmaToVertex(track));
-      }//sigma to vertex
-      if(fMaxSigmaToVertexTPCFlag) {
-       if(GetSigmaToVertex(track) > fMaxSigmaToVertexTPC) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(10)))->Fill(GetSigmaToVertex(track));
-         //status = kFALSE;
-       }
-       else if(GetSigmaToVertex(track) <= fMaxSigmaToVertexTPC)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(10)))->Fill(GetSigmaToVertex(track));
-      }//sigma to vertex TPC
-      if(fMaxDCAXYFlag) {
-       if(TMath::Abs(dca[0]) > fMaxDCAXY) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(11)))->Fill(TMath::Abs(dca[0]));
-         //status = kFALSE;
-       }
-       else if(TMath::Abs(dca[0]) <= fMaxDCAXY)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(11)))->Fill(TMath::Abs(dca[0]));
-      }//DCA xy global tracking
-      if(fMaxDCAXYTPCFlag) {
-       if(TMath::Abs(dca[0]) > fMaxDCAXYTPC) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(12)))->Fill(TMath::Abs(dca[0]));
-         //status = kFALSE;
-       }
-       else if(TMath::Abs(dca[0]) <= fMaxDCAXYTPC)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(12)))->Fill(TMath::Abs(dca[0]));
-      }//DCA xy TPC tracking
-      if(fMaxDCAZFlag) {
-       if(TMath::Abs(dca[1]) > fMaxDCAZ) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(13)))->Fill(TMath::Abs(dca[1]));
-         //status = kFALSE;
-       }
-       else if(TMath::Abs(dca[1]) <= fMaxDCAZ)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(13)))->Fill(TMath::Abs(dca[1]));
-      }//DCA z global tracking
-      if(fMaxDCAZTPCFlag) {
-       if(TMath::Abs(dca[1]) > fMaxDCAZTPC) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(14)))->Fill(TMath::Abs(dca[1]));
-         //status = kFALSE;
-       }
-       else if(TMath::Abs(dca[1]) <= fMaxDCAZTPC)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(14)))->Fill(TMath::Abs(dca[1]));
-      }//DCA z TPC tracking
-      if(fMaxConstrainChi2Flag) {
-       if(track->GetConstrainedChi2() > 0) {
-         if(TMath::Log(track->GetConstrainedChi2()) > fMaxConstrainChi2) {
-           ((TH1F *)(fQASecondaryProtonsRejectedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
-           //status = kFALSE;
+         else if(nClustersITS >= fProtonAnalysisBase->GetMinITSClusters()) 
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(0)))->Fill(nClustersITS);
+       }//ITS clusters
+       if(fProtonAnalysisBase->IsUsedMaxChi2PerITSCluster()) {
+         if(chi2PerClusterITS > fProtonAnalysisBase->GetMaxChi2PerITSCluster()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(1)))->Fill(chi2PerClusterITS);
          }
-         else if(TMath::Log(track->GetConstrainedChi2()) <= fMaxConstrainChi2)
-           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
-       }
-      }//constrain chi2 - vertex
-      if(fITSRefitFlag) {
-       if ((track->GetStatus() & AliESDtrack::kITSrefit) == 0) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(16)))->Fill(0);
-       //status = kFALSE;
-       }
-       else if((track->GetStatus() & AliESDtrack::kITSrefit) != 0)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(16)))->Fill(0);
-      }//ITS refit
-      if(fTPCRefitFlag) {
-       if ((track->GetStatus() & AliESDtrack::kTPCrefit) == 0) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(17)))->Fill(0);
-         //status = kFALSE;
-       }
-       else if((track->GetStatus() & AliESDtrack::kTPCrefit) != 0)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(17)))->Fill(0);
-      }//TPC refit
-      if(fESDpidFlag) {
-       if ((track->GetStatus() & AliESDtrack::kESDpid) == 0) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(18)))->Fill(0);
-         //status = kFALSE;
-       }
-       else if((track->GetStatus() & AliESDtrack::kESDpid) != 0)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(18)))->Fill(0);
-      }//ESD pid
-      if(fTPCpidFlag) {
-       if ((track->GetStatus() & AliESDtrack::kTPCpid) == 0) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(19)))->Fill(0);
-         //status = kFALSE;
+         else if(chi2PerClusterITS <= fProtonAnalysisBase->GetMaxChi2PerITSCluster())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(1)))->Fill(chi2PerClusterITS);
+       }//chi2 per ITS cluster
+       if(fProtonAnalysisBase->IsUsedMinTPCClusters()) {
+         if(nClustersTPC < fProtonAnalysisBase->GetMinTPCClusters()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(2)))->Fill(nClustersTPC);
+         }
+         else if(nClustersTPC >= fProtonAnalysisBase->GetMinTPCClusters()) {
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(2)))->Fill(nClustersTPC);
+         }
+       }//TPC clusters
+       if(fProtonAnalysisBase->IsUsedMaxChi2PerTPCCluster()) {
+         if(chi2PerClusterTPC > fProtonAnalysisBase->GetMaxChi2PerTPCCluster()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(3)))->Fill(chi2PerClusterTPC);
+         }
+         else if(chi2PerClusterTPC <= fProtonAnalysisBase->GetMaxChi2PerTPCCluster())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(3)))->Fill(chi2PerClusterTPC);
+       }//chi2 per TPC cluster
+       if(fProtonAnalysisBase->IsUsedMaxCov11()) {
+         if(extCov[0] > fProtonAnalysisBase->GetMaxCov11()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(4)))->Fill(extCov[0]);
+         }
+         else if(extCov[0] <= fProtonAnalysisBase->GetMaxCov11())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(4)))->Fill(extCov[0]);
+       }//cov11
+       if(fProtonAnalysisBase->IsUsedMaxCov22()) {
+         if(extCov[2] > fProtonAnalysisBase->GetMaxCov22()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(5)))->Fill(extCov[2]);
+         }
+         else if(extCov[2] <= fProtonAnalysisBase->GetMaxCov22())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(5)))->Fill(extCov[2]);
+       }//cov11
+       if(fProtonAnalysisBase->IsUsedMaxCov33()) {
+         if(extCov[5] > fProtonAnalysisBase->GetMaxCov33()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(6)))->Fill(extCov[5]);
+         }
+         else if(extCov[5] <= fProtonAnalysisBase->GetMaxCov33())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(6)))->Fill(extCov[5]);
+       }//cov11
+       if(fProtonAnalysisBase->IsUsedMaxCov44()) {
+         if(extCov[9] > fProtonAnalysisBase->GetMaxCov44()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(7)))->Fill(extCov[9]);
+         }
+         else if(extCov[9] <= fProtonAnalysisBase->GetMaxCov44())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(7)))->Fill(extCov[9]);
+       }//cov11
+       if(fProtonAnalysisBase->IsUsedMaxCov55()) {
+         if(extCov[14] > fProtonAnalysisBase->GetMaxCov55()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(8)))->Fill(extCov[14]);
+         }
+         else if(extCov[14] <= fProtonAnalysisBase->GetMaxCov55())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(8)))->Fill(extCov[14]);
+       }//cov55
+       if(fProtonAnalysisBase->IsUsedMaxSigmaToVertex()) {
+         if(fProtonAnalysisBase->GetSigmaToVertex(track) > fProtonAnalysisBase->GetMaxSigmaToVertex()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(9)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
+         }
+         else if(fProtonAnalysisBase->GetSigmaToVertex(track) <= fProtonAnalysisBase->GetMaxSigmaToVertex())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(9)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
+       }//sigma to vertex
+       if(fProtonAnalysisBase->IsUsedMaxSigmaToVertexTPC()) {
+         if(fProtonAnalysisBase->GetSigmaToVertex(track) > fProtonAnalysisBase->GetMaxSigmaToVertexTPC()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(10)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
+         }
+         else if(fProtonAnalysisBase->GetSigmaToVertex(track) <= fProtonAnalysisBase->GetMaxSigmaToVertexTPC())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(10)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
+       }//sigma to vertex TPC
+       if(fProtonAnalysisBase->IsUsedMaxDCAXY()) {
+         if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXY()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(11)))->Fill(TMath::Abs(dca[0]));
+         }
+         else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXY())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(11)))->Fill(TMath::Abs(dca[0]));
+       }//DCA xy global tracking
+       if(fProtonAnalysisBase->IsUsedMaxDCAXYTPC()) {
+         if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXYTPC()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(12)))->Fill(TMath::Abs(dca[0]));
+         }
+         else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXYTPC())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(12)))->Fill(TMath::Abs(dca[0]));
+       }//DCA xy TPC tracking
+       if(fProtonAnalysisBase->IsUsedMaxDCAZ()) {
+         if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZ()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(13)))->Fill(TMath::Abs(dca[1]));
+         }
+         else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZ())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(13)))->Fill(TMath::Abs(dca[1]));
+       }//DCA z global tracking
+       if(fProtonAnalysisBase->IsUsedMaxDCAZTPC()) {
+         if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZTPC()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(14)))->Fill(TMath::Abs(dca[1]));
+         }
+         else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZTPC())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(14)))->Fill(TMath::Abs(dca[1]));
+       }//DCA z TPC tracking
+       if(fProtonAnalysisBase->IsUsedMaxConstrainChi2()) {
+         if(track->GetConstrainedChi2() > 0) {
+           if(TMath::Log(track->GetConstrainedChi2()) > fProtonAnalysisBase->GetMaxConstrainChi2()) {
+             ((TH1F *)(fQAPrimaryProtonsRejectedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
+           }
+           else if(TMath::Log(track->GetConstrainedChi2()) <= fProtonAnalysisBase->GetMaxConstrainChi2())
+             ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
+         }
+       }//constrain chi2 - vertex
+       if(fProtonAnalysisBase->IsUsedITSRefit()) {
+         if ((track->GetStatus() & AliESDtrack::kITSrefit) == 0) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(16)))->Fill(0);
+         }
+         else if((track->GetStatus() & AliESDtrack::kITSrefit) != 0)
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(16)))->Fill(0);
+       }//ITS refit
+       if(fProtonAnalysisBase->IsUsedTPCRefit()) {
+         if ((track->GetStatus() & AliESDtrack::kTPCrefit) == 0) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(17)))->Fill(0);
+         }
+         else if((track->GetStatus() & AliESDtrack::kTPCrefit) != 0)
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(17)))->Fill(0);
+       }//TPC refit
+       if(fProtonAnalysisBase->IsUsedESDpid()) {
+         if ((track->GetStatus() & AliESDtrack::kESDpid) == 0) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(18)))->Fill(0);
+         }
+         else if((track->GetStatus() & AliESDtrack::kESDpid) != 0)
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(18)))->Fill(0);
+       }//ESD pid
+       if(fProtonAnalysisBase->IsUsedTPCpid()) {
+         if ((track->GetStatus() & AliESDtrack::kTPCpid) == 0) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(19)))->Fill(0);
        }
-       else if((track->GetStatus() & AliESDtrack::kTPCpid) != 0)
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(19)))->Fill(0);
-      }//TPC pid
-      if(fPointOnITSLayer1Flag) {
-       if(!track->HasPointOnITSLayer(0)) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(20)))->Fill(0);
+         else if((track->GetStatus() & AliESDtrack::kTPCpid) != 0)
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(19)))->Fill(0);
+       }//TPC pid
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer1()) {
+         if(!track->HasPointOnITSLayer(0)) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(20)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(0))
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(20)))->Fill(0);
+       }//point on SPD1
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer2()) {
+         if(!track->HasPointOnITSLayer(1)) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(21)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(1))
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(21)))->Fill(0);
+       }//point on SPD2
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer3()) {
+         if(!track->HasPointOnITSLayer(2)) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(22)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(2))
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(22)))->Fill(0);
+       }//point on SDD1
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer4()) {
+         if(!track->HasPointOnITSLayer(3)) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(23)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(3))
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(23)))->Fill(0);
+       }//point on SDD2
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer5()) {
+         if(!track->HasPointOnITSLayer(4)) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(24)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(4))
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(24)))->Fill(0);
+       }//point on SSD1
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer6()) {
+         if(!track->HasPointOnITSLayer(5)) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(25)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(5))
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(25)))->Fill(0);
+       }//point on SSD2
+       if(fProtonAnalysisBase->IsUsedMinTPCdEdxPoints()) {
+         if(track->GetTPCsignalN() < fProtonAnalysisBase->GetMinTPCdEdxPoints()) {
+           ((TH1F *)(fQAPrimaryProtonsRejectedList->At(26)))->Fill(track->GetTPCsignalN());
        }
-       else if(track->HasPointOnITSLayer(0))
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(20)))->Fill(0);
-      }//point on SPD1
-      if(fPointOnITSLayer2Flag) {
-       if(!track->HasPointOnITSLayer(1)) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(21)))->Fill(0);
+         if(track->GetTPCsignalN() >= fProtonAnalysisBase->GetMinTPCdEdxPoints())
+           ((TH1F *)(fQAPrimaryProtonsAcceptedList->At(26)))->Fill(track->GetTPCsignalN());
+       }//number of TPC points for the dE/dx
+       
+       /*if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXY()) {
+         ((TH2F *)(fQAPrimaryProtonsRejectedList->At(27)))->Fill(gPt,TMath::Abs(dca[0]));
        }
-       else if(track->HasPointOnITSLayer(1))
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(21)))->Fill(0);
-      }//point on SPD2
-      if(fPointOnITSLayer3Flag) {
-       if(!track->HasPointOnITSLayer(2)) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(22)))->Fill(0);
+       else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXY())
+         ((TH2F *)(fQAPrimaryProtonsAcceptedList->At(27)))->Fill(gPt,TMath::Abs(dca[0]));
+       if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZ()) {
+         ((TH2F *)(fQAPrimaryProtonsRejectedList->At(28)))->Fill(gPt,TMath::Abs(dca[1]));
        }
-       else if(track->HasPointOnITSLayer(2))
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(22)))->Fill(0);
-      }//point on SDD1
-      if(fPointOnITSLayer4Flag) {
-       if(!track->HasPointOnITSLayer(3)) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(23)))->Fill(0);
+       else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZ())
+       ((TH2F *)(fQAPrimaryProtonsAcceptedList->At(28)))->Fill(gPt,TMath::Abs(dca[1]));*/
+      }//primary particle cut
+      
+      //Secondaries
+      if(label > nPrimaries) {
+       if(fProtonAnalysisBase->IsUsedMinITSClusters()) {
+         if(nClustersITS < fProtonAnalysisBase->GetMinITSClusters()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(0)))->Fill(nClustersITS);
+         }
+         else if(nClustersITS >= fProtonAnalysisBase->GetMinITSClusters()) 
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(0)))->Fill(nClustersITS);
+       }//ITS clusters
+       if(fProtonAnalysisBase->IsUsedMaxChi2PerITSCluster()) {
+         if(chi2PerClusterITS > fProtonAnalysisBase->GetMaxChi2PerITSCluster()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(1)))->Fill(chi2PerClusterITS);
+         }
+         else if(chi2PerClusterITS <= fProtonAnalysisBase->GetMaxChi2PerITSCluster())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(1)))->Fill(chi2PerClusterITS);
+       }//chi2 per ITS cluster
+       if(fProtonAnalysisBase->IsUsedMinTPCClusters()) {
+         if(nClustersTPC < fProtonAnalysisBase->GetMinTPCClusters()) {
+           //cout<<"Secondary proton rejected"<<endl;
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(2)))->Fill(nClustersTPC);
+         }
+         else if(nClustersTPC >= fProtonAnalysisBase->GetMinTPCClusters()) {
+           //cout<<"Secondary proton accepted"<<endl;
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(2)))->Fill(nClustersTPC);
+         }
+       }//TPC clusters
+       if(fProtonAnalysisBase->IsUsedMaxChi2PerTPCCluster()) {
+         if(chi2PerClusterTPC > fProtonAnalysisBase->GetMaxChi2PerTPCCluster()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(3)))->Fill(chi2PerClusterTPC);
+         }
+         else if(chi2PerClusterTPC <= fProtonAnalysisBase->GetMaxChi2PerTPCCluster())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(3)))->Fill(chi2PerClusterTPC);
+       }//chi2 per TPC cluster
+       if(fProtonAnalysisBase->IsUsedMaxCov11()) {
+         if(extCov[0] > fProtonAnalysisBase->GetMaxCov11()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(4)))->Fill(extCov[0]);
+         }
+         else if(extCov[0] <= fProtonAnalysisBase->GetMaxCov11())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(4)))->Fill(extCov[0]);
+       }//cov11
+       if(fProtonAnalysisBase->IsUsedMaxCov22()) {
+         if(extCov[2] > fProtonAnalysisBase->GetMaxCov22()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(5)))->Fill(extCov[2]);
+         }
+         else if(extCov[2] <= fProtonAnalysisBase->GetMaxCov22())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(5)))->Fill(extCov[2]);
+       }//cov11
+       if(fProtonAnalysisBase->IsUsedMaxCov33()) {
+         if(extCov[5] > fProtonAnalysisBase->GetMaxCov33()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(6)))->Fill(extCov[5]);
+         }
+         else if(extCov[5] <= fProtonAnalysisBase->GetMaxCov33())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(6)))->Fill(extCov[5]);
+       }//cov11
+       if(fProtonAnalysisBase->IsUsedMaxCov44()) {
+         if(extCov[9] > fProtonAnalysisBase->GetMaxCov44()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(7)))->Fill(extCov[9]);
+         }
+         else if(extCov[9] <= fProtonAnalysisBase->GetMaxCov44())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(7)))->Fill(extCov[9]);
+       }//cov11
+       if(fProtonAnalysisBase->IsUsedMaxCov55()) {
+         if(extCov[14] > fProtonAnalysisBase->GetMaxCov55()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(8)))->Fill(extCov[14]);
+         }
+         else if(extCov[14] <= fProtonAnalysisBase->GetMaxCov55())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(8)))->Fill(extCov[14]);
+       }//cov55
+       if(fProtonAnalysisBase->IsUsedMaxSigmaToVertex()) {
+         if(fProtonAnalysisBase->GetSigmaToVertex(track) > fProtonAnalysisBase->GetMaxSigmaToVertex()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(9)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
+         }
+         else if(fProtonAnalysisBase->GetSigmaToVertex(track) <= fProtonAnalysisBase->GetMaxSigmaToVertex())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(9)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
+       }//sigma to vertex
+       if(fProtonAnalysisBase->IsUsedMaxSigmaToVertexTPC()) {
+         if(fProtonAnalysisBase->GetSigmaToVertex(track) > fProtonAnalysisBase->GetMaxSigmaToVertexTPC()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(10)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
+         }
+         else if(fProtonAnalysisBase->GetSigmaToVertex(track) <= fProtonAnalysisBase->GetMaxSigmaToVertexTPC())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(10)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
+       }//sigma to vertex TPC
+       if(fProtonAnalysisBase->IsUsedMaxDCAXY()) {
+         if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXY()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(11)))->Fill(TMath::Abs(dca[0]));
+         }
+         else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXY())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(11)))->Fill(TMath::Abs(dca[0]));
+       }//DCA xy global tracking
+       if(fProtonAnalysisBase->IsUsedMaxDCAXYTPC()) {
+         if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXYTPC()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(12)))->Fill(TMath::Abs(dca[0]));
+         }
+         else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXYTPC())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(12)))->Fill(TMath::Abs(dca[0]));
+       }//DCA xy TPC tracking
+       if(fProtonAnalysisBase->IsUsedMaxDCAZ()) {
+         if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZ()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(13)))->Fill(TMath::Abs(dca[1]));
+         }
+         else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZ())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(13)))->Fill(TMath::Abs(dca[1]));
+       }//DCA z global tracking
+       if(fProtonAnalysisBase->IsUsedMaxDCAZTPC()) {
+         if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZTPC()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(14)))->Fill(TMath::Abs(dca[1]));
+         }
+         else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZTPC())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(14)))->Fill(TMath::Abs(dca[1]));
+       }//DCA z TPC tracking
+       if(fProtonAnalysisBase->IsUsedMaxConstrainChi2()) {
+         if(track->GetConstrainedChi2() > 0) {
+           if(TMath::Log(track->GetConstrainedChi2()) > fProtonAnalysisBase->GetMaxConstrainChi2()) {
+             ((TH1F *)(fQASecondaryProtonsRejectedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
+           }
+           else if(TMath::Log(track->GetConstrainedChi2()) <= fProtonAnalysisBase->GetMaxConstrainChi2())
+             ((TH1F *)(fQASecondaryProtonsAcceptedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
+         }
+       }//constrain chi2 - vertex
+       if(fProtonAnalysisBase->IsUsedITSRefit()) {
+         if ((track->GetStatus() & AliESDtrack::kITSrefit) == 0) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(16)))->Fill(0);
+         }
+         else if((track->GetStatus() & AliESDtrack::kITSrefit) != 0)
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(16)))->Fill(0);
+       }//ITS refit
+       if(fProtonAnalysisBase->IsUsedTPCRefit()) {
+         if ((track->GetStatus() & AliESDtrack::kTPCrefit) == 0) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(17)))->Fill(0);
+         }
+         else if((track->GetStatus() & AliESDtrack::kTPCrefit) != 0)
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(17)))->Fill(0);
+       }//TPC refit
+       if(fProtonAnalysisBase->IsUsedESDpid()) {
+         if ((track->GetStatus() & AliESDtrack::kESDpid) == 0) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(18)))->Fill(0);
+         }
+         else if((track->GetStatus() & AliESDtrack::kESDpid) != 0)
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(18)))->Fill(0);
+       }//ESD pid
+       if(fProtonAnalysisBase->IsUsedTPCpid()) {
+         if ((track->GetStatus() & AliESDtrack::kTPCpid) == 0) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(19)))->Fill(0);
+         }
+         else if((track->GetStatus() & AliESDtrack::kTPCpid) != 0)
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(19)))->Fill(0);
+       }//TPC pid
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer1()) {
+         if(!track->HasPointOnITSLayer(0)) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(20)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(0))
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(20)))->Fill(0);
+       }//point on SPD1
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer2()) {
+         if(!track->HasPointOnITSLayer(1)) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(21)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(1))
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(21)))->Fill(0);
+       }//point on SPD2
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer3()) {
+         if(!track->HasPointOnITSLayer(2)) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(22)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(2))
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(22)))->Fill(0);
+       }//point on SDD1
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer4()) {
+         if(!track->HasPointOnITSLayer(3)) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(23)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(3))
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(23)))->Fill(0);
+       }//point on SDD2
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer5()) {
+         if(!track->HasPointOnITSLayer(4)) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(24)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(4))
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(24)))->Fill(0);
+       }//point on SSD1
+       if(fProtonAnalysisBase->IsUsedPointOnITSLayer6()) {
+         if(!track->HasPointOnITSLayer(5)) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(25)))->Fill(0);
+         }
+         else if(track->HasPointOnITSLayer(5))
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(25)))->Fill(0);
+       }//point on SSD2
+       if(fProtonAnalysisBase->IsUsedMinTPCdEdxPoints()) {
+         if(track->GetTPCsignalN() < fProtonAnalysisBase->GetMinTPCdEdxPoints()) {
+           ((TH1F *)(fQASecondaryProtonsRejectedList->At(26)))->Fill(track->GetTPCsignalN());
+         }
+         if(track->GetTPCsignalN() >= fProtonAnalysisBase->GetMinTPCdEdxPoints())
+           ((TH1F *)(fQASecondaryProtonsAcceptedList->At(26)))->Fill(track->GetTPCsignalN());
+       }//number of TPC points for the dE/dx
+
+       /*if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXY()) {
+         if(gProcess == 4)
+           ((TH2F *)(fQASecondaryProtonsRejectedList->At(27)))->Fill(gPt,TMath::Abs(dca[0]));
+         if(gProcess == 13)
+           ((TH2F *)(fQASecondaryProtonsRejectedList->At(29)))->Fill(gPt,TMath::Abs(dca[0]));
        }
-       else if(track->HasPointOnITSLayer(3))
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(23)))->Fill(0);
-      }//point on SDD2
-      if(fPointOnITSLayer5Flag) {
-       if(!track->HasPointOnITSLayer(4)) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(24)))->Fill(0);
+       else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXY()) {
+         if(gProcess == 4)
+           ((TH2F *)(fQASecondaryProtonsAcceptedList->At(27)))->Fill(gPt,TMath::Abs(dca[0]));
+         if(gProcess == 13)
+           ((TH2F *)(fQASecondaryProtonsAcceptedList->At(29)))->Fill(gPt,TMath::Abs(dca[0]));
        }
-       else if(track->HasPointOnITSLayer(4))
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(24)))->Fill(0);
-      }//point on SSD1
-      if(fPointOnITSLayer6Flag) {
-       if(!track->HasPointOnITSLayer(5)) {
-         ((TH1F *)(fQASecondaryProtonsRejectedList->At(25)))->Fill(0);
+       if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZ()) {
+         if(gProcess == 4)
+           ((TH2F *)(fQASecondaryProtonsRejectedList->At(28)))->Fill(gPt,TMath::Abs(dca[1]));
+         if(gProcess == 13)
+           ((TH2F *)(fQASecondaryProtonsRejectedList->At(30)))->Fill(gPt,TMath::Abs(dca[1]));
        }
-       else if(track->HasPointOnITSLayer(5))
-         ((TH1F *)(fQASecondaryProtonsAcceptedList->At(25)))->Fill(0);
-      }//point on SSD2
-    }//secondary particle cut
-  }//protons
-
-  //antiprotons
-  if(track->Charge() < 0) {
-    //Primaries
-    if(label <= nPrimaries) {
-      if(fMinITSClustersFlag) {
-       if(nClustersITS < fMinITSClusters) {
+       else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZ()) {
+         if(gProcess == 4)
+           ((TH2F *)(fQASecondaryProtonsAcceptedList->At(28)))->Fill(gPt,TMath::Abs(dca[1]));
+         if(gProcess == 13)
+           ((TH2F *)(fQASecondaryProtonsAcceptedList->At(30)))->Fill(gPt,TMath::Abs(dca[1]));
+           }*/
+      }//secondary particle cut
+    }//protons
+    
+    //antiprotons
+    if(track->Charge() < 0) {
+      //Primaries
+      if(label <= nPrimaries) {
+       if(fProtonAnalysisBase->IsUsedMinITSClusters()) {
+       if(nClustersITS < fProtonAnalysisBase->GetMinITSClusters()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(0)))->Fill(nClustersITS);
-         //status = kFALSE;
        }
-       else if(nClustersITS >= fMinITSClusters
+       else if(nClustersITS >= fProtonAnalysisBase->GetMinITSClusters()
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(0)))->Fill(nClustersITS);
       }//ITS clusters
-      if(fMaxChi2PerITSClusterFlag) {
-       if(chi2PerClusterITS > fMaxChi2PerITSCluster) {
+      if(fProtonAnalysisBase->IsUsedMaxChi2PerITSCluster()) {
+       if(chi2PerClusterITS > fProtonAnalysisBase->GetMaxChi2PerITSCluster()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(1)))->Fill(chi2PerClusterITS);
-         //status = kFALSE;
        }
-       else if(chi2PerClusterITS <= fMaxChi2PerITSCluster)
+       else if(chi2PerClusterITS <= fProtonAnalysisBase->GetMaxChi2PerITSCluster())
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(1)))->Fill(chi2PerClusterITS);
       }//chi2 per ITS cluster
-      if(fMinTPCClustersFlag) {
-       if(nClustersTPC < fMinTPCClusters) {
+      if(fProtonAnalysisBase->IsUsedMinTPCClusters()) {
+       if(nClustersTPC < fProtonAnalysisBase->GetMinTPCClusters()) {
          //cout<<"Primary antiproton rejected"<<endl;
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(2)))->Fill(nClustersTPC);
-         //status = kFALSE;
        }
-       else if(nClustersTPC >= fMinTPCClusters) {
-         //cout<<"Primary antiproton accepted"<<endl;
+       else if(nClustersTPC >= fProtonAnalysisBase->GetMinTPCClusters()) {
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(2)))->Fill(nClustersTPC);
        }
       }//TPC clusters
-      if(fMaxChi2PerTPCClusterFlag) {
-       if(chi2PerClusterTPC > fMaxChi2PerTPCCluster) {
+      if(fProtonAnalysisBase->IsUsedMaxChi2PerTPCCluster()) {
+       if(chi2PerClusterTPC > fProtonAnalysisBase->GetMaxChi2PerTPCCluster()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(3)))->Fill(chi2PerClusterTPC);
-         //status = kFALSE;
        }
-       else if(chi2PerClusterTPC <= fMaxChi2PerTPCCluster)
+       else if(chi2PerClusterTPC <= fProtonAnalysisBase->GetMaxChi2PerTPCCluster())
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(3)))->Fill(chi2PerClusterTPC);
       }//chi2 per TPC cluster
-      if(fMaxCov11Flag) {
-       if(extCov[0] > fMaxCov11) {
+      if(fProtonAnalysisBase->IsUsedMaxCov11()) {
+       if(extCov[0] > fProtonAnalysisBase->GetMaxCov11()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(4)))->Fill(extCov[0]);
-         //status = kFALSE;
        }
-       else if(extCov[0] <= fMaxCov11)
+       else if(extCov[0] <= fProtonAnalysisBase->GetMaxCov11())
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(4)))->Fill(extCov[0]);
       }//cov11
-      if(fMaxCov22Flag) {
-       if(extCov[2] > fMaxCov22) {
+      if(fProtonAnalysisBase->IsUsedMaxCov22()) {
+       if(extCov[2] > fProtonAnalysisBase->GetMaxCov22()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(5)))->Fill(extCov[2]);
-         //status = kFALSE;
        }
-       else if(extCov[2] <= fMaxCov22)
+       else if(extCov[2] <= fProtonAnalysisBase->GetMaxCov22())
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(5)))->Fill(extCov[2]);
       }//cov11
-      if(fMaxCov33Flag) {
-       if(extCov[5] > fMaxCov33) {
+      if(fProtonAnalysisBase->IsUsedMaxCov33()) {
+       if(extCov[5] > fProtonAnalysisBase->GetMaxCov33()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(6)))->Fill(extCov[5]);
-         //status = kFALSE;
        }
-       else if(extCov[5] <= fMaxCov33)
+       else if(extCov[5] <= fProtonAnalysisBase->GetMaxCov33())
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(6)))->Fill(extCov[5]);
       }//cov11
-      if(fMaxCov44Flag) {
-       if(extCov[9] > fMaxCov44) {
+      if(fProtonAnalysisBase->IsUsedMaxCov44()) {
+       if(extCov[9] > fProtonAnalysisBase->GetMaxCov44()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(7)))->Fill(extCov[9]);
-         //status = kFALSE;
        }
-       else if(extCov[9] <= fMaxCov44)
+       else if(extCov[9] <= fProtonAnalysisBase->GetMaxCov44())
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(7)))->Fill(extCov[9]);
       }//cov11
-      if(fMaxCov55Flag) {
-       if(extCov[14] > fMaxCov55) {
+      if(fProtonAnalysisBase->IsUsedMaxCov55()) {
+       if(extCov[14] > fProtonAnalysisBase->GetMaxCov55()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(8)))->Fill(extCov[14]);
-         //status = kFALSE;
        }
-       else if(extCov[14] <= fMaxCov55)
+       else if(extCov[14] <= fProtonAnalysisBase->GetMaxCov55())
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(8)))->Fill(extCov[14]);
       }//cov55
-      if(fMaxSigmaToVertexFlag) {
-       if(GetSigmaToVertex(track) > fMaxSigmaToVertex) {
-         ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(9)))->Fill(GetSigmaToVertex(track));
-         //status = kFALSE;
+      if(fProtonAnalysisBase->IsUsedMaxSigmaToVertex()) {
+       if(fProtonAnalysisBase->GetSigmaToVertex(track) > fProtonAnalysisBase->GetMaxSigmaToVertex()) {
+         ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(9)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
        }
-       else if(GetSigmaToVertex(track) <= fMaxSigmaToVertex)
-         ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(9)))->Fill(GetSigmaToVertex(track));
+       else if(fProtonAnalysisBase->GetSigmaToVertex(track) <= fProtonAnalysisBase->GetMaxSigmaToVertex())
+         ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(9)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
       }//sigma to vertex
-      if(fMaxSigmaToVertexTPCFlag) {
-       if(GetSigmaToVertex(track) > fMaxSigmaToVertexTPC) {
-         ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(10)))->Fill(GetSigmaToVertex(track));
-         //status = kFALSE;
+      if(fProtonAnalysisBase->IsUsedMaxSigmaToVertexTPC()) {
+       if(fProtonAnalysisBase->GetSigmaToVertex(track) > fProtonAnalysisBase->GetMaxSigmaToVertexTPC()) {
+         ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(10)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
        }
-       else if(GetSigmaToVertex(track) <= fMaxSigmaToVertexTPC)
-         ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(10)))->Fill(GetSigmaToVertex(track));
+       else if(fProtonAnalysisBase->GetSigmaToVertex(track) <= fProtonAnalysisBase->GetMaxSigmaToVertexTPC())
+         ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(10)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
       }//sigma to vertex TPC
-      if(fMaxDCAXYFlag) {
-       if(TMath::Abs(dca[0]) > fMaxDCAXY) {
+      if(fProtonAnalysisBase->IsUsedMaxDCAXY()) {
+       if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXY()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(11)))->Fill(TMath::Abs(dca[0]));
-         //status = kFALSE;
        }
-       else if(TMath::Abs(dca[0]) <= fMaxDCAXY)
+       else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXY())
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(11)))->Fill(TMath::Abs(dca[0]));
       }//DCA xy global tracking
-      if(fMaxDCAXYTPCFlag) {
-       if(TMath::Abs(dca[0]) > fMaxDCAXYTPC) {
+      if(fProtonAnalysisBase->IsUsedMaxDCAXYTPC()) {
+       if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXYTPC()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(12)))->Fill(TMath::Abs(dca[0]));
-         //status = kFALSE;
        }
-       else if(TMath::Abs(dca[0]) <= fMaxDCAXYTPC)
+       else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXYTPC())
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(12)))->Fill(TMath::Abs(dca[0]));
       }//DCA xy TPC tracking
-      if(fMaxDCAZFlag) {
-       if(TMath::Abs(dca[1]) > fMaxDCAZ) {
+      if(fProtonAnalysisBase->IsUsedMaxDCAZ()) {
+       if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZ()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(13)))->Fill(TMath::Abs(dca[1]));
-         //status = kFALSE;
        }
-       else if(TMath::Abs(dca[1]) <= fMaxDCAZ)
+       else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZ())
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(13)))->Fill(TMath::Abs(dca[1]));
       }//DCA z global tracking
-      if(fMaxDCAZTPCFlag) {
-       if(TMath::Abs(dca[1]) > fMaxDCAZTPC) {
+      if(fProtonAnalysisBase->IsUsedMaxDCAZTPC()) {
+       if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZTPC()) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(14)))->Fill(TMath::Abs(dca[1]));
-         //status = kFALSE;
        }
-       else if(TMath::Abs(dca[1]) <= fMaxDCAZTPC)
+       else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZTPC())
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(14)))->Fill(TMath::Abs(dca[1]));
       }//DCA z TPC tracking
-      if(fMaxConstrainChi2Flag) {
+      if(fProtonAnalysisBase->IsUsedMaxConstrainChi2()) {
        if(track->GetConstrainedChi2() > 0) {
-         if(TMath::Log(track->GetConstrainedChi2()) > fMaxConstrainChi2) {
+         if(TMath::Log(track->GetConstrainedChi2()) > fProtonAnalysisBase->GetMaxConstrainChi2()) {
            ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
-           //status = kFALSE;
          }
-         else if(TMath::Log(track->GetConstrainedChi2()) <= fMaxConstrainChi2)
+         else if(TMath::Log(track->GetConstrainedChi2()) <= fProtonAnalysisBase->GetMaxConstrainChi2())
            ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
        }
       }//constrain chi2 - vertex
-      if(fITSRefitFlag) {
+      if(fProtonAnalysisBase->IsUsedITSRefit()) {
        if ((track->GetStatus() & AliESDtrack::kITSrefit) == 0) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(16)))->Fill(0);
-       //status = kFALSE;
        }
        else if((track->GetStatus() & AliESDtrack::kITSrefit) != 0)
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(16)))->Fill(0);
       }//ITS refit
-      if(fTPCRefitFlag) {
+      if(fProtonAnalysisBase->IsUsedTPCRefit()) {
        if ((track->GetStatus() & AliESDtrack::kTPCrefit) == 0) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(17)))->Fill(0);
-         //status = kFALSE;
        }
        else if((track->GetStatus() & AliESDtrack::kTPCrefit) != 0)
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(17)))->Fill(0);
       }//TPC refit
-      if(fESDpidFlag) {
+      if(fProtonAnalysisBase->IsUsedESDpid()) {
        if ((track->GetStatus() & AliESDtrack::kESDpid) == 0) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(18)))->Fill(0);
-         //status = kFALSE;
        }
        else if((track->GetStatus() & AliESDtrack::kESDpid) != 0)
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(18)))->Fill(0);
       }//ESD pid
-      if(fTPCpidFlag) {
+      if(fProtonAnalysisBase->IsUsedTPCpid()) {
        if ((track->GetStatus() & AliESDtrack::kTPCpid) == 0) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(19)))->Fill(0);
-         //status = kFALSE;
        }
        else if((track->GetStatus() & AliESDtrack::kTPCpid) != 0)
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(19)))->Fill(0);
       }//TPC pid
-      if(fPointOnITSLayer1Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer1()) {
        if(!track->HasPointOnITSLayer(0)) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(20)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(0))
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(20)))->Fill(0);
       }//point on SPD1
-      if(fPointOnITSLayer2Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer2()) {
        if(!track->HasPointOnITSLayer(1)) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(21)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(1))
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(21)))->Fill(0);
       }//point on SPD2
-      if(fPointOnITSLayer3Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer3()) {
        if(!track->HasPointOnITSLayer(2)) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(22)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(2))
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(22)))->Fill(0);
       }//point on SDD1
-      if(fPointOnITSLayer4Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer4()) {
        if(!track->HasPointOnITSLayer(3)) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(23)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(3))
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(23)))->Fill(0);
       }//point on SDD2
-      if(fPointOnITSLayer5Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer5()) {
        if(!track->HasPointOnITSLayer(4)) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(24)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(4))
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(24)))->Fill(0);
       }//point on SSD1
-      if(fPointOnITSLayer6Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer6()) {
        if(!track->HasPointOnITSLayer(5)) {
          ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(25)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(5))
          ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(25)))->Fill(0);
       }//point on SSD2
+      if(fProtonAnalysisBase->IsUsedMinTPCdEdxPoints()) {
+       if(track->GetTPCsignalN() < fProtonAnalysisBase->GetMinTPCdEdxPoints()) {
+         ((TH1F *)(fQAPrimaryAntiProtonsRejectedList->At(26)))->Fill(track->GetTPCsignalN());
+       }
+       if(track->GetTPCsignalN() >= fProtonAnalysisBase->GetMinTPCdEdxPoints())
+         ((TH1F *)(fQAPrimaryAntiProtonsAcceptedList->At(26)))->Fill(track->GetTPCsignalN());
+      }//number of TPC points for the dE/dx
+
+      /*if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXY()) {
+       ((TH2F *)(fQAPrimaryAntiProtonsRejectedList->At(27)))->Fill(gPt,TMath::Abs(dca[0]));
+      }
+      else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXY())
+       ((TH2F *)(fQAPrimaryAntiProtonsAcceptedList->At(27)))->Fill(gPt,TMath::Abs(dca[0]));
+      if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZ()) {
+       ((TH2F *)(fQAPrimaryAntiProtonsRejectedList->At(28)))->Fill(gPt,TMath::Abs(dca[1]));
+      }
+      else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZ())
+      ((TH2F *)(fQAPrimaryAntiProtonsAcceptedList->At(28)))->Fill(gPt,TMath::Abs(dca[1]));*/
     }//primary particle cut
 
     //Secondaries
     if(label > nPrimaries) {
-      if(fMinITSClustersFlag) {
-       if(nClustersITS < fMinITSClusters) {
+      if(fProtonAnalysisBase->IsUsedMinITSClusters()) {
+       if(nClustersITS < fProtonAnalysisBase->GetMinITSClusters()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(0)))->Fill(nClustersITS);
-         //status = kFALSE;
        }
-       else if(nClustersITS >= fMinITSClusters
+       else if(nClustersITS >= fProtonAnalysisBase->GetMinITSClusters()
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(0)))->Fill(nClustersITS);
       }//ITS clusters
-      if(fMaxChi2PerITSClusterFlag) {
-       if(chi2PerClusterITS > fMaxChi2PerITSCluster) {
+      if(fProtonAnalysisBase->IsUsedMaxChi2PerITSCluster()) {
+       if(chi2PerClusterITS > fProtonAnalysisBase->GetMaxChi2PerITSCluster()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(1)))->Fill(chi2PerClusterITS);
-         //status = kFALSE;
        }
-       else if(chi2PerClusterITS <= fMaxChi2PerITSCluster)
+       else if(chi2PerClusterITS <= fProtonAnalysisBase->GetMaxChi2PerITSCluster())
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(1)))->Fill(chi2PerClusterITS);
       }//chi2 per ITS cluster
-      if(fMinTPCClustersFlag) {
-       if(nClustersTPC < fMinTPCClusters) {
-         //cout<<"Secondary antiproton rejected"<<endl;
+      if(fProtonAnalysisBase->IsUsedMinTPCClusters()) {
+       if(nClustersTPC < fProtonAnalysisBase->GetMinTPCClusters()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(2)))->Fill(nClustersTPC);
-         //status = kFALSE;
        }
-       else if(nClustersTPC >= fMinTPCClusters) {
-         //cout<<"Secondary antiproton accepted"<<endl;
+       else if(nClustersTPC >= fProtonAnalysisBase->GetMinTPCClusters()) {
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(2)))->Fill(nClustersTPC);
        }
       }//TPC clusters
-      if(fMaxChi2PerTPCClusterFlag) {
-       if(chi2PerClusterTPC > fMaxChi2PerTPCCluster) {
+      if(fProtonAnalysisBase->IsUsedMaxChi2PerTPCCluster()) {
+       if(chi2PerClusterTPC > fProtonAnalysisBase->GetMaxChi2PerTPCCluster()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(3)))->Fill(chi2PerClusterTPC);
-         //status = kFALSE;
        }
-       else if(chi2PerClusterTPC <= fMaxChi2PerTPCCluster)
+       else if(chi2PerClusterTPC <= fProtonAnalysisBase->GetMaxChi2PerTPCCluster())
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(3)))->Fill(chi2PerClusterTPC);
       }//chi2 per TPC cluster
-      if(fMaxCov11Flag) {
-       if(extCov[0] > fMaxCov11) {
+      if(fProtonAnalysisBase->IsUsedMaxCov11()) {
+       if(extCov[0] > fProtonAnalysisBase->GetMaxCov11()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(4)))->Fill(extCov[0]);
-         //status = kFALSE;
        }
-       else if(extCov[0] <= fMaxCov11)
+       else if(extCov[0] <= fProtonAnalysisBase->GetMaxCov11())
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(4)))->Fill(extCov[0]);
       }//cov11
-      if(fMaxCov22Flag) {
-       if(extCov[2] > fMaxCov22) {
+      if(fProtonAnalysisBase->IsUsedMaxCov22()) {
+       if(extCov[2] > fProtonAnalysisBase->GetMaxCov22()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(5)))->Fill(extCov[2]);
-         //status = kFALSE;
        }
-       else if(extCov[2] <= fMaxCov22)
+       else if(extCov[2] <= fProtonAnalysisBase->GetMaxCov22())
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(5)))->Fill(extCov[2]);
       }//cov11
-      if(fMaxCov33Flag) {
-       if(extCov[5] > fMaxCov33) {
+      if(fProtonAnalysisBase->IsUsedMaxCov33()) {
+       if(extCov[5] > fProtonAnalysisBase->GetMaxCov33()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(6)))->Fill(extCov[5]);
-         //status = kFALSE;
        }
-       else if(extCov[5] <= fMaxCov33)
+       else if(extCov[5] <= fProtonAnalysisBase->GetMaxCov33())
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(6)))->Fill(extCov[5]);
       }//cov11
-      if(fMaxCov44Flag) {
-       if(extCov[9] > fMaxCov44) {
+      if(fProtonAnalysisBase->IsUsedMaxCov44()) {
+       if(extCov[9] > fProtonAnalysisBase->GetMaxCov44()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(7)))->Fill(extCov[9]);
-         //status = kFALSE;
        }
-       else if(extCov[9] <= fMaxCov44)
+       else if(extCov[9] <= fProtonAnalysisBase->GetMaxCov44())
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(7)))->Fill(extCov[9]);
       }//cov11
-      if(fMaxCov55Flag) {
-       if(extCov[14] > fMaxCov55) {
+      if(fProtonAnalysisBase->IsUsedMaxCov55()) {
+       if(extCov[14] > fProtonAnalysisBase->GetMaxCov55()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(8)))->Fill(extCov[14]);
-         //status = kFALSE;
        }
-       else if(extCov[14] <= fMaxCov55)
+       else if(extCov[14] <= fProtonAnalysisBase->GetMaxCov55())
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(8)))->Fill(extCov[14]);
       }//cov55
-      if(fMaxSigmaToVertexFlag) {
-       if(GetSigmaToVertex(track) > fMaxSigmaToVertex) {
-         ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(9)))->Fill(GetSigmaToVertex(track));
-         //status = kFALSE;
+      if(fProtonAnalysisBase->IsUsedMaxSigmaToVertex()) {
+       if(fProtonAnalysisBase->GetSigmaToVertex(track) > fProtonAnalysisBase->GetMaxSigmaToVertex()) {
+         ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(9)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
        }
-       else if(GetSigmaToVertex(track) <= fMaxSigmaToVertex)
-         ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(9)))->Fill(GetSigmaToVertex(track));
+       else if(fProtonAnalysisBase->GetSigmaToVertex(track) <= fProtonAnalysisBase->GetMaxSigmaToVertex())
+         ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(9)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
       }//sigma to vertex
-      if(fMaxSigmaToVertexTPCFlag) {
-       if(GetSigmaToVertex(track) > fMaxSigmaToVertexTPC) {
-         ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(10)))->Fill(GetSigmaToVertex(track));
-         //status = kFALSE;
+      if(fProtonAnalysisBase->IsUsedMaxSigmaToVertexTPC()) {
+       if(fProtonAnalysisBase->GetSigmaToVertex(track) > fProtonAnalysisBase->GetMaxSigmaToVertexTPC()) {
+         ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(10)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
        }
-       else if(GetSigmaToVertex(track) <= fMaxSigmaToVertexTPC)
-         ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(10)))->Fill(GetSigmaToVertex(track));
+       else if(fProtonAnalysisBase->GetSigmaToVertex(track) <= fProtonAnalysisBase->GetMaxSigmaToVertexTPC())
+         ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(10)))->Fill(fProtonAnalysisBase->GetSigmaToVertex(track));
       }//sigma to vertex TPC
-      if(fMaxDCAXYFlag) {
-       if(TMath::Abs(dca[0]) > fMaxDCAXY) {
+      if(fProtonAnalysisBase->IsUsedMaxDCAXY()) {
+       if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXY()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(11)))->Fill(TMath::Abs(dca[0]));
-         //status = kFALSE;
        }
-       else if(TMath::Abs(dca[0]) <= fMaxDCAXY)
+       else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXY())
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(11)))->Fill(TMath::Abs(dca[0]));
       }//DCA xy global tracking
-      if(fMaxDCAXYTPCFlag) {
-       if(TMath::Abs(dca[0]) > fMaxDCAXYTPC) {
+      if(fProtonAnalysisBase->IsUsedMaxDCAXYTPC()) {
+       if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXYTPC()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(12)))->Fill(TMath::Abs(dca[0]));
-         //status = kFALSE;
        }
-       else if(TMath::Abs(dca[0]) <= fMaxDCAXYTPC)
+       else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXYTPC())
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(12)))->Fill(TMath::Abs(dca[0]));
       }//DCA xy TPC tracking
-      if(fMaxDCAZFlag) {
-       if(TMath::Abs(dca[1]) > fMaxDCAZ) {
+      if(fProtonAnalysisBase->IsUsedMaxDCAZ()) {
+       if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZ()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(13)))->Fill(TMath::Abs(dca[1]));
-         //status = kFALSE;
        }
-       else if(TMath::Abs(dca[1]) <= fMaxDCAZ)
+       else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZ())
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(13)))->Fill(TMath::Abs(dca[1]));
       }//DCA z global tracking
-      if(fMaxDCAZTPCFlag) {
-       if(TMath::Abs(dca[1]) > fMaxDCAZTPC) {
+      if(fProtonAnalysisBase->IsUsedMaxDCAZTPC()) {
+       if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZTPC()) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(14)))->Fill(TMath::Abs(dca[1]));
-         //status = kFALSE;
        }
-       else if(TMath::Abs(dca[1]) <= fMaxDCAZTPC)
+       else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZTPC())
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(14)))->Fill(TMath::Abs(dca[1]));
       }//DCA z TPC tracking
-      if(fMaxConstrainChi2Flag) {
+      if(fProtonAnalysisBase->IsUsedMaxConstrainChi2()) {
        if(track->GetConstrainedChi2() > 0) {
-         if(TMath::Log(track->GetConstrainedChi2()) > fMaxConstrainChi2) {
+         if(TMath::Log(track->GetConstrainedChi2()) > fProtonAnalysisBase->GetMaxConstrainChi2()) {
            ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
-           //status = kFALSE;
          }
-         else if(TMath::Log(track->GetConstrainedChi2()) <= fMaxConstrainChi2)
+         else if(TMath::Log(track->GetConstrainedChi2()) <= fProtonAnalysisBase->GetMaxConstrainChi2())
            ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(15)))->Fill(TMath::Log(track->GetConstrainedChi2()));
        }
       }//constrain chi2 - vertex
-      if(fITSRefitFlag) {
+      if(fProtonAnalysisBase->IsUsedITSRefit()) {
        if ((track->GetStatus() & AliESDtrack::kITSrefit) == 0) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(16)))->Fill(0);
-       //status = kFALSE;
        }
        else if((track->GetStatus() & AliESDtrack::kITSrefit) != 0)
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(16)))->Fill(0);
       }//ITS refit
-      if(fTPCRefitFlag) {
+      if(fProtonAnalysisBase->IsUsedTPCRefit()) {
        if ((track->GetStatus() & AliESDtrack::kTPCrefit) == 0) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(17)))->Fill(0);
-         //status = kFALSE;
        }
        else if((track->GetStatus() & AliESDtrack::kTPCrefit) != 0)
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(17)))->Fill(0);
       }//TPC refit
-      if(fESDpidFlag) {
+      if(fProtonAnalysisBase->IsUsedESDpid()) {
        if ((track->GetStatus() & AliESDtrack::kESDpid) == 0) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(18)))->Fill(0);
-         //status = kFALSE;
        }
        else if((track->GetStatus() & AliESDtrack::kESDpid) != 0)
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(18)))->Fill(0);
       }//ESD pid
-      if(fTPCpidFlag) {
+      if(fProtonAnalysisBase->IsUsedTPCpid()) {
        if ((track->GetStatus() & AliESDtrack::kTPCpid) == 0) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(19)))->Fill(0);
-         //status = kFALSE;
        }
        else if((track->GetStatus() & AliESDtrack::kTPCpid) != 0)
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(19)))->Fill(0);
       }//TPC pid
-      if(fPointOnITSLayer1Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer1()) {
        if(!track->HasPointOnITSLayer(0)) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(20)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(0))
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(20)))->Fill(0);
       }//point on SPD1
-      if(fPointOnITSLayer2Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer2()) {
        if(!track->HasPointOnITSLayer(1)) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(21)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(1))
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(21)))->Fill(0);
       }//point on SPD2
-      if(fPointOnITSLayer3Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer3()) {
        if(!track->HasPointOnITSLayer(2)) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(22)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(2))
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(22)))->Fill(0);
       }//point on SDD1
-      if(fPointOnITSLayer4Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer4()) {
        if(!track->HasPointOnITSLayer(3)) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(23)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(3))
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(23)))->Fill(0);
       }//point on SDD2
-      if(fPointOnITSLayer5Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer5()) {
        if(!track->HasPointOnITSLayer(4)) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(24)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(4))
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(24)))->Fill(0);
       }//point on SSD1
-      if(fPointOnITSLayer6Flag) {
+      if(fProtonAnalysisBase->IsUsedPointOnITSLayer6()) {
        if(!track->HasPointOnITSLayer(5)) {
          ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(25)))->Fill(0);
        }
        else if(track->HasPointOnITSLayer(5))
          ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(25)))->Fill(0);
       }//point on SSD2
+      if(fProtonAnalysisBase->IsUsedMinTPCdEdxPoints()) {
+       if(track->GetTPCsignalN() < fProtonAnalysisBase->GetMinTPCdEdxPoints()) {
+         ((TH1F *)(fQASecondaryAntiProtonsRejectedList->At(26)))->Fill(track->GetTPCsignalN());
+       }
+       if(track->GetTPCsignalN() >= fProtonAnalysisBase->GetMinTPCdEdxPoints())
+         ((TH1F *)(fQASecondaryAntiProtonsAcceptedList->At(26)))->Fill(track->GetTPCsignalN());
+      }//number of TPC points for the dE/dx
+
+      /*if(TMath::Abs(dca[0]) > fProtonAnalysisBase->GetMaxDCAXY()) {
+       if(gProcess == 4)
+         ((TH2F *)(fQASecondaryAntiProtonsRejectedList->At(27)))->Fill(gPt,TMath::Abs(dca[0]));
+       if(gProcess == 13)
+         ((TH2F *)(fQASecondaryAntiProtonsRejectedList->At(29)))->Fill(gPt,TMath::Abs(dca[0]));
+      }
+      else if(TMath::Abs(dca[0]) <= fProtonAnalysisBase->GetMaxDCAXY()) {
+       if(gProcess == 4)
+         ((TH2F *)(fQASecondaryAntiProtonsAcceptedList->At(27)))->Fill(gPt,TMath::Abs(dca[0]));
+       if(gProcess == 13)
+         ((TH2F *)(fQASecondaryAntiProtonsAcceptedList->At(29)))->Fill(gPt,TMath::Abs(dca[0]));
+      }
+      if(TMath::Abs(dca[1]) > fProtonAnalysisBase->GetMaxDCAZ()) {
+       if(gProcess == 4)
+         ((TH2F *)(fQASecondaryAntiProtonsRejectedList->At(28)))->Fill(gPt,TMath::Abs(dca[1]));
+       if(gProcess == 13)
+         ((TH2F *)(fQASecondaryAntiProtonsRejectedList->At(30)))->Fill(gPt,TMath::Abs(dca[1]));
+      }
+      else if(TMath::Abs(dca[1]) <= fProtonAnalysisBase->GetMaxDCAZ()) {
+       if(gProcess == 4)
+         ((TH2F *)(fQASecondaryAntiProtonsAcceptedList->At(28)))->Fill(gPt,TMath::Abs(dca[1]));
+       if(gProcess == 13)
+         ((TH2F *)(fQASecondaryAntiProtonsAcceptedList->At(30)))->Fill(gPt,TMath::Abs(dca[1]));
+         }*/
     }//secondary particle cut
   }//antiprotons
+    //}//if TParticle
 }
 
 //____________________________________________________________________//
@@ -1318,8 +1067,10 @@ void AliProtonQAAnalysis::SetRunQAAnalysis() {
 }
 
 //____________________________________________________________________//
-void AliProtonQAAnalysis::SetQAYPtBins(Int_t nbinsY, Double_t minY, Double_t maxY,
-                                     Int_t nbinsPt, Double_t minPt, Double_t maxPt) {
+void AliProtonQAAnalysis::SetQAYPtBins(Int_t nbinsY, 
+                                      Double_t minY, Double_t maxY,
+                                      Int_t nbinsPt, 
+                                      Double_t minPt, Double_t maxPt) {
   //Initializes the QA binning
   fNBinsY = nbinsY;
   fMinY = minY; fMaxY = maxY;
@@ -1332,29 +1083,60 @@ void AliProtonQAAnalysis::SetQAYPtBins(Int_t nbinsY, Double_t minY, Double_t max
   if(fRunEfficiencyAnalysis) InitEfficiencyAnalysis();
 }
 
+//____________________________________________________________________//
+void AliProtonQAAnalysis::SetQAYPtBins(Int_t nbinsY, Double_t *gY,
+                                      Int_t nbinsPt, Double_t *gPt) {
+  //Initializes the QA binning - asymmetric binning case
+  fUseAsymmetricBinning = kTRUE;
+  fNBinsY = nbinsY;
+  for(Int_t i = 0; i < nbinsY; i++) fY[i] = gY[i];
+  fMinY = gY[0]; fMaxY = gY[nbinsPt];
+  fNBinsPt = nbinsPt;
+  for(Int_t i = 0; i < nbinsPt; i++) fPt[i] = gPt[i];
+  fMinPt = gPt[0]; fMaxPt = gPt[nbinsPt];
+  InitQA();
+  InitCutLists();
+  InitVertexQA();
+  if(fRunMCAnalysis) InitMCAnalysis();
+  if(fRunEfficiencyAnalysis) InitEfficiencyAnalysis();
+}
+
 //____________________________________________________________________//
 void AliProtonQAAnalysis::InitEfficiencyAnalysis() {
-  //Initialization of the efficiency list - reconstruction & PID efficiency
+  //Initialization of the efficiency list - reconstruction & PID & cut 
+  //efficiency
   //Adding each monitored object in the list
   fEfficiencyList = new TList();
 
   //MC primary protons and antiprotons for the reconstruction efficiency
-  TH2D *gHistMCYPtProtons = new TH2D("gHistMCYPtProtons",
-                                    ";;P_{T} [GeV/c]",
-                                    fNBinsY,fMinY,fMaxY,
-                                    fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistMCYPtProtons = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistMCYPtProtons = new TH2D("gHistMCYPtProtons",
+                                ";;P_{T} [GeV/c]",
+                                fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistMCYPtProtons = new TH2D("gHistMCYPtProtons",
+                                ";;P_{T} [GeV/c]",
+                                fNBinsY,fMinY,fMaxY,
+                                fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistMCYPtProtons->GetXaxis()->SetTitle("#eta");
   else 
     gHistMCYPtProtons->GetXaxis()->SetTitle("y");
   gHistMCYPtProtons->SetStats(kTRUE);
   gHistMCYPtProtons->GetXaxis()->SetTitleColor(1);
   fEfficiencyList->Add(gHistMCYPtProtons);
-  TH2D *gHistMCYPtAntiProtons = new TH2D("gHistMCYPtAntiProtons",
-                                        ";y;P_{T} [GeV/c]",
-                                        fNBinsY,fMinY,fMaxY,
-                                        fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistMCYPtAntiProtons = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistMCYPtAntiProtons = new TH2D("gHistMCYPtAntiProtons",
+                                    ";;P_{T} [GeV/c]",
+                                    fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistMCYPtAntiProtons = new TH2D("gHistMCYPtAntiProtons",
+                                    ";y;P_{T} [GeV/c]",
+                                    fNBinsY,fMinY,fMaxY,
+                                    fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistMCYPtAntiProtons->GetXaxis()->SetTitle("#eta");
   else 
     gHistMCYPtAntiProtons->GetXaxis()->SetTitle("y");
@@ -1363,22 +1145,34 @@ void AliProtonQAAnalysis::InitEfficiencyAnalysis() {
   fEfficiencyList->Add(gHistMCYPtAntiProtons);
 
   //MC secondary protons and antiprotons that come from weak decay for the reconstruction efficiency
-  TH2D *gHistMCYPtProtonsFromWeak = new TH2D("gHistMCYPtProtonsFromWeak",
-                                            ";;P_{T} [GeV/c]",
-                                            fNBinsY,fMinY,fMaxY,
-                                            fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistMCYPtProtonsFromWeak = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistMCYPtProtonsFromWeak = new TH2D("gHistMCYPtProtonsFromWeak",
+                                        ";;P_{T} [GeV/c]",
+                                        fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistMCYPtProtonsFromWeak = new TH2D("gHistMCYPtProtonsFromWeak",
+                                        ";;P_{T} [GeV/c]",
+                                        fNBinsY,fMinY,fMaxY,
+                                        fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistMCYPtProtonsFromWeak->GetXaxis()->SetTitle("#eta");
   else 
     gHistMCYPtProtonsFromWeak->GetXaxis()->SetTitle("y");
   gHistMCYPtProtonsFromWeak->SetStats(kTRUE);
   gHistMCYPtProtonsFromWeak->GetXaxis()->SetTitleColor(1);
   fEfficiencyList->Add(gHistMCYPtProtonsFromWeak);
-  TH2D *gHistMCYPtAntiProtonsFromWeak = new TH2D("gHistMCYPtAntiProtonsFromWeak",
-                                                ";y;P_{T} [GeV/c]",
-                                                fNBinsY,fMinY,fMaxY,
-                                                fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistMCYPtAntiProtonsFromWeak = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistMCYPtAntiProtonsFromWeak = new TH2D("gHistMCYPtAntiProtonsFromWeak",
+                                            ";;P_{T} [GeV/c]",
+                                            fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistMCYPtAntiProtonsFromWeak = new TH2D("gHistMCYPtAntiProtonsFromWeak",
+                                            ";y;P_{T} [GeV/c]",
+                                            fNBinsY,fMinY,fMaxY,
+                                            fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistMCYPtAntiProtonsFromWeak->GetXaxis()->SetTitle("#eta");
   else 
     gHistMCYPtAntiProtonsFromWeak->GetXaxis()->SetTitle("y");
@@ -1386,23 +1180,35 @@ void AliProtonQAAnalysis::InitEfficiencyAnalysis() {
   gHistMCYPtAntiProtonsFromWeak->GetXaxis()->SetTitleColor(1);
   fEfficiencyList->Add(gHistMCYPtAntiProtonsFromWeak);
 
-  //MC secondary protons and antiprotons that come from hadronic interactions for the reconstruction efficiency
-  TH2D *gHistMCYPtProtonsFromHadronic = new TH2D("gHistMCYPtProtonsFromHadronic",
-                                                ";;P_{T} [GeV/c]",
-                                                fNBinsY,fMinY,fMaxY,
-                                                fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  //MC secondary protons and antiprotons that come from hadronic interactions for the reconstruction efficiency
+  TH2D *gHistMCYPtProtonsFromHadronic = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistMCYPtProtonsFromHadronic = new TH2D("gHistMCYPtProtonsFromHadronic",
+                                            ";;P_{T} [GeV/c]",
+                                            fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistMCYPtProtonsFromHadronic = new TH2D("gHistMCYPtProtonsFromHadronic",
+                                            ";;P_{T} [GeV/c]",
+                                            fNBinsY,fMinY,fMaxY,
+                                            fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistMCYPtProtonsFromHadronic->GetXaxis()->SetTitle("#eta");
   else 
     gHistMCYPtProtonsFromHadronic->GetXaxis()->SetTitle("y");
   gHistMCYPtProtonsFromHadronic->SetStats(kTRUE);
   gHistMCYPtProtonsFromHadronic->GetXaxis()->SetTitleColor(1);
   fEfficiencyList->Add(gHistMCYPtProtonsFromHadronic);
-  TH2D *gHistMCYPtAntiProtonsFromHadronic = new TH2D("gHistMCYPtAntiProtonsFromHadronic",
-                                                    ";y;P_{T} [GeV/c]",
-                                                    fNBinsY,fMinY,fMaxY,
-                                                    fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistMCYPtAntiProtonsFromHadronic = 0x0;
+  if(fUseAsymmetricBinning)
+  gHistMCYPtAntiProtonsFromHadronic = new TH2D("gHistMCYPtAntiProtonsFromHadronic",
+                                              ";;P_{T} [GeV/c]",
+                                              fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistMCYPtAntiProtonsFromHadronic = new TH2D("gHistMCYPtAntiProtonsFromHadronic",
+                                                ";y;P_{T} [GeV/c]",
+                                                fNBinsY,fMinY,fMaxY,
+                                                fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistMCYPtAntiProtonsFromHadronic->GetXaxis()->SetTitle("#eta");
   else 
     gHistMCYPtAntiProtonsFromHadronic->GetXaxis()->SetTitle("y");
@@ -1411,22 +1217,34 @@ void AliProtonQAAnalysis::InitEfficiencyAnalysis() {
   fEfficiencyList->Add(gHistMCYPtAntiProtonsFromHadronic);
   
   //ESD primary protons and antiprotons for the reconstruction efficiency
-  TH2D *gHistESDYPtProtons = new TH2D("gHistESDYPtProtons",
-                                     ";;P_{T} [GeV/c]",
-                                     fNBinsY,fMinY,fMaxY,
-                                     fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistESDYPtProtons = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistESDYPtProtons = new TH2D("gHistESDYPtProtons",
+                                 ";;P_{T} [GeV/c]",
+                                 fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistESDYPtProtons = new TH2D("gHistESDYPtProtons",
+                                 ";;P_{T} [GeV/c]",
+                                 fNBinsY,fMinY,fMaxY,
+                                 fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistESDYPtProtons->GetXaxis()->SetTitle("#eta");
   else 
     gHistESDYPtProtons->GetXaxis()->SetTitle("y");
   gHistESDYPtProtons->SetStats(kTRUE);
   gHistESDYPtProtons->GetXaxis()->SetTitleColor(1);
   fEfficiencyList->Add(gHistESDYPtProtons);
-  TH2D *gHistESDYPtAntiProtons = new TH2D("gHistESDYPtAntiProtons",
-                                         ";;P_{T} [GeV/c]",
-                                         fNBinsY,fMinY,fMaxY,
-                                         fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistESDYPtAntiProtons = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistESDYPtAntiProtons = new TH2D("gHistESDYPtAntiProtons",
+                                     ";;P_{T} [GeV/c]",
+                                     fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistESDYPtAntiProtons = new TH2D("gHistESDYPtAntiProtons",
+                                     ";;P_{T} [GeV/c]",
+                                     fNBinsY,fMinY,fMaxY,
+                                     fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistESDYPtAntiProtons->GetXaxis()->SetTitle("#eta");
   else 
     gHistESDYPtAntiProtons->GetXaxis()->SetTitle("y");
@@ -1435,22 +1253,34 @@ void AliProtonQAAnalysis::InitEfficiencyAnalysis() {
   fEfficiencyList->Add(gHistESDYPtAntiProtons);
 
   //ESD (anti)protons from weak decays for the reconstruction efficiency
-  TH2D *gHistESDYPtProtonsFromWeak = new TH2D("gHistESDYPtProtonsFromWeak",
-                                             ";;P_{T} [GeV/c]",
-                                             fNBinsY,fMinY,fMaxY,
-                                             fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistESDYPtProtonsFromWeak = 0x0;
+  if(fUseAsymmetricBinning)
+  gHistESDYPtProtonsFromWeak = new TH2D("gHistESDYPtProtonsFromWeak",
+                                       ";;P_{T} [GeV/c]",
+                                       fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistESDYPtProtonsFromWeak = new TH2D("gHistESDYPtProtonsFromWeak",
+                                         ";;P_{T} [GeV/c]",
+                                         fNBinsY,fMinY,fMaxY,
+                                         fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistESDYPtProtonsFromWeak->GetXaxis()->SetTitle("#eta");
   else 
     gHistESDYPtProtonsFromWeak->GetXaxis()->SetTitle("y");
   gHistESDYPtProtonsFromWeak->SetStats(kTRUE);
   gHistESDYPtProtonsFromWeak->GetXaxis()->SetTitleColor(1);
   fEfficiencyList->Add(gHistESDYPtProtonsFromWeak);
-  TH2D *gHistESDYPtAntiProtonsFromWeak = new TH2D("gHistESDYPtAntiProtonsFromWeak",
-                                                 ";;P_{T} [GeV/c]",
-                                                 fNBinsY,fMinY,fMaxY,
-                                                 fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistESDYPtAntiProtonsFromWeak = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistESDYPtAntiProtonsFromWeak = new TH2D("gHistESDYPtAntiProtonsFromWeak",
+                                             ";;P_{T} [GeV/c]",
+                                             fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistESDYPtAntiProtonsFromWeak = new TH2D("gHistESDYPtAntiProtonsFromWeak",
+                                             ";;P_{T} [GeV/c]",
+                                             fNBinsY,fMinY,fMaxY,
+                                             fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistESDYPtAntiProtonsFromWeak->GetXaxis()->SetTitle("#eta");
   else 
     gHistESDYPtAntiProtonsFromWeak->GetXaxis()->SetTitle("y");
@@ -1459,22 +1289,34 @@ void AliProtonQAAnalysis::InitEfficiencyAnalysis() {
   fEfficiencyList->Add(gHistESDYPtAntiProtonsFromWeak);
 
   //ESD (anti)protons from hadronic interactions for the reconstruction efficiency
-  TH2D *gHistESDYPtProtonsFromHadronic = new TH2D("gHistESDYPtProtonsFromHadronic",
-                                                 ";;P_{T} [GeV/c]",
-                                                 fNBinsY,fMinY,fMaxY,
-                                                 fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistESDYPtProtonsFromHadronic = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistESDYPtProtonsFromHadronic = new TH2D("gHistESDYPtProtonsFromHadronic",
+                                             ";;P_{T} [GeV/c]",
+                                             fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistESDYPtProtonsFromHadronic = new TH2D("gHistESDYPtProtonsFromHadronic",
+                                             ";;P_{T} [GeV/c]",
+                                             fNBinsY,fMinY,fMaxY,
+                                             fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistESDYPtProtonsFromHadronic->GetXaxis()->SetTitle("#eta");
   else 
     gHistESDYPtProtonsFromHadronic->GetXaxis()->SetTitle("y");
   gHistESDYPtProtonsFromHadronic->SetStats(kTRUE);
   gHistESDYPtProtonsFromHadronic->GetXaxis()->SetTitleColor(1);
   fEfficiencyList->Add(gHistESDYPtProtonsFromHadronic);
-  TH2D *gHistESDYPtAntiProtonsFromHadronic = new TH2D("gHistESDYPtAntiProtonsFromHadronic",
-                                                     ";;P_{T} [GeV/c]",
-                                                     fNBinsY,fMinY,fMaxY,
-                                                     fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistESDYPtAntiProtonsFromHadronic = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistESDYPtAntiProtonsFromHadronic = new TH2D("gHistESDYPtAntiProtonsFromHadronic",
+                                                 ";;P_{T} [GeV/c]",
+                                                 fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistESDYPtAntiProtonsFromHadronic = new TH2D("gHistESDYPtAntiProtonsFromHadronic",
+                                                 ";;P_{T} [GeV/c]",
+                                                 fNBinsY,fMinY,fMaxY,
+                                                 fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistESDYPtAntiProtonsFromHadronic->GetXaxis()->SetTitle("#eta");
   else 
     gHistESDYPtAntiProtonsFromHadronic->GetXaxis()->SetTitle("y");
@@ -1482,13 +1324,23 @@ void AliProtonQAAnalysis::InitEfficiencyAnalysis() {
   gHistESDYPtAntiProtonsFromHadronic->GetXaxis()->SetTitleColor(1);
   fEfficiencyList->Add(gHistESDYPtAntiProtonsFromHadronic);
   
-  
   //ESD reconstructed tracks that were initially protons for the PID efficiency
-  TH2D *gHistESDInitYPtProtons = new TH2D("gHistESDInitYPtProtons",
-                                         ";;P_{T} [GeV/c]",
-                                         fNBinsY,fMinY,fMaxY,
-                                         fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH3D *gHistESDInitYPtProtons = 0x0;
+  if(fUseAsymmetricBinning) {
+    Double_t gNPoints[51];
+    for(Int_t i = 0; i < 51; i++)
+      gNPoints[i] = i*4; 
+  gHistESDInitYPtProtons = new TH3D("gHistESDInitYPtProtons",
+                                   ";;P_{T} [GeV/c];N_{points}",
+                                   fNBinsY,fY,fNBinsPt,fPt,50,gNPoints);
+  }
+  else
+    gHistESDInitYPtProtons = new TH3D("gHistESDInitYPtProtons",
+                                     ";;P_{T} [GeV/c];N_{points}",
+                                     fNBinsY,fMinY,fMaxY,
+                                     fNBinsPt,fMinPt,fMaxPt,
+                                     50,0,200);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistESDInitYPtProtons->GetXaxis()->SetTitle("#eta");
   else 
     gHistESDInitYPtProtons->GetXaxis()->SetTitle("y");
@@ -1497,11 +1349,22 @@ void AliProtonQAAnalysis::InitEfficiencyAnalysis() {
   fEfficiencyList->Add(gHistESDInitYPtProtons);
   
   //ESD reconstructed tracks that were initially protons and were identified as protons for the PID efficiency
-  TH2D *gHistESDIdYPtProtons = new TH2D("gHistESDIdYPtProtons",
-                                       ";;P_{T} [GeV/c]",
-                                       fNBinsY,fMinY,fMaxY,
-                                       fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH3D *gHistESDIdYPtProtons = 0x0;
+  if(fUseAsymmetricBinning) {
+    Double_t gNPoints[51];
+    for(Int_t i = 0; i < 51; i++)
+      gNPoints[i] = i*4; 
+    gHistESDIdYPtProtons = new TH3D("gHistESDIdYPtProtons",
+                                   ";;P_{T} [GeV/c];N_{points}",
+                                   fNBinsY,fY,fNBinsPt,fPt,50,gNPoints);
+  }
+  else
+    gHistESDIdYPtProtons = new TH3D("gHistESDIdYPtProtons",
+                                   ";;P_{T} [GeV/c];N_{points}",
+                                   fNBinsY,fMinY,fMaxY,
+                                   fNBinsPt,fMinPt,fMaxPt,
+                                   50,0,200);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistESDIdYPtProtons->GetXaxis()->SetTitle("#eta");
   else 
     gHistESDIdYPtProtons->GetXaxis()->SetTitle("y");
@@ -1510,11 +1373,22 @@ void AliProtonQAAnalysis::InitEfficiencyAnalysis() {
   fEfficiencyList->Add(gHistESDIdYPtProtons);
  
   //ESD reconstructed tracks that were identified as protons for the PID contamination
-  TH2D *gHistESDRecIdYPtProtons = new TH2D("gHistESDRecIdYPtProtons",
-                                          ";;P_{T} [GeV/c]",
-                                          fNBinsY,fMinY,fMaxY,
-                                          fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH3D *gHistESDRecIdYPtProtons = 0x0;
+  if(fUseAsymmetricBinning) {
+    Double_t gNPoints[51];
+    for(Int_t i = 0; i < 51; i++)
+      gNPoints[i] = i*4; 
+    gHistESDRecIdYPtProtons = new TH3D("gHistESDRecIdYPtProtons",
+                                      ";;P_{T} [GeV/c];N_{points}",
+                                      fNBinsY,fY,fNBinsPt,fPt,50,gNPoints);
+  }
+  else
+    gHistESDRecIdYPtProtons = new TH3D("gHistESDRecIdYPtProtons",
+                                      ";;P_{T} [GeV/c];N_{points}",
+                                      fNBinsY,fMinY,fMaxY,
+                                      fNBinsPt,fMinPt,fMaxPt,
+                                      50,0,200);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistESDRecIdYPtProtons->GetXaxis()->SetTitle("#eta");
   else 
     gHistESDRecIdYPtProtons->GetXaxis()->SetTitle("y");
@@ -1523,17 +1397,108 @@ void AliProtonQAAnalysis::InitEfficiencyAnalysis() {
   fEfficiencyList->Add(gHistESDRecIdYPtProtons);
 
   //ESD reconstructed tracks that were identified as protons but were initially not protons for the PID contamination
-  TH2D *gHistESDContamYPtProtons = new TH2D("gHistESDContamYPtProtons",
-                                           ";;P_{T} [GeV/c]",
-                                           fNBinsY,fMinY,fMaxY,
-                                           fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH3D *gHistESDContamYPtProtons = 0x0;
+  if(fUseAsymmetricBinning) {
+    Double_t gNPoints[51];
+    for(Int_t i = 0; i < 51; i++)
+      gNPoints[i] = i*4; 
+    gHistESDContamYPtProtons = new TH3D("gHistESDContamYPtProtons",
+                                       ";;P_{T} [GeV/c];N_{points}",
+                                       fNBinsY,fY,fNBinsPt,fPt,50,gNPoints);
+  }
+  else
+    gHistESDContamYPtProtons = new TH3D("gHistESDContamYPtProtons",
+                                       ";;P_{T} [GeV/c];N_{points}",
+                                       fNBinsY,fMinY,fMaxY,
+                                       fNBinsPt,fMinPt,fMaxPt,
+                                       50,0,200);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistESDContamYPtProtons->GetXaxis()->SetTitle("#eta");
   else 
     gHistESDContamYPtProtons->GetXaxis()->SetTitle("y");
   gHistESDContamYPtProtons->SetStats(kTRUE);
   gHistESDContamYPtProtons->GetXaxis()->SetTitleColor(1);
   fEfficiencyList->Add(gHistESDContamYPtProtons);
+
+  //==============//
+  //Cut efficiency//
+  //==============//
+  fCutEfficiencyList = new TList();
+  //Reconstructed primary tracks that were identified as protons
+  TH2D *gHistESDYPtProtonsTotal = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistESDYPtProtonsTotal = new TH2D("gHistESDYPtProtonsTotal",
+                                      ";;P_{T} [GeV/c]",
+                                      fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistESDYPtProtonsTotal = new TH2D("gHistESDYPtProtonsTotal",
+                                      ";;P_{T} [GeV/c]",
+                                      fNBinsY,fMinY,fMaxY,
+                                      fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
+    gHistESDYPtProtonsTotal->GetXaxis()->SetTitle("#eta");
+  else 
+    gHistESDYPtProtonsTotal->GetXaxis()->SetTitle("y");
+  gHistESDYPtProtonsTotal->SetStats(kTRUE);
+  gHistESDYPtProtonsTotal->GetXaxis()->SetTitleColor(1);
+  fCutEfficiencyList->Add(gHistESDYPtProtonsTotal);
+
+  //Reconstructed primary tracks that were identified as antiprotons
+  TH2D *gHistESDYPtAntiProtonsTotal = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistESDYPtAntiProtonsTotal = new TH2D("gHistESDYPtAntiProtonsTotal",
+                                          ";;P_{T} [GeV/c]",
+                                          fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistESDYPtAntiProtonsTotal = new TH2D("gHistESDYPtAntiProtonsTotal",
+                                          ";;P_{T} [GeV/c]",
+                                          fNBinsY,fMinY,fMaxY,
+                                          fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
+    gHistESDYPtAntiProtonsTotal->GetXaxis()->SetTitle("#eta");
+  else 
+    gHistESDYPtAntiProtonsTotal->GetXaxis()->SetTitle("y");
+  gHistESDYPtAntiProtonsTotal->SetStats(kTRUE);
+  gHistESDYPtAntiProtonsTotal->GetXaxis()->SetTitleColor(1);
+  fCutEfficiencyList->Add(gHistESDYPtAntiProtonsTotal);
+  
+  //Reconstructed, survived primary tracks that were identified as protons
+  TH2D *gHistESDYPtProtonsSurvived = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistESDYPtProtonsSurvived = new TH2D("gHistESDYPtProtonsSurvived",
+                                         ";;P_{T} [GeV/c]",
+                                         fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistESDYPtProtonsSurvived = new TH2D("gHistESDYPtProtonsSurvived",
+                                         ";;P_{T} [GeV/c]",
+                                         fNBinsY,fMinY,fMaxY,
+                                         fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
+    gHistESDYPtProtonsSurvived->GetXaxis()->SetTitle("#eta");
+  else 
+    gHistESDYPtProtonsSurvived->GetXaxis()->SetTitle("y");
+  gHistESDYPtProtonsSurvived->SetStats(kTRUE);
+  gHistESDYPtProtonsSurvived->GetXaxis()->SetTitleColor(1);
+  fCutEfficiencyList->Add(gHistESDYPtProtonsSurvived);
+  
+  //Reconstructed, survived primary tracks that were identified as antiprotons
+  TH2D *gHistESDYPtAntiProtonsSurvived = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistESDYPtAntiProtonsSurvived = new TH2D("gHistESDYPtAntiProtonsSurvived",
+                                             ";;P_{T} [GeV/c]",
+                                             fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistESDYPtAntiProtonsSurvived = new TH2D("gHistESDYPtAntiProtonsSurvived",
+                                             ";;P_{T} [GeV/c]",
+                                             fNBinsY,fMinY,fMaxY,
+                                             fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
+    gHistESDYPtAntiProtonsSurvived->GetXaxis()->SetTitle("#eta");
+  else 
+    gHistESDYPtAntiProtonsSurvived->GetXaxis()->SetTitle("y");
+  gHistESDYPtAntiProtonsSurvived->SetStats(kTRUE);
+  gHistESDYPtAntiProtonsSurvived->GetXaxis()->SetTitleColor(1);
+  fCutEfficiencyList->Add(gHistESDYPtAntiProtonsSurvived);
 }
 
 //____________________________________________________________________//
@@ -1750,6 +1715,89 @@ void AliProtonQAAnalysis::InitCutLists() {
   gHistEtaPhiNClustersSecondaryAntiProtonsPass->SetStats(kTRUE);
   gHistEtaPhiNClustersSecondaryAntiProtonsPass->GetXaxis()->SetTitleColor(1);
   fAcceptedCutList->Add(gHistEtaPhiNClustersSecondaryAntiProtonsPass);//eta-phi of secondary accepted ESD antiprotons
+  //eta-phi-chi^2 per TPC cluster
+  TH3D *gHistEtaPhiChi2PerTPCClusterPrimaryProtonsPass = new TH3D("gHistEtaPhiChi2PerTPCClusterPrimaryProtonsPass",
+                                                                 "Accepted primary protons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)",
+                                                                 fNBinsY,fMinY,fMaxY,
+                                                                 100,0,360,
+                                                                 100,0,4);
+  gHistEtaPhiChi2PerTPCClusterPrimaryProtonsPass->SetStats(kTRUE);
+  gHistEtaPhiChi2PerTPCClusterPrimaryProtonsPass->GetXaxis()->SetTitleColor(1);
+  fAcceptedCutList->Add(gHistEtaPhiChi2PerTPCClusterPrimaryProtonsPass);//eta-phi of primary accepted ESD protons
+  TH3D *gHistEtaPhiChi2PerTPCClusterPrimaryAntiProtonsPass = new TH3D("gHistEtaPhiChi2PerTPCClusterPrimaryAntiProtonsPass",
+                                                                     "Accepted primary antiprotons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)",
+                                                                     fNBinsY,fMinY,fMaxY,
+                                                                     100,0,360,
+                                                                     100,0,4);
+  gHistEtaPhiChi2PerTPCClusterPrimaryAntiProtonsPass->SetStats(kTRUE);
+  gHistEtaPhiChi2PerTPCClusterPrimaryAntiProtonsPass->GetXaxis()->SetTitleColor(1);
+  fAcceptedCutList->Add(gHistEtaPhiChi2PerTPCClusterPrimaryAntiProtonsPass);//eta-phi of primary accepted ESD antiprotons
+  TH3D *gHistEtaPhiChi2PerTPCClusterSecondaryProtonsPass = new TH3D("gHistEtaPhiChi2PerTPCClusterSecondaryProtonsPass",
+                                                                   "Accepted secondary protons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)",
+                                                                   fNBinsY,fMinY,fMaxY,
+                                                                   100,0,360,
+                                                                   100,0,4);
+  gHistEtaPhiChi2PerTPCClusterSecondaryProtonsPass->SetStats(kTRUE);
+  gHistEtaPhiChi2PerTPCClusterSecondaryProtonsPass->GetXaxis()->SetTitleColor(1);
+  fAcceptedCutList->Add(gHistEtaPhiChi2PerTPCClusterSecondaryProtonsPass);//eta-phi of secondary accepted ESD protons
+  TH3D *gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsPass = new TH3D("gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsPass",
+                                                                       "Accepted secondary antiprotons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)",
+                                                                       fNBinsY,fMinY,fMaxY,
+                                                                       100,0,360,
+                                                                       100,0,4);
+  gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsPass->SetStats(kTRUE);
+  gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsPass->GetXaxis()->SetTitleColor(1);
+  fAcceptedCutList->Add(gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsPass);//eta-phi of secondary accepted ESD antiprotons
+  //eta-phi-number of TPC points for the dE/dx
+  TH3D *gHistEtaPhiTPCdEdxNPointsPrimaryProtonsPass = new TH3D("gHistEtaPhiTPCdEdxNPointsPrimaryProtonsPass",
+                                                                 "Accepted primary protons;#eta;#phi;N_{points}(TPC)",
+                                                                 fNBinsY,fMinY,fMaxY,
+                                                                 100,0,360,
+                                                                 100,0,200);
+  gHistEtaPhiTPCdEdxNPointsPrimaryProtonsPass->SetStats(kTRUE);
+  gHistEtaPhiTPCdEdxNPointsPrimaryProtonsPass->GetXaxis()->SetTitleColor(1);
+  fAcceptedCutList->Add(gHistEtaPhiTPCdEdxNPointsPrimaryProtonsPass);//eta-phi of primary accepted ESD protons
+  TH3D *gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsPass = new TH3D("gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsPass",
+                                                                     "Accepted primary antiprotons;#eta;#phi;N_{points}(TPC)",
+                                                                     fNBinsY,fMinY,fMaxY,
+                                                                     100,0,360,
+                                                                     100,0,200);
+  gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsPass->SetStats(kTRUE);
+  gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsPass->GetXaxis()->SetTitleColor(1);
+  fAcceptedCutList->Add(gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsPass);//eta-phi of primary accepted ESD antiprotons
+  TH3D *gHistEtaPhiTPCdEdxNPointsSecondaryProtonsPass = new TH3D("gHistEtaPhiTPCdEdxNPointsSecondaryProtonsPass",
+                                                                   "Accepted secondary protons;#eta;#phi;N_{points}(TPC)",
+                                                                   fNBinsY,fMinY,fMaxY,
+                                                                   100,0,360,
+                                                                   100,0,200);
+  gHistEtaPhiTPCdEdxNPointsSecondaryProtonsPass->SetStats(kTRUE);
+  gHistEtaPhiTPCdEdxNPointsSecondaryProtonsPass->GetXaxis()->SetTitleColor(1);
+  fAcceptedCutList->Add(gHistEtaPhiTPCdEdxNPointsSecondaryProtonsPass);//eta-phi of secondary accepted ESD protons
+  TH3D *gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsPass = new TH3D("gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsPass",
+                                                                       "Accepted secondary antiprotons;#eta;#phi;N_{points}(TPC)",
+                                                                       fNBinsY,fMinY,fMaxY,
+                                                                       100,0,360,
+                                                                       100,0,200);
+  gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsPass->SetStats(kTRUE);
+  gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsPass->GetXaxis()->SetTitleColor(1);
+  fAcceptedCutList->Add(gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsPass);//eta-phi of secondary accepted ESD antiprotons
+
+  TH1F *gPrimaryProtonsNPointsTPCdEdx = new TH1F("gPrimaryProtonsNPointsTPCdEdx",
+                                             ";N_{points} (TPC-dE/dx);Entries",
+                                             100,0,200);
+  fAcceptedCutList->Add(gPrimaryProtonsNPointsTPCdEdx);
+  TH1F *gPrimaryAntiProtonsNPointsTPCdEdx = new TH1F("gPrimaryAntiProtonsNPointsTPCdEdx",
+                                                 ";N_{points} (TPC-dE/dx);Entries",
+                                                 100,0,200);
+  fAcceptedCutList->Add(gPrimaryAntiProtonsNPointsTPCdEdx);
+  TH1F *gSecondaryProtonsNPointsTPCdEdx = new TH1F("gSecondaryProtonsNPointsTPCdEdx",
+                                               ";N_{points} (TPC-dE/dx);Entries",
+                                               100,0,200);
+  fAcceptedCutList->Add(gSecondaryProtonsNPointsTPCdEdx);
+  TH1F *gSecondaryAntiProtonsNPointsTPCdEdx = new TH1F("gSecondaryAntiProtonsNPointsTPCdEdx",
+                                                   ";N_{points} (TPC-dE/dx);Entries",
+                                                   100,0,200);
+  fAcceptedCutList->Add(gSecondaryAntiProtonsNPointsTPCdEdx);
   
   //Rejected cut list
   fRejectedCutList = new TList();
@@ -1786,7 +1834,72 @@ void AliProtonQAAnalysis::InitCutLists() {
   gHistEtaPhiNClustersSecondaryAntiProtonsReject->SetStats(kTRUE);
   gHistEtaPhiNClustersSecondaryAntiProtonsReject->GetXaxis()->SetTitleColor(1);
   fRejectedCutList->Add(gHistEtaPhiNClustersSecondaryAntiProtonsReject);//eta-phi of secondary rejected ESD antiprotons
-
+  //eta-phi-chi^2 per TPC cluster
+  TH3D *gHistEtaPhiChi2PerTPCClusterPrimaryProtonsReject = new TH3D("gHistEtaPhiChi2PerTPCClusterPrimaryProtonsReject",
+                                                                 "Rejected primary protons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)",
+                                                                 fNBinsY,fMinY,fMaxY,
+                                                                 100,0,360,
+                                                                 100,0,4);
+  gHistEtaPhiChi2PerTPCClusterPrimaryProtonsReject->SetStats(kTRUE);
+  gHistEtaPhiChi2PerTPCClusterPrimaryProtonsReject->GetXaxis()->SetTitleColor(1);
+  fRejectedCutList->Add(gHistEtaPhiChi2PerTPCClusterPrimaryProtonsReject);//eta-phi of primary rejected ESD protons
+  TH3D *gHistEtaPhiChi2PerTPCClusterPrimaryAntiProtonsReject = new TH3D("gHistEtaPhiChi2PerTPCClusterPrimaryAntiProtonsReject",
+                                                                     "Rejected primary antiprotons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)",
+                                                                     fNBinsY,fMinY,fMaxY,
+                                                                     100,0,360,
+                                                                     100,0,4);
+  gHistEtaPhiChi2PerTPCClusterPrimaryAntiProtonsReject->SetStats(kTRUE);
+  gHistEtaPhiChi2PerTPCClusterPrimaryAntiProtonsReject->GetXaxis()->SetTitleColor(1);
+  fRejectedCutList->Add(gHistEtaPhiChi2PerTPCClusterPrimaryAntiProtonsReject);//eta-phi of primary rejected ESD antiprotons
+  TH3D *gHistEtaPhiChi2PerTPCClusterSecondaryProtonsReject = new TH3D("gHistEtaPhiChi2PerTPCClusterSecondaryProtonsReject",
+                                                                   "Rejected secondary protons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)",
+                                                                   fNBinsY,fMinY,fMaxY,
+                                                                   100,0,360,
+                                                                   100,0,4);
+  gHistEtaPhiChi2PerTPCClusterSecondaryProtonsReject->SetStats(kTRUE);
+  gHistEtaPhiChi2PerTPCClusterSecondaryProtonsReject->GetXaxis()->SetTitleColor(1);
+  fRejectedCutList->Add(gHistEtaPhiChi2PerTPCClusterSecondaryProtonsReject);//eta-phi of secondary rejected ESD protons
+  TH3D *gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsReject = new TH3D("gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsReject",
+                                                                       "Rejected secondary antiprotons;#eta;#phi;#chi^{2}/N_{clusters}(TPC)",
+                                                                       fNBinsY,fMinY,fMaxY,
+                                                                       100,0,360,
+                                                                       100,0,4);
+  gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsReject->SetStats(kTRUE);
+  gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsReject->GetXaxis()->SetTitleColor(1);
+  fRejectedCutList->Add(gHistEtaPhiChi2PerTPCClusterSecondaryAntiProtonsReject);//eta-phi of secondary rejected ESD antiprotons
+  //eta-phi-number of TPC points for the dE/dx
+  TH3D *gHistEtaPhiTPCdEdxNPointsPrimaryProtonsReject = new TH3D("gHistEtaPhiTPCdEdxNPointsPrimaryProtonsReject",
+                                                                 "Rejected primary protons;#eta;#phi;N_{points}(TPC)",
+                                                                 fNBinsY,fMinY,fMaxY,
+                                                                 100,0,360,
+                                                                 100,0,200);
+  gHistEtaPhiTPCdEdxNPointsPrimaryProtonsReject->SetStats(kTRUE);
+  gHistEtaPhiTPCdEdxNPointsPrimaryProtonsReject->GetXaxis()->SetTitleColor(1);
+  fRejectedCutList->Add(gHistEtaPhiTPCdEdxNPointsPrimaryProtonsReject);//eta-phi of primary rejected ESD protons
+  TH3D *gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsReject = new TH3D("gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsReject",
+                                                                     "Rejected primary antiprotons;#eta;#phi;N_{points}(TPC)",
+                                                                     fNBinsY,fMinY,fMaxY,
+                                                                     100,0,360,
+                                                                     100,0,200);
+  gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsReject->SetStats(kTRUE);
+  gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsReject->GetXaxis()->SetTitleColor(1);
+  fRejectedCutList->Add(gHistEtaPhiTPCdEdxNPointsPrimaryAntiProtonsReject);//eta-phi of primary rejected ESD antiprotons
+  TH3D *gHistEtaPhiTPCdEdxNPointsSecondaryProtonsReject = new TH3D("gHistEtaPhiTPCdEdxNPointsSecondaryProtonsReject",
+                                                                   "Rejected secondary protons;#eta;#phi;N_{points}(TPC)",
+                                                                   fNBinsY,fMinY,fMaxY,
+                                                                   100,0,360,
+                                                                   100,0,200);
+  gHistEtaPhiTPCdEdxNPointsSecondaryProtonsReject->SetStats(kTRUE);
+  gHistEtaPhiTPCdEdxNPointsSecondaryProtonsReject->GetXaxis()->SetTitleColor(1);
+  fRejectedCutList->Add(gHistEtaPhiTPCdEdxNPointsSecondaryProtonsReject);//eta-phi of secondary rejected ESD protons
+  TH3D *gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsReject = new TH3D("gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsReject",
+                                                                       "Rejected secondary antiprotons;#eta;#phi;N_{points}(TPC)",
+                                                                       fNBinsY,fMinY,fMaxY,
+                                                                       100,0,360,
+                                                                       100,0,200);
+  gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsReject->SetStats(kTRUE);
+  gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsReject->GetXaxis()->SetTitleColor(1);
+  fRejectedCutList->Add(gHistEtaPhiTPCdEdxNPointsSecondaryAntiProtonsReject);//eta-phi of secondary rejected ESD antiprotons
 
   //DCA list
   fAcceptedDCAList = new TList();
@@ -1841,6 +1954,92 @@ void AliProtonQAAnalysis::InitCutLists() {
                                                      100,0,10);
   fAcceptedDCAList->Add(gSecondaryAntiProtonsSigmaToVertex);
 
+  //3D DCA vs pT plots
+  TH3F *gHistPrimaryProtonsDCAxyEtaPt = new TH3F("gHistPrimaryProtonsDCAxyEtaPt",
+                                                ";#eta;P_{T} [GeV/c];dca_{xy} [cm]",
+                                                9,-0.9,0.9,
+                                                6,0.45,1.05,
+                                                100,0,10);
+  gHistPrimaryProtonsDCAxyEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistPrimaryProtonsDCAxyEtaPt);
+  TH3F *gHistPrimaryAntiProtonsDCAxyEtaPt = new TH3F("gHistPrimaryAntiProtonsDCAxyEtaPt",
+                                                    ";#eta;P_{T} [GeV/c];dca_{xy} [cm]",
+                                                    9,-0.9,0.9,
+                                                    6,0.45,1.05,
+                                                    100,0,10);
+  gHistPrimaryAntiProtonsDCAxyEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistPrimaryAntiProtonsDCAxyEtaPt);
+  TH3F *gHistSecondaryProtonsFromWeakDCAxyEtaPt = new TH3F("gHistSecondaryProtonsFromWeakDCAxyEtaPt",
+                                                          ";#eta;P_{T} [GeV/c];dca_{xy} [cm]",
+                                                          9,-0.9,0.9,
+                                                          6,0.45,1.05,
+                                                          100,0,10);
+  gHistSecondaryProtonsFromWeakDCAxyEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistSecondaryProtonsFromWeakDCAxyEtaPt);
+  TH3F *gHistSecondaryAntiProtonsFromWeakDCAxyEtaPt = new TH3F("gHistSecondaryAntiProtonsFromWeakDCAxyEtaPt",
+                                                              ";#eta;P_{T} [GeV/c];dca_{xy} [cm]",
+                                                              9,-0.9,0.9,
+                                                              6,0.45,1.05,
+                                                              100,0,10);
+  gHistSecondaryAntiProtonsFromWeakDCAxyEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistSecondaryAntiProtonsFromWeakDCAxyEtaPt);
+  TH3F *gHistSecondaryProtonsFromHadronicDCAxyEtaPt = new TH3F("gHistSecondaryProtonsFromHadronicDCAxyEtaPt",
+                                                              ";#eta;P_{T} [GeV/c];dca_{xy} [cm]",
+                                                              9,-0.9,0.9,
+                                                              6,0.45,1.05,
+                                                              100,0,10);
+  gHistSecondaryProtonsFromHadronicDCAxyEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistSecondaryProtonsFromHadronicDCAxyEtaPt);
+  TH3F *gHistSecondaryAntiProtonsFromHadronicDCAxyEtaPt = new TH3F("gHistSecondaryAntiProtonsFromHadronicDCAxyEtaPt",
+                                                                  ";#eta;P_{T} [GeV/c];dca_{xy} [cm]",
+                                                                  9,-0.9,0.9,
+                                                                  6,0.45,1.05,
+                                                                  100,0,10);
+  gHistSecondaryAntiProtonsFromHadronicDCAxyEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistSecondaryAntiProtonsFromHadronicDCAxyEtaPt);
+  
+  TH3F *gHistPrimaryProtonsDCAzEtaPt = new TH3F("gHistPrimaryProtonsDCAzEtaPt",
+                                               ";#eta;P_{T} [GeV/c];dca_{z} [cm]",
+                                               9,-0.9,0.9,
+                                               6,0.45,1.05,
+                                               100,0,10);
+  gHistPrimaryProtonsDCAzEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistPrimaryProtonsDCAzEtaPt);
+  TH3F *gHistPrimaryAntiProtonsDCAzEtaPt = new TH3F("gHistPrimaryAntiProtonsDCAzEtaPt",
+                                                   ";#eta;P_{T} [GeV/c];dca_{z} [cm]",
+                                                   9,-0.9,0.9,
+                                                   6,0.45,1.05,
+                                                   100,0,10);
+  gHistPrimaryAntiProtonsDCAzEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistPrimaryAntiProtonsDCAzEtaPt);
+  TH3F *gHistSecondaryProtonsFromWeakDCAzEtaPt = new TH3F("gHistSecondaryProtonsFromWeakDCAzEtaPt",
+                                                         ";#eta;P_{T} [GeV/c];dca_{z} [cm]",
+                                                         9,-0.9,0.9,
+                                                         6,0.45,1.05,
+                                                         100,0,10);
+  gHistSecondaryProtonsFromWeakDCAzEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistSecondaryProtonsFromWeakDCAzEtaPt);
+  TH3F *gHistSecondaryAntiProtonsFromWeakDCAzEtaPt = new TH3F("gHistSecondaryAntiProtonsFromWeakDCAzEtaPt",
+                                                             ";#eta;P_{T} [GeV/c];dca_{z} [cm]",
+                                                             9,-0.9,0.9,
+                                                             6,0.45,1.05,
+                                                             100,0,10);
+  gHistSecondaryAntiProtonsFromWeakDCAzEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistSecondaryAntiProtonsFromWeakDCAzEtaPt);
+  TH3F *gHistSecondaryProtonsFromHadronicDCAzEtaPt = new TH3F("gHistSecondaryProtonsFromHadronicDCAzEtaPt",
+                                                             ";#eta;P_{T} [GeV/c];dca_{z} [cm]",
+                                                             9,-0.9,0.9,
+                                                             6,0.45,1.05,
+                                                             100,0,10);
+  gHistSecondaryProtonsFromHadronicDCAzEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistSecondaryProtonsFromHadronicDCAzEtaPt);
+  TH3F *gHistSecondaryAntiProtonsFromHadronicDCAzEtaPt = new TH3F("gHistSecondaryAntiProtonsFromHadronicDCAzEtaPt",
+                                                                 ";#eta;P_{T} [GeV/c];dca_{z} [cm]",
+                                                                 9,-0.9,0.9,
+                                                                 6,0.45,1.05,
+                                                                 100,0,10);
+  gHistSecondaryAntiProtonsFromHadronicDCAzEtaPt->SetStats(kFALSE);
+  fAcceptedDCAList->Add(gHistSecondaryAntiProtonsFromHadronicDCAzEtaPt);
 }
 
 //____________________________________________________________________//
@@ -1850,16 +2049,16 @@ void AliProtonQAAnalysis::InitVertexQA() {
   fQAVertexList->SetName("fQAVertexList");
 
   //Gen. multiplicity bins
-  Float_t xBins[24] = {0,1,2,4,6,8,10,15,20,30,40,50,75,100,
-                    200,300,400,500,750,1000,1500,2000,2500,3000};
+  //Float_t xBins[24] = {0,1,2,4,6,8,10,15,20,30,40,50,75,100,
+  //200,300,400,500,750,1000,1500,2000,2500,3000};
   //MC primary multiplicity (vertex efficiency calculation)
   TH1F *gHistMCPrimaryVz = new TH1F("gHistMCPrimaryVz",
                                    ";V_{z} (gen.) [cm];Entries",
                                    40,-20.,20.);
   fQAVertexList->Add(gHistMCPrimaryVz);
-  TH1F *gHistMCPrimaryMultiplicity = new TH1F("gHistMCPrimaryMultiplicity",
-                                             ";N_{prim. gen.};Entries",
-                                             23,xBins);
+  //TH1F *gHistMCPrimaryMultiplicity = new TH1F("gHistMCPrimaryMultiplicity",
+  //";N_{prim. gen.};Entries",
+  //23,xBins);
   //fQAVertexList->Add(gHistMCPrimaryMultiplicity);
   
   //TPC
@@ -1867,9 +2066,9 @@ void AliProtonQAAnalysis::InitVertexQA() {
                              ";V_{z} (gen.) [cm];Entries",
                              40,-20.,20.);
   fQAVertexList->Add(gHistTPCVz);
-  TH1F *gHistMCPrimaryMultiplicityTPC = new TH1F("gHistMCPrimaryMultiplicityTPC",
-                                                "Vertex TPC;N_{prim. gen.};Entries",
-                                                23,xBins);
+  //TH1F *gHistMCPrimaryMultiplicityTPC = new TH1F("gHistMCPrimaryMultiplicityTPC",
+  //"Vertex TPC;N_{prim. gen.};Entries",
+  //23,xBins);
   //fQAVertexList->Add(gHistMCPrimaryMultiplicityTPC);
   TH2F *gHistTPCESDVxN = new TH2F("gHistTPCESDVxN",
                                 "Primary vertex TPC;V_{x} [cm];N_{contributors}",
@@ -1913,9 +2112,9 @@ void AliProtonQAAnalysis::InitVertexQA() {
                              ";V_{z} (gen.) [cm];Entries",
                              40,-20.,20.);
   fQAVertexList->Add(gHistSPDVz);
-  TH1F *gHistMCPrimaryMultiplicitySPD = new TH1F("gHistMCPrimaryMultiplicitySPD",
-                                                "Vertex SPD;N_{prim. gen.};Entries",
-                                                23,xBins);
+  //TH1F *gHistMCPrimaryMultiplicitySPD = new TH1F("gHistMCPrimaryMultiplicitySPD",
+  //"Vertex SPD;N_{prim. gen.};Entries",
+  //23,xBins);
   //fQAVertexList->Add(gHistMCPrimaryMultiplicitySPD);
   TH2F *gHistSPDESDVxN = new TH2F("gHistSPDESDVxN",
                                 "Primary vertex SPD;V_{x} [cm];N_{contributors}",
@@ -1959,9 +2158,9 @@ void AliProtonQAAnalysis::InitVertexQA() {
                                 ";V_{z} (gen.) [cm];Entries",
                                 40,-20.,20.);
   fQAVertexList->Add(gHistTracksVz);
-  TH1F *gHistMCPrimaryMultiplicityTracks = new TH1F("gHistMCPrimaryMultiplicityTracks",
-                                                   "Vertex Tracks;N_{prim. gen.};Entries",
-                                                   23,xBins);
+  //TH1F *gHistMCPrimaryMultiplicityTracks = new TH1F("gHistMCPrimaryMultiplicityTracks",
+  //"Vertex Tracks;N_{prim. gen.};Entries",
+  //23,xBins);
   //fQAVertexList->Add(gHistMCPrimaryMultiplicityTracks);
   TH2F *gHistTracksESDVxN = new TH2F("gHistTracksESDVxN",
                                     "Primary vertex Tracks;V_{x} [cm];N_{contributors}",
@@ -2010,22 +2209,34 @@ void AliProtonQAAnalysis::InitQA() {
   //2D histograms
   //TDirectory *dir2D = gDirectory->mkdir("2D");
   //fGlobalQAList->Add(dir2D); dir2D->cd();
-  TH2D *gHistYPtPrimaryProtonsPass = new TH2D("gHistYPtPrimaryProtonsPass",
-                                             ";;P_{T} [GeV/c]",
-                                             fNBinsY,fMinY,fMaxY,
-                                             fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistYPtPrimaryProtonsPass = 0x0;
+  if(fUseAsymmetricBinning)
+  gHistYPtPrimaryProtonsPass = new TH2D("gHistYPtPrimaryProtonsPass",
+                                       ";;P_{T} [GeV/c]",
+                                       fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistYPtPrimaryProtonsPass = new TH2D("gHistYPtPrimaryProtonsPass",
+                                         ";;P_{T} [GeV/c]",
+                                         fNBinsY,fMinY,fMaxY,
+                                         fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtPrimaryProtonsPass->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtPrimaryProtonsPass->GetXaxis()->SetTitle("y");
   gHistYPtPrimaryProtonsPass->SetStats(kTRUE);
   gHistYPtPrimaryProtonsPass->GetXaxis()->SetTitleColor(1);
   fQA2DList->Add(gHistYPtPrimaryProtonsPass);//y-pT of primary accepted ESD protons
-  TH2D *gHistYPtPrimaryProtonsReject = new TH2D("gHistYPtPrimaryProtonsReject",
-                                               ";;P_{T} [GeV/c]",
-                                               fNBinsY,fMinY,fMaxY,
-                                               fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistYPtPrimaryProtonsReject = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistYPtPrimaryProtonsReject = new TH2D("gHistYPtPrimaryProtonsReject",
+                                           ";;P_{T} [GeV/c]",
+                                           fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistYPtPrimaryProtonsReject = new TH2D("gHistYPtPrimaryProtonsReject",
+                                           ";;P_{T} [GeV/c]",
+                                           fNBinsY,fMinY,fMaxY,
+                                           fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtPrimaryProtonsReject->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtPrimaryProtonsReject->GetXaxis()->SetTitle("y");
@@ -2033,22 +2244,34 @@ void AliProtonQAAnalysis::InitQA() {
   gHistYPtPrimaryProtonsReject->GetXaxis()->SetTitleColor(1);
   fQA2DList->Add(gHistYPtPrimaryProtonsReject);//y-pT of primary rejected ESD protons
 
-  TH2D *gHistYPtSecondaryProtonsPass = new TH2D("gHistYPtSecondaryProtonsPass",
-                                               ";;P_{T} [GeV/c]",
-                                               fNBinsY,fMinY,fMaxY,
-                                               fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistYPtSecondaryProtonsPass = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistYPtSecondaryProtonsPass = new TH2D("gHistYPtSecondaryProtonsPass",
+                                           ";;P_{T} [GeV/c]",
+                                           fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistYPtSecondaryProtonsPass = new TH2D("gHistYPtSecondaryProtonsPass",
+                                           ";;P_{T} [GeV/c]",
+                                           fNBinsY,fMinY,fMaxY,
+                                           fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtSecondaryProtonsPass->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtSecondaryProtonsPass->GetXaxis()->SetTitle("y");
   gHistYPtSecondaryProtonsPass->SetStats(kTRUE);
   gHistYPtSecondaryProtonsPass->GetXaxis()->SetTitleColor(1);
   fQA2DList->Add(gHistYPtSecondaryProtonsPass);//y-pT of secondary accepted ESD protons
-  TH2D *gHistYPtSecondaryProtonsReject = new TH2D("gHistYPtSecondaryProtonsReject",
-                                                 ";;P_{T} [GeV/c]",
-                                                 fNBinsY,fMinY,fMaxY,
-                                                 fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistYPtSecondaryProtonsReject = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistYPtSecondaryProtonsReject = new TH2D("gHistYPtSecondaryProtonsReject",
+                                             ";;P_{T} [GeV/c]",
+                                             fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistYPtSecondaryProtonsReject = new TH2D("gHistYPtSecondaryProtonsReject",
+                                             ";;P_{T} [GeV/c]",
+                                             fNBinsY,fMinY,fMaxY,
+                                             fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtSecondaryProtonsReject->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtSecondaryProtonsReject->GetXaxis()->SetTitle("y");
@@ -2056,22 +2279,34 @@ void AliProtonQAAnalysis::InitQA() {
   gHistYPtSecondaryProtonsReject->GetXaxis()->SetTitleColor(1);
   fQA2DList->Add(gHistYPtSecondaryProtonsReject);//y-pT of secondary rejected ESD protons
 
-  TH2D *gHistYPtPrimaryAntiProtonsPass = new TH2D("gHistYPtPrimaryAntiProtonsPass",
-                                                 ";;P_{T} [GeV/c]",
-                                                 fNBinsY,fMinY,fMaxY,
-                                                 fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistYPtPrimaryAntiProtonsPass = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistYPtPrimaryAntiProtonsPass = new TH2D("gHistYPtPrimaryAntiProtonsPass",
+                                             ";;P_{T} [GeV/c]",
+                                             fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistYPtPrimaryAntiProtonsPass = new TH2D("gHistYPtPrimaryAntiProtonsPass",
+                                             ";;P_{T} [GeV/c]",
+                                             fNBinsY,fMinY,fMaxY,
+                                             fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtPrimaryAntiProtonsPass->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtPrimaryAntiProtonsPass->GetXaxis()->SetTitle("y");
   gHistYPtPrimaryAntiProtonsPass->SetStats(kTRUE);
   gHistYPtPrimaryAntiProtonsPass->GetXaxis()->SetTitleColor(1);
   fQA2DList->Add(gHistYPtPrimaryAntiProtonsPass);//y-pT of primary accepted ESD antiprotons
-  TH2D *gHistYPtPrimaryAntiProtonsReject = new TH2D("gHistYPtPrimaryAntiProtonsReject",
-                                                   ";;P_{T} [GeV/c]",
-                                                   fNBinsY,fMinY,fMaxY,
-                                                   fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistYPtPrimaryAntiProtonsReject = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistYPtPrimaryAntiProtonsReject = new TH2D("gHistYPtPrimaryAntiProtonsReject",
+                                               ";;P_{T} [GeV/c]",
+                                               fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistYPtPrimaryAntiProtonsReject = new TH2D("gHistYPtPrimaryAntiProtonsReject",
+                                               ";;P_{T} [GeV/c]",
+                                               fNBinsY,fMinY,fMaxY,
+                                               fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtPrimaryAntiProtonsReject->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtPrimaryAntiProtonsReject->GetXaxis()->SetTitle("y");
@@ -2079,22 +2314,34 @@ void AliProtonQAAnalysis::InitQA() {
   gHistYPtPrimaryAntiProtonsReject->GetXaxis()->SetTitleColor(1);
   fQA2DList->Add(gHistYPtPrimaryAntiProtonsReject);//y-pT of primary rejected ESD antiprotons
 
-  TH2D *gHistYPtSecondaryAntiProtonsPass = new TH2D("gHistYPtSecondaryAntiProtonsPass",
-                                                   ";;P_{T} [GeV/c]",
-                                                   fNBinsY,fMinY,fMaxY,
-                                                   fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistYPtSecondaryAntiProtonsPass = 0x0;
+  if(fUseAsymmetricBinning)
+  gHistYPtSecondaryAntiProtonsPass = new TH2D("gHistYPtSecondaryAntiProtonsPass",
+                                             ";;P_{T} [GeV/c]",
+                                             fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistYPtSecondaryAntiProtonsPass = new TH2D("gHistYPtSecondaryAntiProtonsPass",
+                                               ";;P_{T} [GeV/c]",
+                                               fNBinsY,fMinY,fMaxY,
+                                               fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtSecondaryAntiProtonsPass->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtSecondaryAntiProtonsPass->GetXaxis()->SetTitle("y");
   gHistYPtSecondaryAntiProtonsPass->SetStats(kTRUE);
   gHistYPtSecondaryAntiProtonsPass->GetXaxis()->SetTitleColor(1);
   fQA2DList->Add(gHistYPtSecondaryAntiProtonsPass);//y-pT of secondary accepted ESD antiprotons
-  TH2D *gHistYPtSecondaryAntiProtonsReject = new TH2D("gHistYPtSecondaryAntiProtonsReject",
-                                                     ";;P_{T} [GeV/c]",
-                                                     fNBinsY,fMinY,fMaxY,
-                                                     fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistYPtSecondaryAntiProtonsReject = 0x0;
+  if(fUseAsymmetricBinning)
+  gHistYPtSecondaryAntiProtonsReject = new TH2D("gHistYPtSecondaryAntiProtonsReject",
+                                               ";;P_{T} [GeV/c]",
+                                               fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistYPtSecondaryAntiProtonsReject = new TH2D("gHistYPtSecondaryAntiProtonsReject",
+                                                 ";;P_{T} [GeV/c]",
+                                                 fNBinsY,fMinY,fMaxY,
+                                                 fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtSecondaryAntiProtonsReject->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtSecondaryAntiProtonsReject->GetXaxis()->SetTitle("y");
@@ -2102,22 +2349,34 @@ void AliProtonQAAnalysis::InitQA() {
   gHistYPtSecondaryAntiProtonsReject->GetXaxis()->SetTitleColor(1);
   fQA2DList->Add(gHistYPtSecondaryAntiProtonsReject);//y-pT of secondary rejected ESD antiprotons
 
-  TH2D *gHistYPtPrimaryProtonsMC = new TH2D("gHistYPtPrimaryProtonsMC",
-                                           ";;P_{T} [GeV/c]",
-                                           fNBinsY,fMinY,fMaxY,
-                                           fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistYPtPrimaryProtonsMC = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistYPtPrimaryProtonsMC = new TH2D("gHistYPtPrimaryProtonsMC",
+                                       ";;P_{T} [GeV/c]",
+                                       fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistYPtPrimaryProtonsMC = new TH2D("gHistYPtPrimaryProtonsMC",
+                                       ";;P_{T} [GeV/c]",
+                                       fNBinsY,fMinY,fMaxY,
+                                       fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtPrimaryProtonsMC->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtPrimaryProtonsMC->GetXaxis()->SetTitle("y");
   gHistYPtPrimaryProtonsMC->SetStats(kTRUE);
   gHistYPtPrimaryProtonsMC->GetXaxis()->SetTitleColor(1);
   fQA2DList->Add(gHistYPtPrimaryProtonsMC);//y-pT of primary MC protons
-  TH2D *gHistYPtPrimaryAntiProtonsMC = new TH2D("gHistYPtPrimaryAntiProtonsMC",
-                                               ";;P_{T} [GeV/c]",
-                                               fNBinsY,fMinY,fMaxY,
-                                               fNBinsPt,fMinPt,fMaxPt);
-  if(fAnalysisEtaMode) 
+  TH2D *gHistYPtPrimaryAntiProtonsMC = 0x0;
+  if(fUseAsymmetricBinning)
+    gHistYPtPrimaryAntiProtonsMC = new TH2D("gHistYPtPrimaryAntiProtonsMC",
+                                           ";;P_{T} [GeV/c]",
+                                           fNBinsY,fY,fNBinsPt,fPt);
+  else
+    gHistYPtPrimaryAntiProtonsMC = new TH2D("gHistYPtPrimaryAntiProtonsMC",
+                                           ";;P_{T} [GeV/c]",
+                                           fNBinsY,fMinY,fMaxY,
+                                           fNBinsPt,fMinPt,fMaxPt);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtPrimaryAntiProtonsMC->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtPrimaryAntiProtonsMC->GetXaxis()->SetTitle("y");
@@ -2125,22 +2384,38 @@ void AliProtonQAAnalysis::InitQA() {
   gHistYPtPrimaryAntiProtonsMC->GetXaxis()->SetTitleColor(1);
   fQA2DList->Add(gHistYPtPrimaryAntiProtonsMC);//y-pT of primary MC antiprotons
 
-  TH3F *gHistYPtPDGProtonsPass = new TH3F("gHistYPtPDGProtonsPass",
-                                         ";;P_{T} [GeV/c];PDG",
-                                         fNBinsY,fMinY,fMaxY,
-                                         fNBinsPt,fMinPt,fMaxPt,
-                                         14,-0.5,13.5);
-  if(fAnalysisEtaMode) 
+  TH3F *gHistYPtPDGProtonsPass = 0x0;
+  if(fUseAsymmetricBinning) {
+    Double_t gPDG[15] = {-0.5,0.5,1.5,2.5,3.5,4.5,5.5,6.5,7.5,8.5,9.5,10.5,11.5,12.5,13.5};
+    gHistYPtPDGProtonsPass = new TH3F("gHistYPtPDGProtonsPass",
+                                     ";;P_{T} [GeV/c];PDG",
+                                     fNBinsY,fY,fNBinsPt,fPt,14,gPDG);
+  }
+  else
+    gHistYPtPDGProtonsPass = new TH3F("gHistYPtPDGProtonsPass",
+                                     ";;P_{T} [GeV/c];PDG",
+                                     fNBinsY,fMinY,fMaxY,
+                                     fNBinsPt,fMinPt,fMaxPt,
+                                     14,-0.5,13.5);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtPDGProtonsPass->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtPDGProtonsPass->GetXaxis()->SetTitle("y");
   fQA2DList->Add(gHistYPtPDGProtonsPass);//composition of secondary protons
-  TH3F *gHistYPtPDGAntiProtonsPass = new TH3F("gHistYPtPDGAntiProtonsPass",
-                                             ";;P_{T} [GeV/c];PDG",
-                                             fNBinsY,fMinY,fMaxY,
-                                             fNBinsPt,fMinPt,fMaxPt,
-                                             14,-0.5,13.5);
-  if(fAnalysisEtaMode) 
+  TH3F *gHistYPtPDGAntiProtonsPass = 0x0;
+  if(fUseAsymmetricBinning) {
+    Double_t gPDG[15] = {-0.5,0.5,1.5,2.5,3.5,4.5,5.5,6.5,7.5,8.5,9.5,10.5,11.5,12.5,13.5};
+    gHistYPtPDGAntiProtonsPass = new TH3F("gHistYPtPDGAntiProtonsPass",
+                                         ";;P_{T} [GeV/c];PDG",
+                                         fNBinsY,fY,fNBinsPt,fPt,14,gPDG);
+  }
+  else
+    gHistYPtPDGAntiProtonsPass = new TH3F("gHistYPtPDGAntiProtonsPass",
+                                         ";;P_{T} [GeV/c];PDG",
+                                         fNBinsY,fMinY,fMaxY,
+                                         fNBinsPt,fMinPt,fMaxPt,
+                                         14,-0.5,13.5);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtPDGAntiProtonsPass->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtPDGAntiProtonsPass->GetXaxis()->SetTitle("y");
@@ -2252,6 +2527,8 @@ void AliProtonQAAnalysis::InitQA() {
   TH1F *gPrimaryProtonsPointOnITSLayer6Pass = new TH1F("gPrimaryProtonsPointOnITSLayer6Pass",
                                             "",10,-1,1);
   fQAPrimaryProtonsAcceptedList->Add(gPrimaryProtonsPointOnITSLayer6Pass);
+  TH1F *gPrimaryProtonsNumberOfTPCdEdxPointsPass = new TH1F("gPrimaryProtonsNumberOfTPCdEdxPointsPass","",100,0,200);
+  fQAPrimaryProtonsAcceptedList->Add(gPrimaryProtonsNumberOfTPCdEdxPointsPass);
 
   //Rejected primary protons
   /*gDirectory->cd("../");
@@ -2352,7 +2629,8 @@ void AliProtonQAAnalysis::InitQA() {
   TH1F *gPrimaryProtonsPointOnITSLayer6Reject = new TH1F("gPrimaryProtonsPointOnITSLayer6Reject",
                                             "",10,-1,1);
   fQAPrimaryProtonsRejectedList->Add(gPrimaryProtonsPointOnITSLayer6Reject);
-
+  TH1F *gPrimaryProtonsNumberOfTPCdEdxPointsReject = new TH1F("gPrimaryProtonsNumberOfTPCdEdxPointsReject","",100,0,200);
+  fQAPrimaryProtonsRejectedList->Add(gPrimaryProtonsNumberOfTPCdEdxPointsReject);
   //________________________________________________________________//
   /*gDirectory->cd("../../");
 
@@ -2456,6 +2734,8 @@ void AliProtonQAAnalysis::InitQA() {
   TH1F *gSecondaryProtonsPointOnITSLayer6Pass = new TH1F("gSecondaryProtonsPointOnITSLayer6Pass",
                                                         "",10,-1,1);
   fQASecondaryProtonsAcceptedList->Add(gSecondaryProtonsPointOnITSLayer6Pass);
+  TH1F *gSecondaryProtonsNumberOfTPCdEdxPointsPass = new TH1F("gSecondaryProtonsNumberOfTPCdEdxPointsPass","",100,0,200);
+  fQASecondaryProtonsAcceptedList->Add(gSecondaryProtonsNumberOfTPCdEdxPointsPass);
 
   //Rejected secondary protons
   /*gDirectory->cd("../");
@@ -2556,7 +2836,8 @@ void AliProtonQAAnalysis::InitQA() {
   TH1F *gSecondaryProtonsPointOnITSLayer6Reject = new TH1F("gSecondaryProtonsPointOnITSLayer6Reject",
                                                           "",10,-1,1);
   fQASecondaryProtonsRejectedList->Add(gSecondaryProtonsPointOnITSLayer6Reject);
-  
+  TH1F *gSecondaryProtonsNumberOfTPCdEdxPointsReject = new TH1F("gSecondaryProtonsNumberOfTPCdEdxPointsReject","",100,0,200);
+  fQASecondaryProtonsRejectedList->Add(gSecondaryProtonsNumberOfTPCdEdxPointsReject);  
 
   /*gDirectory->cd("../../../");
 
@@ -2665,7 +2946,21 @@ void AliProtonQAAnalysis::InitQA() {
   TH1F *gPrimaryAntiProtonsPointOnITSLayer6Pass = new TH1F("gPrimaryAntiProtonsPointOnITSLayer6Pass",
                                                           "",10,-1,1);
   fQAPrimaryAntiProtonsAcceptedList->Add(gPrimaryAntiProtonsPointOnITSLayer6Pass);
-  
+  TH1F *gPrimaryAntiProtonsNumberOfTPCdEdxPointsPass = new TH1F("gPrimaryAntiProtonsNumberOfTPCdEdxPointsPass","",100,0,200);
+  fQAPrimaryAntiProtonsAcceptedList->Add(gPrimaryAntiProtonsNumberOfTPCdEdxPointsPass);
+  /*TH2F *gHistPrimaryAntiProtonsDCAxyPtPass = new TH2F("gHistPrimaryAntiProtonsDCAxyPtPass",
+                                                     ";P_{T} [GeV/c];dca_{xy} [cm]",
+                                                     16,0.3,1.1,
+                                                     1000,0,10);
+  gHistPrimaryAntiProtonsDCAxyPtPass->SetStats(kFALSE);
+  fQAPrimaryAntiProtonsAcceptedList->Add(gHistPrimaryAntiProtonsDCAxyPtPass);
+  TH2F *gHistPrimaryAntiProtonsDCAzPtPass = new TH2F("gHistPrimaryAntiProtonsDCAzPtPass",
+                                                    ";P_{T} [GeV/c];dca_{z} [cm]",
+                                                    16,0.3,1.1,
+                                                    1000,0,10);
+  gHistPrimaryAntiProtonsDCAzPtPass->SetStats(kFALSE);
+  fQAPrimaryAntiProtonsAcceptedList->Add(gHistPrimaryAntiProtonsDCAzPtPass);*/
+
   //Rejected primary antiprotons
   /*gDirectory->cd("../");
   TDirectory *dirAntiProtonsPrimaryRejected = gDirectory->mkdir("Rejected");
@@ -2765,6 +3060,20 @@ void AliProtonQAAnalysis::InitQA() {
   TH1F *gPrimaryAntiProtonsPointOnITSLayer6Reject = new TH1F("gPrimaryAntiProtonsPointOnITSLayer6Reject",
                                                             "",10,-1,1);
   fQAPrimaryAntiProtonsRejectedList->Add(gPrimaryAntiProtonsPointOnITSLayer6Reject);
+  TH1F *gPrimaryAntiProtonsNumberOfTPCdEdxPointsReject = new TH1F("gPrimaryAntiProtonsNumberOfTPCdEdxPointsReject","",100,0,200);
+  fQAPrimaryAntiProtonsRejectedList->Add(gPrimaryAntiProtonsNumberOfTPCdEdxPointsReject);
+  /*TH2F *gHistPrimaryAntiProtonsDCAxyPtReject = new TH2F("gHistPrimaryAntiProtonsDCAxyPtReject",
+                                                       ";P_{T} [GeV/c];dca_{xy} [cm]",
+                                                       16,0.3,1.1,
+                                                       1000,0,10);
+  gHistPrimaryAntiProtonsDCAxyPtReject->SetStats(kFALSE);
+  fQAPrimaryAntiProtonsRejectedList->Add(gHistPrimaryAntiProtonsDCAxyPtReject);
+  TH2F *gHistPrimaryAntiProtonsDCAzPtReject = new TH2F("gHistPrimaryAntiProtonsDCAzPtReject",
+                                                      ";P_{T} [GeV/c];dca_{z} [cm]",
+                                                      16,0.3,1.1,
+                                                      1000,0,10);
+  gHistPrimaryAntiProtonsDCAzPtReject->SetStats(kFALSE);
+  fQAPrimaryAntiProtonsRejectedList->Add(gHistPrimaryAntiProtonsDCAzPtReject);*/
   
   //________________________________________________________________//
   /*gDirectory->cd("../../");
@@ -2869,6 +3178,32 @@ void AliProtonQAAnalysis::InitQA() {
   TH1F *gSecondaryAntiProtonsPointOnITSLayer6Pass = new TH1F("gSecondaryAntiProtonsPointOnITSLayer6Pass",
                                                             "",10,-1,1);
   fQASecondaryAntiProtonsAcceptedList->Add(gSecondaryAntiProtonsPointOnITSLayer6Pass);
+  TH1F *gSecondaryAntiProtonsNumberOfTPCdEdxPointsPass = new TH1F("gSecondaryAntiProtonsNumberOfTPCdEdxPointsPass","",100,0,200);
+  fQASecondaryAntiProtonsAcceptedList->Add(gSecondaryAntiProtonsNumberOfTPCdEdxPointsPass);
+  /*TH2F *gHistSecondaryAntiProtonsFromWeakDCAxyPtPass = new TH2F("gHistSecondaryAntiProtonsFromWeakDCAxyPtPass",
+                                                               ";P_{T} [GeV/c];dca_{xy} [cm]",
+                                                               16,0.3,1.1,
+                                                               1000,0,10);
+  gHistSecondaryAntiProtonsFromWeakDCAxyPtPass->SetStats(kFALSE);
+  fQASecondaryAntiProtonsAcceptedList->Add(gHistSecondaryAntiProtonsFromWeakDCAxyPtPass);
+  TH2F *gHistSecondaryAntiProtonsFromWeakDCAzPtPass = new TH2F("gHistSecondaryAntiProtonsFromWeakDCAzPtPass",
+                                                              ";P_{T} [GeV/c];dca_{z} [cm]",
+                                                              16,0.3,1.1,
+                                                              1000,0,10);
+  gHistSecondaryAntiProtonsFromWeakDCAzPtPass->SetStats(kFALSE);
+  fQASecondaryAntiProtonsAcceptedList->Add(gHistSecondaryAntiProtonsFromWeakDCAzPtPass);
+  TH2F *gHistSecondaryAntiProtonsFromHadronicDCAxyPtPass = new TH2F("gHistSecondaryAntiProtonsFromHadronicDCAxyPtPass",
+                                                                   ";P_{T} [GeV/c];dca_{xy} [cm]",
+                                                                   16,0.3,1.1,
+                                                                   1000,0,10);
+  gHistSecondaryAntiProtonsFromHadronicDCAxyPtPass->SetStats(kFALSE);
+  fQASecondaryAntiProtonsAcceptedList->Add(gHistSecondaryAntiProtonsFromHadronicDCAxyPtPass);
+  TH2F *gHistSecondaryAntiProtonsFromHadronicDCAzPtPass = new TH2F("gHistSecondaryAntiProtonsFromHadronicDCAzPtPass",
+                                                                  ";P_{T} [GeV/c];dca_{z} [cm]",
+                                                                  16,0.3,1.1,
+                                                                  1000,0,10);
+  gHistSecondaryAntiProtonsFromHadronicDCAzPtPass->SetStats(kFALSE);
+  fQASecondaryAntiProtonsAcceptedList->Add(gHistSecondaryAntiProtonsFromHadronicDCAzPtPass);*/
   
   //Rejected secondary antiprotons
   /*gDirectory->cd("../");
@@ -2969,50 +3304,81 @@ void AliProtonQAAnalysis::InitQA() {
   TH1F *gSecondaryAntiProtonsPointOnITSLayer6Reject = new TH1F("gSecondaryAntiProtonsPointOnITSLayer6Reject",
                                                             "",10,-1,1);
   fQASecondaryAntiProtonsRejectedList->Add(gSecondaryAntiProtonsPointOnITSLayer6Reject);
+  TH1F *gSecondaryAntiProtonsNumberOfTPCdEdxPointsReject = new TH1F("gSecondaryAntiProtonsNumberOfTPCdEdxPointsReject","",100,0,200);
+  fQASecondaryAntiProtonsRejectedList->Add(gSecondaryAntiProtonsNumberOfTPCdEdxPointsReject);
+  /*TH2F *gHistSecondaryAntiProtonsFromWeakDCAxyPtReject = new TH2F("gHistSecondaryAntiProtonsFromWeakDCAxyPtReject",
+                                                                 ";P_{T} [GeV/c];dca_{xy} [cm]",
+                                                                 16,0.3,1.1,
+                                                                 1000,0,10);
+  gHistSecondaryAntiProtonsFromWeakDCAxyPtReject->SetStats(kFALSE);
+  fQASecondaryAntiProtonsRejectedList->Add(gHistSecondaryAntiProtonsFromWeakDCAxyPtReject);
+  TH2F *gHistSecondaryAntiProtonsFromWeakDCAzPtReject = new TH2F("gHistSecondaryAntiProtonsFromWeakDCAzPtReject",
+                                                                ";P_{T} [GeV/c];dca_{z} [cm]",
+                                                                16,0.3,1.1,
+                                                                1000,0,10);
+  gHistSecondaryAntiProtonsFromWeakDCAzPtReject->SetStats(kFALSE);
+  fQASecondaryAntiProtonsRejectedList->Add(gHistSecondaryAntiProtonsFromWeakDCAzPtReject);
+  TH2F *gHistSecondaryAntiProtonsFromHadronicDCAxyPtReject = new TH2F("gHistSecondaryAntiProtonsFromHadronicDCAxyPtReject",
+                                                                     ";P_{T} [GeV/c];dca_{xy} [cm]",
+                                                                     16,0.3,1.1,
+                                                                     1000,0,10);
+  gHistSecondaryAntiProtonsFromHadronicDCAxyPtReject->SetStats(kFALSE);
+  fQASecondaryAntiProtonsRejectedList->Add(gHistSecondaryAntiProtonsFromHadronicDCAxyPtReject);
+  TH2F *gHistSecondaryAntiProtonsFromHadronicDCAzPtReject = new TH2F("gHistSecondaryAntiProtonsFromHadronicDCAzPtReject",
+                                                                    ";P_{T} [GeV/c];dca_{z} [cm]",
+                                                                    16,0.3,1.1,
+                                                                    1000,0,10);
+  gHistSecondaryAntiProtonsFromHadronicDCAzPtReject->SetStats(kFALSE);
+  fQASecondaryAntiProtonsRejectedList->Add(gHistSecondaryAntiProtonsFromHadronicDCAzPtReject);*/
 }
 
 //____________________________________________________________________//
-void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent, 
-                                               AliESDEvent *esd,
-                                               const AliESDVertex *vertex) {
+void AliProtonQAAnalysis::RunReconstructionEfficiencyAnalysis(AliMCEvent *const mcEvent, 
+                                                             AliESDEvent *esd,
+                                                             const AliESDVertex *vertex) {
   //Run the reconstruction efficiency code (primaries & secondaries)
   AliStack *stack = mcEvent->Stack();
 
   Int_t nMCParticles = mcEvent->GetNumberOfTracks();
   Int_t nMCLabelCounter = 0;
   TArrayI labelMCArray(nMCParticles);
-  
+
   for (Int_t iTracks = 0; iTracks < mcEvent->GetNumberOfTracks(); iTracks++) {
-    AliMCParticle *mcTrack = mcEvent->GetTrack(iTracks);
+    AliMCParticle *mcTrack = (AliMCParticle*) mcEvent->GetTrack(iTracks);
     if (!mcTrack) {
       Printf("ERROR: Could not receive track %d (mc loop)", iTracks);
       continue;
     }
+
+    Double_t vz = mcTrack->Zv();
+    if (TMath::Abs(vz) > 50.) continue;//exclude particles generated out of the acceptance
+
     if(TMath::Abs(mcTrack->Eta()) > 1.0) continue;//acceptance
     if((mcTrack->Pt() > fMaxPt)||(mcTrack->Pt() < fMinPt)) continue;
-    if(fAnalysisEtaMode) {
+    if(fProtonAnalysisBase->GetEtaMode()) {
       if((mcTrack->Eta() > fMaxY)|| (mcTrack->Eta() < fMinY)) continue;
     }
     else 
-      if((Rapidity(mcTrack->Px(),mcTrack->Py(),mcTrack->Pz()) > fMaxY)||(Rapidity(mcTrack->Px(),mcTrack->Py(),mcTrack->Pz()) < fMinY)) continue;
+      if((fProtonAnalysisBase->Rapidity(mcTrack->Px(),mcTrack->Py(),mcTrack->Pz()) > fMaxY)||(fProtonAnalysisBase->Rapidity(mcTrack->Px(),mcTrack->Py(),mcTrack->Pz()) < fMinY)) continue;
     
     // Loop over Track References
-    Bool_t LabelTPC = kFALSE;
+    Bool_t labelTPC = kFALSE;
     AliTrackReference* trackRef = 0;
     for (Int_t iTrackRef = 0; iTrackRef  < mcTrack->GetNumberOfTrackReferences(); iTrackRef++) {
       trackRef = mcTrack->GetTrackReference(iTrackRef);
       if(trackRef) {
        Int_t detectorId = trackRef->DetectorId(); 
        if (detectorId == AliTrackReference::kTPC) {        
-         LabelTPC = kTRUE;
+         labelTPC = kTRUE;
          break;
        }
       }      
     }
 
     //findable tracks
-    if (LabelTPC) {
+    //if (labelTPC) {
       TParticle* particle = mcTrack->Particle();
+      if(!particle) continue;
       Int_t pdgcode = particle->GetPdgCode();
       if(TMath::Abs(pdgcode) != 2212) continue;
       
@@ -3021,23 +3387,23 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
 
       if(iTracks <= stack->GetNprimary()) {
        if(pdgcode == 2212) {
-         if(fAnalysisEtaMode
+         if(fProtonAnalysisBase->GetEtaMode()
            ((TH2D *)(fEfficiencyList->At(0)))->Fill(particle->Eta(),
                                                     particle->Pt());
          else
-           ((TH2D *)(fEfficiencyList->At(0)))->Fill(Rapidity(particle->Px(),
-                                                             particle->Py(),
-                                                             particle->Pz()),
+           ((TH2D *)(fEfficiencyList->At(0)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                  particle->Py(),
+                                                                                  particle->Pz()),
                                                     particle->Pt());
        }//protons
        if(pdgcode == -2212) {
-         if(fAnalysisEtaMode
+         if(fProtonAnalysisBase->GetEtaMode()
            ((TH2D *)(fEfficiencyList->At(1)))->Fill(particle->Eta(),
                                                     particle->Pt());
          else
-           ((TH2D *)(fEfficiencyList->At(1)))->Fill(Rapidity(particle->Px(),
-                                                             particle->Py(),
-                                                             particle->Pz()),
+           ((TH2D *)(fEfficiencyList->At(1)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                  particle->Py(),
+                                                                                  particle->Pz()),
                                                     particle->Pt());
        }//antiprotons
       }//primaries
@@ -3046,27 +3412,27 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
        Int_t lPartMother = -1;
        Int_t motherPDGCode = -1;
        lPartMother = particle->GetFirstMother();
-       AliMCParticle *mcMotherTrack = mcEvent->GetTrack(lPartMother);
+       AliMCParticle *mcMotherTrack = (AliMCParticle*) mcEvent->GetTrack(lPartMother);
        TParticle *motherParticle = mcMotherTrack->Particle();
        if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
        
        if(pdgcode == 2212) {
          if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-           if(fAnalysisEtaMode
+           if(fProtonAnalysisBase->GetEtaMode()
              ((TH2D *)(fEfficiencyList->At(2)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(2)))->Fill(Rapidity(particle->Px(),
+             ((TH2D *)(fEfficiencyList->At(2)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                particle->Py(),
                                                                particle->Pz()),
                                                       particle->Pt());
          }//weak decays
          if((particle->GetUniqueID() == 13)) {
-           if(fAnalysisEtaMode
+           if(fProtonAnalysisBase->GetEtaMode()
              ((TH2D *)(fEfficiencyList->At(4)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(4)))->Fill(Rapidity(particle->Px(),
+             ((TH2D *)(fEfficiencyList->At(4)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                particle->Py(),
                                                                particle->Pz()),
                                                       particle->Pt());
@@ -3074,28 +3440,28 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
        }//protons
        if(pdgcode == -2212) {
          if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-           if(fAnalysisEtaMode
+           if(fProtonAnalysisBase->GetEtaMode()
              ((TH2D *)(fEfficiencyList->At(3)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(3)))->Fill(Rapidity(particle->Px(),
+             ((TH2D *)(fEfficiencyList->At(3)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                particle->Py(),
                                                                particle->Pz()),
                                                       particle->Pt());
          }//weak decays
          if((particle->GetUniqueID() == 13)) {
-           if(fAnalysisEtaMode
+           if(fProtonAnalysisBase->GetEtaMode()
              ((TH2D *)(fEfficiencyList->At(5)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(5)))->Fill(Rapidity(particle->Px(),
+             ((TH2D *)(fEfficiencyList->At(5)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                particle->Py(),
                                                                particle->Pz()),
                                                       particle->Pt());
          }//hadronic interactions
        }//antiprotons
       }//secondaries
-    }//findable tracks
+      //}//findable tracks
   }//MC track loop
 
   //ESD track loop
@@ -3113,7 +3479,7 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
       if(!track) continue;
             
       //TPC only
-      if(fUseTPCOnly) {
+      if((fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kTPC)||(fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kHybrid)) {
        AliExternalTrackParam *tpcTrack = (AliExternalTrackParam *)track->GetTPCInnerParam();
        if(!tpcTrack) continue;
        
@@ -3124,39 +3490,31 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
        
        if (mcLabel != TMath::Abs(label)) continue;
        if(mcLabel != label) continue;
-       
+       if(label > stack->GetNtrack()) continue;
+
        TParticle *particle = stack->Particle(label);
        if(!particle) continue;
        Int_t pdgcode = particle->GetPdgCode();
        if(TMath::Abs(particle->Eta()) > 1.0) continue;//acceptance
        if((particle->Pt() > fMaxPt)||(particle->Pt() < fMinPt)) continue;
-       if(fAnalysisEtaMode) {
+       if(fProtonAnalysisBase->GetEtaMode()) {
          if((particle->Eta() > fMaxY)|| (particle->Eta() < fMinY)) continue;
        }
        else 
-         if((Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
-       
-       Double_t probability[5];
-       
-       if(fUseCutsInEfficiency) 
-         if(!IsAccepted(esd,vertex,track)) continue;
-       
+         if((fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
+               
+       if(fUseCutsInEfficiency) {
+         if(!fProtonAnalysisBase->IsPrimary(esd,vertex,track)) continue;
+         if(!fProtonAnalysisBase->IsAccepted(track)) continue;
+       }       
        //reconstructed primary (anti)protons
        if(pdgcode == 2212) {
-         if(fAnalysisEtaMode)
-           ((TH2D *)(fEfficiencyList->At(12)))->Fill(particle->Eta(),
-                                                     particle->Pt());
-         else
-           ((TH2D *)(fEfficiencyList->At(12)))->Fill(Rapidity(particle->Px(),
-                                                              particle->Py(),
-                                                              particle->Pz()),
-                                                     particle->Pt());
          if(label <= stack->GetNprimary()) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(6)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(6)))->Fill(Rapidity(particle->Px(),
+             ((TH2D *)(fEfficiencyList->At(6)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                particle->Py(),
                                                                particle->Pz()),
                                                       particle->Pt());
@@ -3169,21 +3527,21 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
            if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
            
            if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-             if(fAnalysisEtaMode)
+             if(fProtonAnalysisBase->GetEtaMode())
                ((TH2D *)(fEfficiencyList->At(8)))->Fill(particle->Eta(),
                                                         particle->Pt());
              else
-               ((TH2D *)(fEfficiencyList->At(8)))->Fill(Rapidity(particle->Px(),
+               ((TH2D *)(fEfficiencyList->At(8)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                  particle->Py(),
                                                                  particle->Pz()),
                                                         particle->Pt());
            }//weak decays
            if((particle->GetUniqueID() == 13)) {
-             if(fAnalysisEtaMode)
+             if(fProtonAnalysisBase->GetEtaMode())
                ((TH2D *)(fEfficiencyList->At(10)))->Fill(particle->Eta(),
                                                          particle->Pt());
              else
-               ((TH2D *)(fEfficiencyList->At(10)))->Fill(Rapidity(particle->Px(),
+               ((TH2D *)(fEfficiencyList->At(10)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                   particle->Py(),
                                                                   particle->Pz()),
                                                          particle->Pt());
@@ -3191,20 +3549,12 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
          }//secondaries
        }//initial protons
        if(pdgcode == -2212) {  
-         if(fAnalysisEtaMode)
-           ((TH2D *)(fEfficiencyList->At(12)))->Fill(particle->Eta(),
-                                                     particle->Pt());
-         else
-           ((TH2D *)(fEfficiencyList->At(12)))->Fill(Rapidity(particle->Px(),
-                                                              particle->Py(),
-                                                              particle->Pz()),
-                                                     particle->Pt());
          if(label <= stack->GetNprimary()) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(7)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(7)))->Fill(Rapidity(particle->Px(),
+             ((TH2D *)(fEfficiencyList->At(7)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                particle->Py(),
                                                                particle->Pz()),
                                                       particle->Pt());
@@ -3217,70 +3567,29 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
            if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
            
            if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-             if(fAnalysisEtaMode)
+             if(fProtonAnalysisBase->GetEtaMode())
                ((TH2D *)(fEfficiencyList->At(9)))->Fill(particle->Eta(),
                                                         particle->Pt());
              else
-               ((TH2D *)(fEfficiencyList->At(9)))->Fill(Rapidity(particle->Px(),
+               ((TH2D *)(fEfficiencyList->At(9)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                  particle->Py(),
                                                                  particle->Pz()),
                                                         particle->Pt());
            }//weak decays
            if((particle->GetUniqueID() == 13)) {
-             if(fAnalysisEtaMode)
+             if(fProtonAnalysisBase->GetEtaMode())
                ((TH2D *)(fEfficiencyList->At(11)))->Fill(particle->Eta(),
                                                          particle->Pt());
              else
-               ((TH2D *)(fEfficiencyList->At(11)))->Fill(Rapidity(particle->Px(),
+               ((TH2D *)(fEfficiencyList->At(11)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                   particle->Py(),
                                                                   particle->Pz()),
                                                          particle->Pt());
            }//hadronic interactions
          }//secondaries
-       }//initial antiprotons
-       
-       //pid
-       track->GetTPCpid(probability);
-       Double_t rcc = 0.0;
-       for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-         rcc += probability[i]*GetParticleFraction(i,particle->P());
-       if(rcc == 0.0) continue;
-       Double_t w[5];
-       for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-         w[i] = probability[i]*GetParticleFraction(i,particle->P())/rcc;
-       Long64_t fParticleType = TMath::LocMax(AliPID::kSPECIES,w);
-       if(fParticleType == 4) {
-         if(fAnalysisEtaMode)
-           ((TH2D *)(fEfficiencyList->At(14)))->Fill(particle->Eta(),
-                                                     particle->Pt());
-         else
-           ((TH2D *)(fEfficiencyList->At(14)))->Fill(Rapidity(particle->Px(),
-                                                              particle->Py(),
-                                                              particle->Pz()),
-                                                     particle->Pt());
-         if(TMath::Abs(pdgcode) == 2212) {
-           if(fAnalysisEtaMode)
-             ((TH2D *)(fEfficiencyList->At(13)))->Fill(particle->Eta(),
-                                                       particle->Pt());
-           else
-             ((TH2D *)(fEfficiencyList->At(13)))->Fill(Rapidity(particle->Px(),
-                                                                particle->Py(),
-                                                                particle->Pz()),
-                                                       particle->Pt());
-         }//properly identified as proton
-         else {
-           if(fAnalysisEtaMode)
-             ((TH2D *)(fEfficiencyList->At(15)))->Fill(particle->Eta(),
-                                                       particle->Pt());
-           else
-             ((TH2D *)(fEfficiencyList->At(15)))->Fill(Rapidity(particle->Px(),
-                                                                particle->Py(),
-                                                                particle->Pz()),
-                                                       particle->Pt());
-         }//contamination
-       }//identified as proton
+       }//initial antiprotons  
       }//TPC only tracks
-      else if(!fUseTPCOnly) {
+      else {
        Int_t label = TMath::Abs(track->GetLabel());
        if(IsLabelUsed(labelArray,label)) continue;
        labelArray.AddAt(label,labelCounter);
@@ -3288,39 +3597,33 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
        
        if (mcLabel != TMath::Abs(label)) continue;
        if(mcLabel != label) continue;
-       
+       if(label > stack->GetNtrack()) continue;
+               
        TParticle *particle = stack->Particle(label);
        if(!particle) continue;
        Int_t pdgcode = particle->GetPdgCode();
        if(TMath::Abs(particle->Eta()) > 1.0) continue;//acceptance
        if((particle->Pt() > fMaxPt)||(particle->Pt() < fMinPt)) continue;
-       if(fAnalysisEtaMode) {
+       if(fProtonAnalysisBase->GetEtaMode()) {
          if((particle->Eta() > fMaxY)|| (particle->Eta() < fMinY)) continue;
        }
        else 
-         if((Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
+         if((fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
        
-       Double_t probability[5];
+       //Double_t probability[5];
 
-       if(fUseCutsInEfficiency) 
-         if(!IsAccepted(esd,vertex,track)) continue;
-       
+       if(fUseCutsInEfficiency) {
+         if(!fProtonAnalysisBase->IsPrimary(esd,vertex,track)) continue;
+         if(!fProtonAnalysisBase->IsAccepted(track)) continue;
+       }       
        //reconstructed primary (anti)protons
        if(pdgcode == 2212) {
-         if(fAnalysisEtaMode)
-           ((TH2D *)(fEfficiencyList->At(12)))->Fill(particle->Eta(),
-                                                     particle->Pt());
-         else
-           ((TH2D *)(fEfficiencyList->At(12)))->Fill(Rapidity(particle->Px(),
-                                                              particle->Py(),
-                                                              particle->Pz()),
-                                                     particle->Pt());
          if(label <= stack->GetNprimary()) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(6)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(6)))->Fill(Rapidity(particle->Px(),
+             ((TH2D *)(fEfficiencyList->At(6)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                particle->Py(),
                                                                particle->Pz()),
                                                       particle->Pt());
@@ -3333,21 +3636,21 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
            if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
            
            if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-             if(fAnalysisEtaMode)
+             if(fProtonAnalysisBase->GetEtaMode())
                ((TH2D *)(fEfficiencyList->At(8)))->Fill(particle->Eta(),
                                                         particle->Pt());
              else
-               ((TH2D *)(fEfficiencyList->At(8)))->Fill(Rapidity(particle->Px(),
+               ((TH2D *)(fEfficiencyList->At(8)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                  particle->Py(),
                                                                  particle->Pz()),
                                                         particle->Pt());
            }//weak decays
            if((particle->GetUniqueID() == 13)) {
-             if(fAnalysisEtaMode)
+             if(fProtonAnalysisBase->GetEtaMode())
                ((TH2D *)(fEfficiencyList->At(10)))->Fill(particle->Eta(),
                                                          particle->Pt());
              else
-               ((TH2D *)(fEfficiencyList->At(10)))->Fill(Rapidity(particle->Px(),
+               ((TH2D *)(fEfficiencyList->At(10)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                   particle->Py(),
                                                                   particle->Pz()),
                                                          particle->Pt());
@@ -3355,20 +3658,12 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
          }//secondaries
        }//initial protons
        if(pdgcode == -2212) {  
-         if(fAnalysisEtaMode)
-           ((TH2D *)(fEfficiencyList->At(12)))->Fill(particle->Eta(),
-                                                     particle->Pt());
-         else
-           ((TH2D *)(fEfficiencyList->At(12)))->Fill(Rapidity(particle->Px(),
-                                                              particle->Py(),
-                                                              particle->Pz()),
-                                                     particle->Pt());
          if(label <= stack->GetNprimary()) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(7)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(7)))->Fill(Rapidity(particle->Px(),
+             ((TH2D *)(fEfficiencyList->At(7)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                particle->Py(),
                                                                particle->Pz()),
                                                       particle->Pt());
@@ -3381,77 +3676,175 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliMCEvent *mcEvent,
            if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
            
            if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-             if(fAnalysisEtaMode)
+             if(fProtonAnalysisBase->GetEtaMode())
                ((TH2D *)(fEfficiencyList->At(9)))->Fill(particle->Eta(),
                                                         particle->Pt());
              else
-               ((TH2D *)(fEfficiencyList->At(9)))->Fill(Rapidity(particle->Px(),
+               ((TH2D *)(fEfficiencyList->At(9)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                  particle->Py(),
                                                                  particle->Pz()),
                                                         particle->Pt());
            }//weak decays
            if((particle->GetUniqueID() == 13)) {
-             if(fAnalysisEtaMode)
+             if(fProtonAnalysisBase->GetEtaMode())
                ((TH2D *)(fEfficiencyList->At(11)))->Fill(particle->Eta(),
                                                          particle->Pt());
              else
-               ((TH2D *)(fEfficiencyList->At(11)))->Fill(Rapidity(particle->Px(),
+               ((TH2D *)(fEfficiencyList->At(11)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                                   particle->Py(),
                                                                   particle->Pz()),
                                                          particle->Pt());
            }//hadronic interactions
          }//secondaries
-       }//initial antiprotons
+       }//initial antiprotons  
+      }//global tracking
+    }//track loop
+    labelArray.Reset();
+  }//loop over findable tracks
+
+  labelMCArray.Reset();
+}
+
+//____________________________________________________________________//
+void AliProtonQAAnalysis::RunPIDEfficiencyAnalysis(AliStack *const stack, 
+                                                  AliESDEvent *esd,
+                                                  const AliESDVertex *vertex) {
+  //Runs the PID efficiency analysis
+  Int_t nGoodTracks = esd->GetNumberOfTracks();
+  TArrayI labelArray(nGoodTracks);
+  Int_t labelCounter = 0;
+  for(Int_t iTracks = 0; iTracks < nGoodTracks; iTracks++) {
+    AliESDtrack* track = esd->GetTrack(iTracks);
+    if(!track) continue;
+    
+    //TPC only
+    if((fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kTPC)||(fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kHybrid)) {
+      AliExternalTrackParam *tpcTrack = (AliExternalTrackParam *)track->GetTPCInnerParam();
+      if(!tpcTrack) continue;
+    }
+       
+    Int_t label = TMath::Abs(track->GetLabel());
+    if(IsLabelUsed(labelArray,label)) continue;
+    labelArray.AddAt(label,labelCounter);
+    labelCounter += 1;
+    if(label > stack->GetNtrack()) continue;
+
+    TParticle *particle = stack->Particle(label);
+    if(!particle) continue;
+    Int_t pdgcode = particle->GetPdgCode();
+    
+    Int_t nTPCpoints = track->GetTPCsignalN();
+
+    if(fUseCutsInEfficiency) {
+      if(!fProtonAnalysisBase->IsPrimary(esd,vertex,track)) continue;
+      if(!fProtonAnalysisBase->IsAccepted(track)) continue;
+    }  
+    if(TMath::Abs(pdgcode) == 2212) {
+      if(fProtonAnalysisBase->GetEtaMode())
+       ((TH3D *)(fEfficiencyList->At(12)))->Fill(particle->Eta(),
+                                                 particle->Pt(),nTPCpoints);
+      else
+       ((TH3D *)(fEfficiencyList->At(12)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()),particle->Pt(),nTPCpoints);
+    }
+
+    //pid
+    if(fProtonAnalysisBase->IsProton(track)) {
+      if(fProtonAnalysisBase->GetEtaMode())
+       ((TH3D *)(fEfficiencyList->At(14)))->Fill(particle->Eta(),
+                                                 particle->Pt(),nTPCpoints);
+      else ((TH3D *)(fEfficiencyList->At(14)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()),particle->Pt(),nTPCpoints);
+      if(TMath::Abs(pdgcode) == 2212) {
+       if(fProtonAnalysisBase->GetEtaMode())
+         ((TH3D *)(fEfficiencyList->At(13)))->Fill(particle->Eta(),
+                                                   particle->Pt(),nTPCpoints);
+       else
+         ((TH3D *)(fEfficiencyList->At(13)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()),particle->Pt(),nTPCpoints);
+      }//properly identified as proton
+      else {
+       if(fProtonAnalysisBase->GetEtaMode())
+         ((TH3D *)(fEfficiencyList->At(15)))->Fill(particle->Eta(),
+                                                   particle->Pt(),nTPCpoints);
+       else
+         ((TH3D *)(fEfficiencyList->At(15)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()),particle->Pt(),nTPCpoints);
+      }//contamination
+    }//identified as proton
+  }//ESD track loop
+  labelArray.Reset();
+}
+
+//____________________________________________________________________//
+void AliProtonQAAnalysis::RunCutEfficiencyAnalysis(AliStack *const stack, 
+                                                  AliESDEvent *esd,
+                                                  const AliESDVertex *vertex) {
+  //Runs the cut efficiency analysis
+  Int_t nGoodTracks = esd->GetNumberOfTracks();
+  TArrayI labelArray(nGoodTracks);
+  Int_t labelCounter = 0;
+  Int_t nPrimaries = stack->GetNprimary();
+  for(Int_t iTracks = 0; iTracks < nGoodTracks; iTracks++) {
+    AliESDtrack* track = esd->GetTrack(iTracks);
+    if(!track) continue;
+    
+    //TPC only
+    if((fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kTPC)||(fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kHybrid)) {
+      AliExternalTrackParam *tpcTrack = (AliExternalTrackParam *)track->GetTPCInnerParam();
+      if(!tpcTrack) continue;
+    }
        
-       //pid
-       track->GetESDpid(probability);
-       Double_t rcc = 0.0;
-       for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-         rcc += probability[i]*GetParticleFraction(i,particle->P());
-       if(rcc == 0.0) continue;
-       Double_t w[5];
-       for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-         w[i] = probability[i]*GetParticleFraction(i,particle->P())/rcc;
-       Long64_t fParticleType = TMath::LocMax(AliPID::kSPECIES,w);
-       if(fParticleType == 4) {
-         if(fAnalysisEtaMode)
-           ((TH2D *)(fEfficiencyList->At(14)))->Fill(particle->Eta(),
-                                                     particle->Pt());
-         else ((TH2D *)(fEfficiencyList->At(14)))->Fill(Rapidity(particle->Px(),
-                                                                 particle->Py(),
-                                                                 particle->Pz()),
-                                                        particle->Pt());
-         if(TMath::Abs(pdgcode) == 2212) {
-           if(fAnalysisEtaMode)
-             ((TH2D *)(fEfficiencyList->At(13)))->Fill(particle->Eta(),
-                                                       particle->Pt());
-           else
-             ((TH2D *)(fEfficiencyList->At(13)))->Fill(Rapidity(particle->Px(),
-                                                                particle->Py(),
-                                                                particle->Pz()),
-                                                       particle->Pt());
-         }//properly identified as proton
-         else {
-           if(fAnalysisEtaMode)
-             ((TH2D *)(fEfficiencyList->At(15)))->Fill(particle->Eta(),
-                                                       particle->Pt());
-           else
-             ((TH2D *)(fEfficiencyList->At(15)))->Fill(Rapidity(particle->Px(),
-                                                                particle->Py(),
-                                                                particle->Pz()),
-                                                       particle->Pt());
-         }//contamination
-       }//identified as proton
-      }//global tracking
-    }//track loop
-    labelArray.Reset();
-  }//loop over findable tracks
+    Int_t label = TMath::Abs(track->GetLabel());
+    if(IsLabelUsed(labelArray,label)) continue;
+    labelArray.AddAt(label,labelCounter);
+    labelCounter += 1;
+    if(label > stack->GetNtrack()) continue;
 
-  labelMCArray.Reset();
+    TParticle *particle = stack->Particle(label);
+    if(!particle) continue;
+               
+    //select primaries
+    if(label > nPrimaries) continue;
+    //select identified protons
+    if(!fProtonAnalysisBase->IsProton(track)) continue;
+    if(track->Charge() > 0) {
+      if(fProtonAnalysisBase->GetEtaMode())
+       ((TH2F *)(fCutEfficiencyList->At(0)))->Fill(particle->Eta(),
+                                                   particle->Pt());
+      else
+       ((TH2F *)(fCutEfficiencyList->At(0)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()),particle->Pt());
+    }
+
+    if(track->Charge() < 0) {
+      if(fProtonAnalysisBase->GetEtaMode())
+       ((TH2F *)(fCutEfficiencyList->At(1)))->Fill(particle->Eta(),
+                                                   particle->Pt());
+      else
+       ((TH2F *)(fCutEfficiencyList->At(1)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()),particle->Pt());
+    }
+
+    //survived tracks
+    if(!fProtonAnalysisBase->IsPrimary(esd,vertex,track)) continue;
+    if(!fProtonAnalysisBase->IsAccepted(track)) continue;
+    if(track->Charge() > 0) {
+      if(fProtonAnalysisBase->GetEtaMode())
+       ((TH2F *)(fCutEfficiencyList->At(2)))->Fill(particle->Eta(),
+                                                   particle->Pt());
+      else
+       ((TH2F *)(fCutEfficiencyList->At(2)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()),particle->Pt());
+    }
+
+    if(track->Charge() < 0) {
+      if(fProtonAnalysisBase->GetEtaMode())
+       ((TH2F *)(fCutEfficiencyList->At(3)))->Fill(particle->Eta(),
+                                                   particle->Pt());
+      else
+       ((TH2F *)(fCutEfficiencyList->At(3)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()),particle->Pt());
+    }
+  }//ESD track loop
+  labelArray.Reset();
 }
 
 //____________________________________________________________________//
-void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliStack *stack, 
+void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliStack *const stack, 
                                                AliESDEvent *esd,
                                                const AliESDVertex *vertex) {
   //Runs the efficiency code
@@ -3463,11 +3856,11 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliStack *stack,
 
     if(TMath::Abs(particle->Eta()) > 1.0) continue;//acceptance
     if((particle->Pt() > fMaxPt)||(particle->Pt() < fMinPt)) continue;
-    if(fAnalysisEtaMode) {
+    if(fProtonAnalysisBase->GetEtaMode()) {
       if((particle->Eta() > fMaxY)|| (particle->Eta() < fMinY)) continue;
     }
     else 
-      if((Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
+      if((fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
 
     Int_t pdgcode = particle->GetPdgCode();
     if(TMath::Abs(pdgcode) != 2212) continue;
@@ -3475,23 +3868,23 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliStack *stack,
     if(iParticle <= stack->GetNprimary()) {
       if(pdgcode == 2212) {
        nMCProtons += 1;
-       if(fAnalysisEtaMode
+       if(fProtonAnalysisBase->GetEtaMode()
          ((TH2D *)(fEfficiencyList->At(0)))->Fill(particle->Eta(),
                                                   particle->Pt());
        else
-         ((TH2D *)(fEfficiencyList->At(0)))->Fill(Rapidity(particle->Px(),
+         ((TH2D *)(fEfficiencyList->At(0)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                            particle->Py(),
                                                            particle->Pz()),
                                                   particle->Pt());
       }//protons
       if(pdgcode == -2212) {
-       if(fAnalysisEtaMode
+       if(fProtonAnalysisBase->GetEtaMode()
          ((TH2D *)(fEfficiencyList->At(1)))->Fill(particle->Eta(),
                                                   particle->Pt());
        else
-         ((TH2D *)(fEfficiencyList->At(1)))->Fill(Rapidity(particle->Px(),
-                                                           particle->Py(),
-                                                           particle->Pz()),
+         ((TH2D *)(fEfficiencyList->At(1)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                particle->Py(),
+                                                                                particle->Pz()),
                                                   particle->Pt());
       }//antiprotons
     }//primaries
@@ -3505,43 +3898,43 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliStack *stack,
 
       if(pdgcode == 2212) {
        if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-         if(fAnalysisEtaMode
+         if(fProtonAnalysisBase->GetEtaMode()
            ((TH2D *)(fEfficiencyList->At(2)))->Fill(particle->Eta(),
                                                     particle->Pt());
          else
-           ((TH2D *)(fEfficiencyList->At(2)))->Fill(Rapidity(particle->Px(),
-                                                             particle->Py(),
-                                                             particle->Pz()),
+           ((TH2D *)(fEfficiencyList->At(2)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                  particle->Py(),
+                                                                                  particle->Pz()),
                                                     particle->Pt());
        }//weak decays
        if((particle->GetUniqueID() == 13)) {
-         if(fAnalysisEtaMode
+         if(fProtonAnalysisBase->GetEtaMode()
            ((TH2D *)(fEfficiencyList->At(4)))->Fill(particle->Eta(),
                                                     particle->Pt());
          else
-           ((TH2D *)(fEfficiencyList->At(4)))->Fill(Rapidity(particle->Px(),
-                                                             particle->Py(),
-                                                             particle->Pz()),
+           ((TH2D *)(fEfficiencyList->At(4)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                  particle->Py(),
+                                                                                  particle->Pz()),
                                                     particle->Pt());
        }//hadronic interactions
       }//protons
       if(pdgcode == -2212) {
        if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-         if(fAnalysisEtaMode
+         if(fProtonAnalysisBase->GetEtaMode()
            ((TH2D *)(fEfficiencyList->At(3)))->Fill(particle->Eta(),
                                                     particle->Pt());
          else
-           ((TH2D *)(fEfficiencyList->At(3)))->Fill(Rapidity(particle->Px(),
-                                                             particle->Py(),
-                                                             particle->Pz()),
+           ((TH2D *)(fEfficiencyList->At(3)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                  particle->Py(),
+                                                                                  particle->Pz()),
                                                     particle->Pt());
        }//weak decays
        if((particle->GetUniqueID() == 13)) {
-         if(fAnalysisEtaMode
+         if(fProtonAnalysisBase->GetEtaMode()
            ((TH2D *)(fEfficiencyList->At(5)))->Fill(particle->Eta(),
                                                     particle->Pt());
          else
-           ((TH2D *)(fEfficiencyList->At(5)))->Fill(Rapidity(particle->Px(),
+           ((TH2D *)(fEfficiencyList->At(5)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                              particle->Py(),
                                                              particle->Pz()),
                                                     particle->Pt());
@@ -3563,51 +3956,44 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliStack *stack,
     if(IsLabelUsed(labelArray,label)) continue;
     labelArray.AddAt(label,labelCounter);
     labelCounter += 1;
-    
+    if(label > stack->GetNtrack()) continue;
+
     TParticle *particle = stack->Particle(label);
     if(!particle) continue;
     Int_t pdgcode = particle->GetPdgCode();
     if(TMath::Abs(particle->Eta()) > 1.0) continue;//acceptance
     
-    Double_t Pt = 0.0, P = 0.0;
-    Double_t probability[5];
+    Double_t gPt = 0.0, gP = 0.0;
     
     //TPC only
-    if(fUseTPCOnly) {
+    if((fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kTPC)||(fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kHybrid)) {
       AliExternalTrackParam *tpcTrack = (AliExternalTrackParam *)track->GetTPCInnerParam();
       if(!tpcTrack) continue;
-      Pt = tpcTrack->Pt();
-      P = tpcTrack->P();
+      gPt = tpcTrack->Pt();
+      gP = tpcTrack->P();
       
       if((particle->Pt() > fMaxPt)||(particle->Pt() < fMinPt)) continue;
-      if(fAnalysisEtaMode) {
+      if(fProtonAnalysisBase->GetEtaMode()) {
        if((particle->Eta() > fMaxY)|| (particle->Eta() < fMinY)) continue;
       }
       else 
-       if((Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
-      
-      if(fUseCutsInEfficiency) 
-       if(!IsAccepted(esd,vertex,track)) continue;
+       if((fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
       
+      if(fUseCutsInEfficiency) {
+       if(!fProtonAnalysisBase->IsPrimary(esd,vertex,track)) continue;
+       if(!fProtonAnalysisBase->IsAccepted(track)) continue;
+      }      
       //reconstructed primary (anti)protons
       if(pdgcode == 2212) {
-       if(fAnalysisEtaMode)
-         ((TH2D *)(fEfficiencyList->At(12)))->Fill(particle->Eta(),
-                                                   particle->Pt());
-       else
-         ((TH2D *)(fEfficiencyList->At(12)))->Fill(Rapidity(particle->Px(),
-                                                            particle->Py(),
-                                                            particle->Pz()),
-                                                   particle->Pt());
        if(label <= stack->GetNprimary()) {
          nESDProtons += 1;
-         if(fAnalysisEtaMode)
+         if(fProtonAnalysisBase->GetEtaMode())
            ((TH2D *)(fEfficiencyList->At(6)))->Fill(particle->Eta(),
                                                     particle->Pt());
          else
-           ((TH2D *)(fEfficiencyList->At(6)))->Fill(Rapidity(particle->Px(),
-                                                             particle->Py(),
-                                                             particle->Pz()),
+           ((TH2D *)(fEfficiencyList->At(6)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                  particle->Py(),
+                                                                                  particle->Pz()),
                                                     particle->Pt());
        }//primaries
        if(label > stack->GetNprimary()) {
@@ -3618,44 +4004,36 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliStack *stack,
          if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
          
          if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(8)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(8)))->Fill(Rapidity(particle->Px(),
-                                                               particle->Py(),
-                                                               particle->Pz()),
+             ((TH2D *)(fEfficiencyList->At(8)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                    particle->Py(),
+                                                                                    particle->Pz()),
                                                       particle->Pt());
          }//weak decays
          if((particle->GetUniqueID() == 13)) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(10)))->Fill(particle->Eta(),
                                                        particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(10)))->Fill(Rapidity(particle->Px(),
-                                                                particle->Py(),
-                                                                particle->Pz()),
+             ((TH2D *)(fEfficiencyList->At(10)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                     particle->Py(),
+                                                                                     particle->Pz()),
                                                        particle->Pt());
          }//hadronic interactions
        }//secondaries
       }//initial protons
       if(pdgcode == -2212) {   
-       if(fAnalysisEtaMode)
-         ((TH2D *)(fEfficiencyList->At(12)))->Fill(particle->Eta(),
-                                                   particle->Pt());
-       else
-         ((TH2D *)(fEfficiencyList->At(12)))->Fill(Rapidity(particle->Px(),
-                                                            particle->Py(),
-                                                            particle->Pz()),
-                                                   particle->Pt());
        if(label <= stack->GetNprimary()) {
-         if(fAnalysisEtaMode)
+         if(fProtonAnalysisBase->GetEtaMode())
            ((TH2D *)(fEfficiencyList->At(7)))->Fill(particle->Eta(),
                                                     particle->Pt());
          else
-           ((TH2D *)(fEfficiencyList->At(7)))->Fill(Rapidity(particle->Px(),
-                                                             particle->Py(),
-                                                             particle->Pz()),
+           ((TH2D *)(fEfficiencyList->At(7)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                  particle->Py(),
+                                                                                  particle->Pz()),
                                                     particle->Pt());
        }//primaries
        if(label > stack->GetNprimary()) {
@@ -3666,100 +4044,52 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliStack *stack,
          if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
          
          if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(9)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(9)))->Fill(Rapidity(particle->Px(),
-                                                               particle->Py(),
-                                                               particle->Pz()),
+             ((TH2D *)(fEfficiencyList->At(9)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                    particle->Py(),
+                                                                                    particle->Pz()),
                                                       particle->Pt());
          }//weak decays
          if((particle->GetUniqueID() == 13)) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(11)))->Fill(particle->Eta(),
                                                        particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(11)))->Fill(Rapidity(particle->Px(),
-                                                                particle->Py(),
-                                                                particle->Pz()),
+             ((TH2D *)(fEfficiencyList->At(11)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                     particle->Py(),
+                                                                                     particle->Pz()),
                                                        particle->Pt());
          }//hadronic interactions
        }//secondaries
       }//initial antiprotons
-      
-      //pid
-      track->GetTPCpid(probability);
-      Double_t rcc = 0.0;
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-       rcc += probability[i]*GetParticleFraction(i,P);
-      if(rcc == 0.0) continue;
-      Double_t w[5];
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-       w[i] = probability[i]*GetParticleFraction(i,P)/rcc;
-      Long64_t fParticleType = TMath::LocMax(AliPID::kSPECIES,w);
-      if(fParticleType == 4) {
-       if(fAnalysisEtaMode)
-         ((TH2D *)(fEfficiencyList->At(14)))->Fill(particle->Eta(),
-                                                   particle->Pt());
-       else
-         ((TH2D *)(fEfficiencyList->At(14)))->Fill(Rapidity(particle->Px(),
-                                                            particle->Py(),
-                                                            particle->Pz()),
-                                                   particle->Pt());
-       if(TMath::Abs(pdgcode) == 2212) {
-         if(fAnalysisEtaMode)
-           ((TH2D *)(fEfficiencyList->At(13)))->Fill(particle->Eta(),
-                                                     particle->Pt());
-         else
-           ((TH2D *)(fEfficiencyList->At(13)))->Fill(Rapidity(particle->Px(),
-                                                              particle->Py(),
-                                                              particle->Pz()),
-                                                     particle->Pt());
-       }//properly identified as proton
-       else {
-         if(fAnalysisEtaMode)
-           ((TH2D *)(fEfficiencyList->At(15)))->Fill(particle->Eta(),
-                                                     particle->Pt());
-         else
-           ((TH2D *)(fEfficiencyList->At(15)))->Fill(Rapidity(particle->Px(),
-                                                              particle->Py(),
-                                                              particle->Pz()),
-                                                     particle->Pt());
-       }//contamination
-      }//identified as proton
     }//TPC only tracks
-    else if(!fUseTPCOnly) {
+    else {
       if((particle->Pt() > fMaxPt)||(particle->Pt() < fMinPt)) continue;
-      if(fAnalysisEtaMode) {
+      if(fProtonAnalysisBase->GetEtaMode()) {
        if((particle->Eta() > fMaxY)|| (particle->Eta() < fMinY)) continue;
       }
       else {
-       if((Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
+       if((fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
       }
       
-      if(fUseCutsInEfficiency) 
-       if(!IsAccepted(esd,vertex,track)) continue;
-      
+      if(fUseCutsInEfficiency) {
+       if(!fProtonAnalysisBase->IsPrimary(esd,vertex,track)) continue;
+       if(!fProtonAnalysisBase->IsAccepted(track)) continue;
+      }      
       //reconstructed primary (anti)protons
       if(pdgcode == 2212) {
-       if(fAnalysisEtaMode)
-         ((TH2D *)(fEfficiencyList->At(12)))->Fill(particle->Eta(),
-                                                   particle->Pt());
-       else
-         ((TH2D *)(fEfficiencyList->At(12)))->Fill(Rapidity(particle->Px(),
-                                                            particle->Py(),
-                                                            particle->Pz()),
-                                                   particle->Pt());
        if(label <= stack->GetNprimary()) {
          nESDProtons += 1;
-         if(fAnalysisEtaMode)
+         if(fProtonAnalysisBase->GetEtaMode())
            ((TH2D *)(fEfficiencyList->At(6)))->Fill(particle->Eta(),
                                                     particle->Pt());
          else
-           ((TH2D *)(fEfficiencyList->At(6)))->Fill(Rapidity(particle->Px(),
-                                                             particle->Py(),
-                                                             particle->Pz()),
+           ((TH2D *)(fEfficiencyList->At(6)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                  particle->Py(),
+                                                                                  particle->Pz()),
                                                     particle->Pt());
        }//primaries
        if(label > stack->GetNprimary()) {
@@ -3770,44 +4100,44 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliStack *stack,
          if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
          
          if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(8)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(8)))->Fill(Rapidity(particle->Px(),
-                                                               particle->Py(),
-                                                               particle->Pz()),
+             ((TH2D *)(fEfficiencyList->At(8)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                    particle->Py(),
+                                                                                    particle->Pz()),
                                                       particle->Pt());
          }//weak decays
          if((particle->GetUniqueID() == 13)) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(10)))->Fill(particle->Eta(),
                                                        particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(10)))->Fill(Rapidity(particle->Px(),
-                                                                particle->Py(),
-                                                                particle->Pz()),
+             ((TH2D *)(fEfficiencyList->At(10)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                     particle->Py(),
+                                                                                     particle->Pz()),
                                                        particle->Pt());
          }//hadronic interactions
        }//secondaries
       }//initial protons
       if(pdgcode == -2212) {   
-       if(fAnalysisEtaMode)
+       if(fProtonAnalysisBase->GetEtaMode())
          ((TH2D *)(fEfficiencyList->At(12)))->Fill(particle->Eta(),
                                                    particle->Pt());
        else
-         ((TH2D *)(fEfficiencyList->At(12)))->Fill(Rapidity(particle->Px(),
-                                                            particle->Py(),
-                                                            particle->Pz()),
+         ((TH2D *)(fEfficiencyList->At(12)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                 particle->Py(),
+                                                                                 particle->Pz()),
                                                    particle->Pt());
        if(label <= stack->GetNprimary()) {
-         if(fAnalysisEtaMode)
+         if(fProtonAnalysisBase->GetEtaMode())
            ((TH2D *)(fEfficiencyList->At(7)))->Fill(particle->Eta(),
                                                     particle->Pt());
          else
-           ((TH2D *)(fEfficiencyList->At(7)))->Fill(Rapidity(particle->Px(),
-                                                             particle->Py(),
-                                                             particle->Pz()),
+           ((TH2D *)(fEfficiencyList->At(7)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                  particle->Py(),
+                                                                                  particle->Pz()),
                                                     particle->Pt());
        }//primaries
        if(label > stack->GetNprimary()) {
@@ -3818,67 +4148,27 @@ void AliProtonQAAnalysis::RunEfficiencyAnalysis(AliStack *stack,
          if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
          
          if((particle->GetUniqueID() == 4)&&(TMath::Abs(motherPDGCode) == 3122)) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(9)))->Fill(particle->Eta(),
                                                       particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(9)))->Fill(Rapidity(particle->Px(),
-                                                               particle->Py(),
-                                                               particle->Pz()),
+             ((TH2D *)(fEfficiencyList->At(9)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                    particle->Py(),
+                                                                                    particle->Pz()),
                                                       particle->Pt());
          }//weak decays
          if((particle->GetUniqueID() == 13)) {
-           if(fAnalysisEtaMode)
+           if(fProtonAnalysisBase->GetEtaMode())
              ((TH2D *)(fEfficiencyList->At(11)))->Fill(particle->Eta(),
                                                        particle->Pt());
            else
-             ((TH2D *)(fEfficiencyList->At(11)))->Fill(Rapidity(particle->Px(),
-                                                                particle->Py(),
-                                                                particle->Pz()),
+             ((TH2D *)(fEfficiencyList->At(11)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                                     particle->Py(),
+                                                                                     particle->Pz()),
                                                        particle->Pt());
          }//hadronic interactions
        }//secondaries
       }//initial antiprotons
-      
-      //pid
-      track->GetESDpid(probability);
-      Double_t rcc = 0.0;
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-       rcc += probability[i]*GetParticleFraction(i,P);
-      if(rcc == 0.0) continue;
-      Double_t w[5];
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-       w[i] = probability[i]*GetParticleFraction(i,P)/rcc;
-      Long64_t fParticleType = TMath::LocMax(AliPID::kSPECIES,w);
-      if(fParticleType == 4) {
-       if(fAnalysisEtaMode)
-         ((TH2D *)(fEfficiencyList->At(14)))->Fill(particle->Eta(),
-                                                   particle->Pt());
-       else ((TH2D *)(fEfficiencyList->At(14)))->Fill(Rapidity(particle->Px(),
-                                                               particle->Py(),
-                                                               particle->Pz()),
-                                                      particle->Pt());
-       if(TMath::Abs(pdgcode) == 2212) {
-         if(fAnalysisEtaMode)
-           ((TH2D *)(fEfficiencyList->At(13)))->Fill(particle->Eta(),
-                                                     particle->Pt());
-         else
-           ((TH2D *)(fEfficiencyList->At(13)))->Fill(Rapidity(particle->Px(),
-                                                              particle->Py(),
-                                                              particle->Pz()),
-                                                     particle->Pt());
-       }//properly identified as proton
-       else {
-         if(fAnalysisEtaMode)
-           ((TH2D *)(fEfficiencyList->At(15)))->Fill(particle->Eta(),
-                                                     particle->Pt());
-         else
-           ((TH2D *)(fEfficiencyList->At(15)))->Fill(Rapidity(particle->Px(),
-                                                              particle->Py(),
-                                                              particle->Pz()),
-                                                     particle->Pt());
-       }//contamination
-      }//identified as proton
     }//global tracking
   }//track loop
   
@@ -3900,14 +4190,13 @@ Bool_t AliProtonQAAnalysis::IsLabelUsed(TArrayI labelArray,
 
 //____________________________________________________________________//
 void AliProtonQAAnalysis::RunVertexQA(AliGenEventHeader *header,
-                                     AliStack *stack, 
-                                     AliESDEvent *esd) {
+                                     AliESDEvent *const esd) {
   //Runs the vertex QA
   //MC vertex
   TArrayF primaryVertex(3);
   header->PrimaryVertex(primaryVertex);
 
-  Int_t nPrimaries = stack->GetNprimary();
+  //Int_t nPrimaries = stack->GetNprimary();
   ((TH1F *)(fQAVertexList->At(0)))->Fill(primaryVertex[2]);
 
   //TPC vertex
@@ -3990,35 +4279,36 @@ void AliProtonQAAnalysis::RunQAAnalysis(AliStack *stack,
 
     if(TMath::Abs(particle->Eta()) > 1.0) continue;//acceptance
     if((particle->Pt() > fMaxPt)||(particle->Pt() < fMinPt)) continue;
-    if(fAnalysisEtaMode) {
+    if(fProtonAnalysisBase->GetEtaMode()) {
       if((particle->Eta() > fMaxY)||(particle->Eta() < fMinY)) continue;
     }
     else {
-      if((Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
+      if((fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
     }
     Int_t pdgcode = particle->GetPdgCode();
     if(pdgcode == 2212) {
-      if(fAnalysisEtaMode)
+      if(fProtonAnalysisBase->GetEtaMode())
        ((TH2D *)(fQA2DList->At(8)))->Fill(particle->Eta(),
                                           particle->Pt());
       else
-       ((TH2D *)(fQA2DList->At(8)))->Fill(Rapidity(particle->Px(),
-                                                   particle->Py(),
-                                                   particle->Pz()),
+       ((TH2D *)(fQA2DList->At(8)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                        particle->Py(),
+                                                                        particle->Pz()),
                                           particle->Pt());
     }
     if(pdgcode == -2212) {
-      if(fAnalysisEtaMode)
+      if(fProtonAnalysisBase->GetEtaMode())
        ((TH2D *)(fQA2DList->At(9)))->Fill(particle->Eta(),
                                           particle->Pt());
       else
-       ((TH2D *)(fQA2DList->At(9)))->Fill(Rapidity(particle->Px(),
-                                                   particle->Py(),
-                                                   particle->Pz()),
+       ((TH2D *)(fQA2DList->At(9)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
+                                                                        particle->Py(),
+                                                                        particle->Pz()),
                                           particle->Pt());
     }
   }//MC loop
-  
+
+  Double_t dca[2] = {0.0,0.0}, cov[3] = {0.0,0.0,0.0};
   //ESD track loop
   Int_t nGoodTracks = esd->GetNumberOfTracks();
   TArrayI labelArray(nGoodTracks);
@@ -4031,7 +4321,8 @@ void AliProtonQAAnalysis::RunQAAnalysis(AliStack *stack,
     if(IsLabelUsed(labelArray,label)) continue;
     labelArray.AddAt(label,labelCounter);
     labelCounter += 1;
-    
+    if(label > stack->GetNtrack()) continue;
+
     TParticle *particle = stack->Particle(label);
     if(!particle) continue;
     if(TMath::Abs(particle->Eta()) > 1.0) continue;//acceptance
@@ -4039,21 +4330,21 @@ void AliProtonQAAnalysis::RunQAAnalysis(AliStack *stack,
     AliESDtrack trackTPC;
     
     //in case it's a TPC only track relate it to the proper vertex
-    if((fUseTPCOnly)&&(!fUseHybridTPC)) {
-      Float_t p[2],cov[3];
-      track->GetImpactParametersTPC(p,cov);
-      if (p[0]==0 && p[1]==0)  
+    //if((fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kTPC)&&(!fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kHybrid)) {
+      //if((fUseTPCOnly)&&(!fUseHybridTPC)) {
+      /*track->GetImpactParametersTPC(dca,cov);
+      if (dca[0]==0 && dca[1]==0)  
        track->RelateToVertexTPC(((AliESDEvent*)esd)->GetPrimaryVertexTPC(),esd->GetMagneticField(),kVeryBig);
       if (!track->FillTPCOnlyTrack(trackTPC)) {
        continue;
       }
-      track = &trackTPC ;
-    }
+      track = &trackTPC ;*/
+    //}
     
-    Double_t Pt = 0.0, P = 0.0;
-    Double_t probability[5];
-    Float_t dcaXY = 0.0, dcaZ = 0.0;
-    Double_t nSigmaToVertex = GetSigmaToVertex(track);
+    Double_t gPt = 0.0, gP = 0.0;
+    //Double_t probability[5];
+    //Float_t dcaXY = 0.0, dcaZ = 0.0;
+    Double_t nSigmaToVertex = fProtonAnalysisBase->GetSigmaToVertex(track);
     Int_t  fIdxInt[200];
     Int_t nClustersITS = track->GetITSclusters(fIdxInt);
     Int_t nClustersTPC = track->GetTPCclusters(fIdxInt);
@@ -4067,212 +4358,271 @@ void AliProtonQAAnalysis::RunQAAnalysis(AliStack *stack,
     Double_t chi2ConstrainVertex = TMath::Log(track->GetConstrainedChi2());    
     Double_t extCov[15];
     track->GetExternalCovariance(extCov);
-    
+    Int_t npointsTPCdEdx = track->GetTPCsignalN();
+
     //TPC only
-    if(fUseTPCOnly) {
+    if((fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kTPC)||(fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kHybrid)) {
       AliExternalTrackParam *tpcTrack = (AliExternalTrackParam *)track->GetTPCInnerParam();
       if(!tpcTrack) continue;
-      Pt = tpcTrack->Pt();
-      P = tpcTrack->P();
-      if(fUseHybridTPC) track->GetImpactParameters(dcaXY,dcaZ);
-      else track->GetImpactParametersTPC(dcaXY,dcaZ);
-      
+      gPt = tpcTrack->Pt();
+      gP = tpcTrack->P();
+      /*if(fProtonAnalysisBase->GetAnalysisMode()==AliProtonAnalysisBase::kHybrid)
+       track->GetImpactParameters(dcaXY,dcaZ);
+       else track->GetImpactParametersTPC(dcaXY,dcaZ);*/
+      tpcTrack->PropagateToDCA(vertex,
+                               esd->GetMagneticField(),
+                               100.,dca,cov);
+
       //pid
-      track->GetTPCpid(probability);
-      Double_t rcc = 0.0;
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-       rcc += probability[i]*GetParticleFraction(i,P);
-      if(rcc == 0.0) continue;
-      Double_t w[5];
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-       w[i] = probability[i]*GetParticleFraction(i,P)/rcc;
-      Long64_t fParticleType = TMath::LocMax(AliPID::kSPECIES,w);
-      if(fParticleType == 4) {
-       if(!IsInPhaseSpace(track)) continue; //track outside the analyzed y-Pt
+      if(fProtonAnalysisBase->IsProton(track)) {
+       if(!fProtonAnalysisBase->IsInPhaseSpace(track)) continue; //track outside the analyzed y-Pt
 
        FillQA(stack,esd,vertex,track);
-       if(IsAccepted(esd,vertex,track)) {
-         if(label <= stack->GetNprimary()) {
-           if(track->Charge() > 0) {
-             for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
-               if(track->HasPointOnITSLayer(iLayer))
-                 ((TH1F *)(fAcceptedCutList->At(0)))->Fill(iLayer+1);
-             }
-             ((TH1F *)(fAcceptedCutList->At(4)))->Fill(nClustersITS);
-             ((TH1F *)(fAcceptedCutList->At(8)))->Fill(chi2PerClusterITS);
-             ((TH1F *)(fAcceptedCutList->At(12)))->Fill(chi2ConstrainVertex);
-             ((TH1F *)(fAcceptedCutList->At(16)))->Fill(nClustersTPC);
-             ((TH1F *)(fAcceptedCutList->At(20)))->Fill(chi2PerClusterTPC);
-             ((TH1F *)(fAcceptedCutList->At(24)))->Fill(extCov[0]);
-             ((TH1F *)(fAcceptedCutList->At(28)))->Fill(extCov[2]);
-             ((TH1F *)(fAcceptedCutList->At(32)))->Fill(extCov[5]);
-             ((TH1F *)(fAcceptedCutList->At(36)))->Fill(extCov[9]);
-             ((TH1F *)(fAcceptedCutList->At(40)))->Fill(extCov[14]);
-             ((TH3D *)(fAcceptedCutList->At(44)))->Fill(tpcTrack->Eta(),
-                                                        tpcTrack->Phi()*180./TMath::Pi(),
-                                                        nClustersTPC);
-             
-             ((TH1F *)(fAcceptedDCAList->At(0)))->Fill(TMath::Abs(dcaXY));
-             ((TH1F *)(fAcceptedDCAList->At(4)))->Fill(TMath::Abs(dcaZ));
-             ((TH1F *)(fAcceptedDCAList->At(8)))->Fill(nSigmaToVertex);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(0)))->Fill(tpcTrack->Eta(),Pt);
-             else
-               ((TH2D *)(fQA2DList->At(0)))->Fill(Rapidity(tpcTrack->Px(),
-                                                           tpcTrack->Py(),
-                                                           tpcTrack->Pz()),
-                                                  Pt);
-           }//accepted primary protons
-           else if(track->Charge() < 0) {
-             for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
-               if(track->HasPointOnITSLayer(iLayer))
-                 ((TH1F *)(fAcceptedCutList->At(1)))->Fill(iLayer+1);
-             }
-             ((TH1F *)(fAcceptedCutList->At(5)))->Fill(nClustersITS);
-             ((TH1F *)(fAcceptedCutList->At(9)))->Fill(chi2PerClusterITS);
-             ((TH1F *)(fAcceptedCutList->At(13)))->Fill(chi2ConstrainVertex);
-             ((TH1F *)(fAcceptedCutList->At(17)))->Fill(nClustersTPC);
-             ((TH1F *)(fAcceptedCutList->At(21)))->Fill(chi2PerClusterTPC);
-             ((TH1F *)(fAcceptedCutList->At(25)))->Fill(extCov[0]);
-             ((TH1F *)(fAcceptedCutList->At(29)))->Fill(extCov[2]);
-             ((TH1F *)(fAcceptedCutList->At(33)))->Fill(extCov[5]);
-             ((TH1F *)(fAcceptedCutList->At(37)))->Fill(extCov[9]);
-             ((TH1F *)(fAcceptedCutList->At(41)))->Fill(extCov[14]);
-             ((TH3D *)(fAcceptedCutList->At(45)))->Fill(tpcTrack->Eta(),
-                                                        tpcTrack->Phi()*180./TMath::Pi(),
-                                                        nClustersTPC);
-             
-             ((TH1F *)(fAcceptedDCAList->At(1)))->Fill(TMath::Abs(dcaXY));
-             ((TH1F *)(fAcceptedDCAList->At(5)))->Fill(TMath::Abs(dcaZ));
-             ((TH1F *)(fAcceptedDCAList->At(9)))->Fill(nSigmaToVertex);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(4)))->Fill(tpcTrack->Eta(),Pt);
-             else
-               ((TH2D *)(fQA2DList->At(4)))->Fill(Rapidity(tpcTrack->Px(),
-                                                           tpcTrack->Py(),
-                                                           tpcTrack->Pz()),
-                                                  Pt);
-           }//accepted primary antiprotons
-         }//accepted primary particles
-         else if(label > stack->GetNprimary()) {
-           Int_t lPartMother = -1;
-           Int_t motherPDGCode = -1;
-           if(particle) {
-             lPartMother = particle->GetFirstMother();
-             TParticle *motherParticle = stack->Particle(lPartMother);
-             if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
-           }
-           
-           if(fMCProcessIdFlag)
-             if(particle->GetUniqueID() != fMCProcessId) continue;
-           if(fMotherParticlePDGCodeFlag)
-             if(TMath::Abs(motherPDGCode) != fMotherParticlePDGCode) continue;
-           
-           if(track->Charge() > 0) {
-             for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
-               if(track->HasPointOnITSLayer(iLayer))
-                 ((TH1F *)(fAcceptedCutList->At(2)))->Fill(iLayer+1);
+       if(fProtonAnalysisBase->IsPrimary(esd,vertex,track)) {
+         if(fProtonAnalysisBase->IsAccepted(track)) {
+           if(label <= stack->GetNprimary()) {
+             if(track->Charge() > 0) {
+               for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
+                 if(track->HasPointOnITSLayer(iLayer))
+                   ((TH1F *)(fAcceptedCutList->At(0)))->Fill(iLayer+1);
+               }
+               ((TH1F *)(fAcceptedCutList->At(4)))->Fill(nClustersITS);
+               ((TH1F *)(fAcceptedCutList->At(8)))->Fill(chi2PerClusterITS);
+               ((TH1F *)(fAcceptedCutList->At(12)))->Fill(chi2ConstrainVertex);
+               ((TH1F *)(fAcceptedCutList->At(16)))->Fill(nClustersTPC);
+               ((TH1F *)(fAcceptedCutList->At(20)))->Fill(chi2PerClusterTPC);
+               ((TH1F *)(fAcceptedCutList->At(24)))->Fill(extCov[0]);
+               ((TH1F *)(fAcceptedCutList->At(28)))->Fill(extCov[2]);
+               ((TH1F *)(fAcceptedCutList->At(32)))->Fill(extCov[5]);
+               ((TH1F *)(fAcceptedCutList->At(36)))->Fill(extCov[9]);
+               ((TH1F *)(fAcceptedCutList->At(40)))->Fill(extCov[14]);
+               ((TH3D *)(fAcceptedCutList->At(44)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          nClustersTPC);
+               ((TH3D *)(fAcceptedCutList->At(48)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          chi2PerClusterTPC);
+               ((TH3D *)(fAcceptedCutList->At(52)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          npointsTPCdEdx);
+               ((TH1D *)(fAcceptedCutList->At(56)))->Fill(npointsTPCdEdx);
+               
+               ((TH1F *)(fAcceptedDCAList->At(0)))->Fill(TMath::Abs(dca[0]));
+               ((TH1F *)(fAcceptedDCAList->At(4)))->Fill(TMath::Abs(dca[1]));
+               ((TH1F *)(fAcceptedDCAList->At(8)))->Fill(nSigmaToVertex);
+               ((TH3F *)(fAcceptedDCAList->At(12)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[0]));
+               ((TH3F *)(fAcceptedDCAList->At(18)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[1]));
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH2D *)(fQA2DList->At(0)))->Fill(tpcTrack->Eta(),gPt);
+               else
+                 ((TH2D *)(fQA2DList->At(0)))->Fill(fProtonAnalysisBase->Rapidity(tpcTrack->Px(),
+                                                                                  tpcTrack->Py(),
+                                                                                  tpcTrack->Pz()),
+                                                    gPt);
+             }//accepted primary protons
+             else if(track->Charge() < 0) {
+               for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
+                 if(track->HasPointOnITSLayer(iLayer))
+                   ((TH1F *)(fAcceptedCutList->At(1)))->Fill(iLayer+1);
+               }
+               ((TH1F *)(fAcceptedCutList->At(5)))->Fill(nClustersITS);
+               ((TH1F *)(fAcceptedCutList->At(9)))->Fill(chi2PerClusterITS);
+               ((TH1F *)(fAcceptedCutList->At(13)))->Fill(chi2ConstrainVertex);
+               ((TH1F *)(fAcceptedCutList->At(17)))->Fill(nClustersTPC);
+               ((TH1F *)(fAcceptedCutList->At(21)))->Fill(chi2PerClusterTPC);
+               ((TH1F *)(fAcceptedCutList->At(25)))->Fill(extCov[0]);
+               ((TH1F *)(fAcceptedCutList->At(29)))->Fill(extCov[2]);
+               ((TH1F *)(fAcceptedCutList->At(33)))->Fill(extCov[5]);
+               ((TH1F *)(fAcceptedCutList->At(37)))->Fill(extCov[9]);
+               ((TH1F *)(fAcceptedCutList->At(41)))->Fill(extCov[14]);
+               ((TH3D *)(fAcceptedCutList->At(45)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          nClustersTPC);
+               ((TH3D *)(fAcceptedCutList->At(49)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          chi2PerClusterTPC);
+               ((TH3D *)(fAcceptedCutList->At(53)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          npointsTPCdEdx);
+               ((TH1D *)(fAcceptedCutList->At(57)))->Fill(npointsTPCdEdx);
+               
+               ((TH1F *)(fAcceptedDCAList->At(1)))->Fill(TMath::Abs(dca[0]));
+               ((TH1F *)(fAcceptedDCAList->At(5)))->Fill(TMath::Abs(dca[1]));
+               ((TH1F *)(fAcceptedDCAList->At(9)))->Fill(nSigmaToVertex);
+               ((TH3F *)(fAcceptedDCAList->At(13)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[0]));
+               ((TH3F *)(fAcceptedDCAList->At(19)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[1]));
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH2D *)(fQA2DList->At(4)))->Fill(tpcTrack->Eta(),gPt);
+               else
+                 ((TH2D *)(fQA2DList->At(4)))->Fill(fProtonAnalysisBase->Rapidity(tpcTrack->Px(),
+                                                                                  tpcTrack->Py(),
+                                                                                  tpcTrack->Pz()),
+                                                    gPt);
+             }//accepted primary antiprotons
+           }//accepted primary particles
+           else if(label > stack->GetNprimary()) {
+             Int_t lPartMother = -1;
+             Int_t motherPDGCode = -1;
+             if(particle) {
+               lPartMother = particle->GetFirstMother();
+               TParticle *motherParticle = stack->Particle(lPartMother);
+               if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
              }
-             ((TH1F *)(fAcceptedCutList->At(6)))->Fill(nClustersITS);
-             ((TH1F *)(fAcceptedCutList->At(10)))->Fill(chi2PerClusterITS);
-             ((TH1F *)(fAcceptedCutList->At(14)))->Fill(chi2ConstrainVertex);
-             ((TH1F *)(fAcceptedCutList->At(18)))->Fill(nClustersTPC);
-             ((TH1F *)(fAcceptedCutList->At(22)))->Fill(chi2PerClusterTPC);
-             ((TH1F *)(fAcceptedCutList->At(26)))->Fill(extCov[0]);
-             ((TH1F *)(fAcceptedCutList->At(30)))->Fill(extCov[2]);
-             ((TH1F *)(fAcceptedCutList->At(34)))->Fill(extCov[5]);
-             ((TH1F *)(fAcceptedCutList->At(38)))->Fill(extCov[9]);
-             ((TH1F *)(fAcceptedCutList->At(42)))->Fill(extCov[14]);
-             ((TH3D *)(fAcceptedCutList->At(46)))->Fill(tpcTrack->Eta(),
-                                                        tpcTrack->Phi()*180./TMath::Pi(),
-                                                        nClustersTPC);
              
-             ((TH1F *)(fAcceptedDCAList->At(2)))->Fill(TMath::Abs(dcaXY));
-             ((TH1F *)(fAcceptedDCAList->At(6)))->Fill(TMath::Abs(dcaZ));
-             ((TH1F *)(fAcceptedDCAList->At(10)))->Fill(nSigmaToVertex);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(2)))->Fill(tpcTrack->Eta(),Pt);
-             else
-               ((TH2D *)(fQA2DList->At(2)))->Fill(Rapidity(tpcTrack->Px(),
-                                                           tpcTrack->Py(),
-                                                           tpcTrack->Pz()),
-                                                  Pt);
-             if(fAnalysisEtaMode)
-             ((TH3F *)(fQA2DList->At(10)))->Fill(tpcTrack->Eta(),Pt,
-                                                 ConvertPDGToInt(motherPDGCode));
-             else
-               ((TH3F *)(fQA2DList->At(10)))->Fill(Rapidity(tpcTrack->Px(),
-                                                            tpcTrack->Py(),
-                                                            tpcTrack->Pz()),
-                                                   Pt,
-                                                   ConvertPDGToInt(motherPDGCode));
-           }//accepted secondary protons
-           else if(track->Charge() < 0) {
-             for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
-               if(track->HasPointOnITSLayer(iLayer))
-                 ((TH1F *)(fAcceptedCutList->At(3)))->Fill(iLayer+1);
-             }
-             ((TH1F *)(fAcceptedCutList->At(7)))->Fill(nClustersITS);
-             ((TH1F *)(fAcceptedCutList->At(11)))->Fill(chi2PerClusterITS);
-             ((TH1F *)(fAcceptedCutList->At(15)))->Fill(chi2ConstrainVertex);
-             ((TH1F *)(fAcceptedCutList->At(19)))->Fill(nClustersTPC);
-             ((TH1F *)(fAcceptedCutList->At(23)))->Fill(chi2PerClusterTPC);
-             ((TH1F *)(fAcceptedCutList->At(27)))->Fill(extCov[0]);
-             ((TH1F *)(fAcceptedCutList->At(31)))->Fill(extCov[2]);
-             ((TH1F *)(fAcceptedCutList->At(35)))->Fill(extCov[5]);
-             ((TH1F *)(fAcceptedCutList->At(39)))->Fill(extCov[9]);
-             ((TH1F *)(fAcceptedCutList->At(43)))->Fill(extCov[14]);
-             ((TH3D *)(fAcceptedCutList->At(47)))->Fill(tpcTrack->Eta(),
-                                                        tpcTrack->Phi()*180./TMath::Pi(),
-                                                        nClustersTPC);
+             if(fMCProcessIdFlag)
+               if(particle->GetUniqueID() != fMCProcessId) continue;
+             if(fMotherParticlePDGCodeFlag)
+               if(TMath::Abs(motherPDGCode) != fMotherParticlePDGCode) continue;
              
-             ((TH1F *)(fAcceptedDCAList->At(3)))->Fill(TMath::Abs(dcaXY));
-             ((TH1F *)(fAcceptedDCAList->At(7)))->Fill(TMath::Abs(dcaZ));
-             ((TH1F *)(fAcceptedDCAList->At(11)))->Fill(nSigmaToVertex);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(6)))->Fill(tpcTrack->Eta(),Pt);
-             else
-               ((TH2D *)(fQA2DList->At(6)))->Fill(Rapidity(tpcTrack->Px(),
-                                                           tpcTrack->Py(),
-                                                           tpcTrack->Pz()),
-                                                  Pt);
-             if(fAnalysisEtaMode)
-               ((TH3F *)(fQA2DList->At(11)))->Fill(tpcTrack->Eta(),Pt,
-                                                   ConvertPDGToInt(motherPDGCode));
-             else
-               ((TH3F *)(fQA2DList->At(11)))->Fill(Rapidity(tpcTrack->Px(),
-                                                            tpcTrack->Py(),
-                                                            tpcTrack->Pz()),
-                                                   Pt,
-                                                   ConvertPDGToInt(motherPDGCode));
-           }//accepted secondary antiprotons
-         }//accepted secondary particles
-       }//accepted - track cuts
+             if(track->Charge() > 0) {
+               for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
+                 if(track->HasPointOnITSLayer(iLayer))
+                   ((TH1F *)(fAcceptedCutList->At(2)))->Fill(iLayer+1);
+               }
+               ((TH1F *)(fAcceptedCutList->At(6)))->Fill(nClustersITS);
+               ((TH1F *)(fAcceptedCutList->At(10)))->Fill(chi2PerClusterITS);
+               ((TH1F *)(fAcceptedCutList->At(14)))->Fill(chi2ConstrainVertex);
+               ((TH1F *)(fAcceptedCutList->At(18)))->Fill(nClustersTPC);
+               ((TH1F *)(fAcceptedCutList->At(22)))->Fill(chi2PerClusterTPC);
+               ((TH1F *)(fAcceptedCutList->At(26)))->Fill(extCov[0]);
+               ((TH1F *)(fAcceptedCutList->At(30)))->Fill(extCov[2]);
+               ((TH1F *)(fAcceptedCutList->At(34)))->Fill(extCov[5]);
+               ((TH1F *)(fAcceptedCutList->At(38)))->Fill(extCov[9]);
+               ((TH1F *)(fAcceptedCutList->At(42)))->Fill(extCov[14]);
+               ((TH3D *)(fAcceptedCutList->At(46)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          nClustersTPC);
+               ((TH3D *)(fAcceptedCutList->At(50)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          chi2PerClusterTPC);
+               ((TH3D *)(fAcceptedCutList->At(54)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          npointsTPCdEdx);
+               ((TH1D *)(fAcceptedCutList->At(58)))->Fill(npointsTPCdEdx);
+               
+               ((TH1F *)(fAcceptedDCAList->At(2)))->Fill(TMath::Abs(dca[0]));
+               ((TH1F *)(fAcceptedDCAList->At(6)))->Fill(TMath::Abs(dca[1]));
+               ((TH1F *)(fAcceptedDCAList->At(10)))->Fill(nSigmaToVertex);
+               if(particle->GetUniqueID() == 4) {
+                 ((TH3F *)(fAcceptedDCAList->At(14)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[0]));
+                 ((TH3F *)(fAcceptedDCAList->At(20)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[1]));
+               }
+               if(particle->GetUniqueID() == 13) {
+                 ((TH3F *)(fAcceptedDCAList->At(16)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[0]));
+                 ((TH3F *)(fAcceptedDCAList->At(22)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[1]));
+               }
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH2D *)(fQA2DList->At(2)))->Fill(tpcTrack->Eta(),gPt);
+               else
+                 ((TH2D *)(fQA2DList->At(2)))->Fill(fProtonAnalysisBase->Rapidity(tpcTrack->Px(),
+                                                                                  tpcTrack->Py(),
+                                                                                  tpcTrack->Pz()),
+                                                    gPt);
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH3F *)(fQA2DList->At(10)))->Fill(tpcTrack->Eta(),gPt,
+                                                     ConvertPDGToInt(motherPDGCode));
+               else
+                 ((TH3F *)(fQA2DList->At(10)))->Fill(fProtonAnalysisBase->Rapidity(tpcTrack->Px(),
+                                                                                   tpcTrack->Py(),
+                                                                                   tpcTrack->Pz()),
+                                                     gPt,
+                                                     ConvertPDGToInt(motherPDGCode));
+             }//accepted secondary protons
+             else if(track->Charge() < 0) {
+               for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
+                 if(track->HasPointOnITSLayer(iLayer))
+                   ((TH1F *)(fAcceptedCutList->At(3)))->Fill(iLayer+1);
+               }
+               ((TH1F *)(fAcceptedCutList->At(7)))->Fill(nClustersITS);
+               ((TH1F *)(fAcceptedCutList->At(11)))->Fill(chi2PerClusterITS);
+               ((TH1F *)(fAcceptedCutList->At(15)))->Fill(chi2ConstrainVertex);
+               ((TH1F *)(fAcceptedCutList->At(19)))->Fill(nClustersTPC);
+               ((TH1F *)(fAcceptedCutList->At(23)))->Fill(chi2PerClusterTPC);
+               ((TH1F *)(fAcceptedCutList->At(27)))->Fill(extCov[0]);
+               ((TH1F *)(fAcceptedCutList->At(31)))->Fill(extCov[2]);
+               ((TH1F *)(fAcceptedCutList->At(35)))->Fill(extCov[5]);
+               ((TH1F *)(fAcceptedCutList->At(39)))->Fill(extCov[9]);
+               ((TH1F *)(fAcceptedCutList->At(43)))->Fill(extCov[14]);
+               ((TH3D *)(fAcceptedCutList->At(47)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          nClustersTPC);
+               ((TH3D *)(fAcceptedCutList->At(51)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          chi2PerClusterTPC);
+               ((TH3D *)(fAcceptedCutList->At(55)))->Fill(tpcTrack->Eta(),
+                                                          tpcTrack->Phi()*180./TMath::Pi(),
+                                                          npointsTPCdEdx);
+               ((TH1F *)(fAcceptedCutList->At(59)))->Fill(npointsTPCdEdx);
+               
+               ((TH1F *)(fAcceptedDCAList->At(3)))->Fill(TMath::Abs(dca[0]));
+               ((TH1F *)(fAcceptedDCAList->At(7)))->Fill(TMath::Abs(dca[1]));
+               ((TH1F *)(fAcceptedDCAList->At(11)))->Fill(nSigmaToVertex);
+               if(particle->GetUniqueID() == 4) {
+                 ((TH3F *)(fAcceptedDCAList->At(15)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[0]));
+                 ((TH3F *)(fAcceptedDCAList->At(21)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[1]));
+               }
+               if(particle->GetUniqueID() == 13) {
+                 ((TH3F *)(fAcceptedDCAList->At(17)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[0]));
+                 ((TH3F *)(fAcceptedDCAList->At(23)))->Fill(tpcTrack->Eta(),gPt,TMath::Abs(dca[1]));
+               }
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH2D *)(fQA2DList->At(6)))->Fill(tpcTrack->Eta(),gPt);
+               else
+                 ((TH2D *)(fQA2DList->At(6)))->Fill(fProtonAnalysisBase->Rapidity(tpcTrack->Px(),
+                                                                                  tpcTrack->Py(),
+                                                                                  tpcTrack->Pz()),
+                                                    gPt);
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH3F *)(fQA2DList->At(11)))->Fill(tpcTrack->Eta(),gPt,
+                                                     ConvertPDGToInt(motherPDGCode));
+               else
+                 ((TH3F *)(fQA2DList->At(11)))->Fill(fProtonAnalysisBase->Rapidity(tpcTrack->Px(),
+                                                                                   tpcTrack->Py(),
+                                                                                   tpcTrack->Pz()),
+                                                     gPt,
+                                                     ConvertPDGToInt(motherPDGCode));
+             }//accepted secondary antiprotons
+           }//accepted secondary particles
+         }//accepted - track cuts
+       }//primary-like cut
        else {
          if(label <= stack->GetNprimary()) {
            if(track->Charge() > 0) {
              ((TH3D *)(fRejectedCutList->At(0)))->Fill(tpcTrack->Eta(),
                                                        tpcTrack->Phi()*180./TMath::Pi(),
                                                        nClustersTPC);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(1)))->Fill(tpcTrack->Eta(),Pt);
+             ((TH3D *)(fRejectedCutList->At(4)))->Fill(tpcTrack->Eta(),
+                                                       tpcTrack->Phi()*180./TMath::Pi(),
+                                                       chi2PerClusterTPC);
+             ((TH3D *)(fRejectedCutList->At(8)))->Fill(tpcTrack->Eta(),
+                                                       tpcTrack->Phi()*180./TMath::Pi(),
+                                                       npointsTPCdEdx);
+             
+             if(fProtonAnalysisBase->GetEtaMode())
+               ((TH2D *)(fQA2DList->At(1)))->Fill(tpcTrack->Eta(),gPt);
              else
-               ((TH2D *)(fQA2DList->At(1)))->Fill(Rapidity(tpcTrack->Px(),
-                                                           tpcTrack->Py(),
-                                                           tpcTrack->Pz()),
-                                                  Pt);
+               ((TH2D *)(fQA2DList->At(1)))->Fill(fProtonAnalysisBase->Rapidity(tpcTrack->Px(),
+                                                                                tpcTrack->Py(),
+                                                                                tpcTrack->Pz()),
+                                                  gPt);
            }
            else if(track->Charge() < 0) {
              ((TH3D *)(fRejectedCutList->At(1)))->Fill(tpcTrack->Eta(),
                                                        tpcTrack->Phi()*180./TMath::Pi(),
                                                        nClustersTPC);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(5)))->Fill(tpcTrack->Eta(),Pt);
+             ((TH3D *)(fRejectedCutList->At(5)))->Fill(tpcTrack->Eta(),
+                                                       tpcTrack->Phi()*180./TMath::Pi(),
+                                                       chi2PerClusterTPC);
+             ((TH3D *)(fRejectedCutList->At(9)))->Fill(tpcTrack->Eta(),
+                                                       tpcTrack->Phi()*180./TMath::Pi(),
+                                                       npointsTPCdEdx);
+             if(fProtonAnalysisBase->GetEtaMode())
+               ((TH2D *)(fQA2DList->At(5)))->Fill(tpcTrack->Eta(),gPt);
              else
-               ((TH2D *)(fQA2DList->At(5)))->Fill(Rapidity(tpcTrack->Px(),
+               ((TH2D *)(fQA2DList->At(5)))->Fill(fProtonAnalysisBase->Rapidity(tpcTrack->Px(),
                                                            tpcTrack->Py(),
                                                            tpcTrack->Pz()),
-                                                  Pt);
+                                                  gPt);
            }
          }//rejected primary particles
          else if(label > stack->GetNprimary()) {
@@ -4280,232 +4630,302 @@ void AliProtonQAAnalysis::RunQAAnalysis(AliStack *stack,
              ((TH3D *)(fRejectedCutList->At(2)))->Fill(tpcTrack->Eta(),
                                                        tpcTrack->Phi()*180./TMath::Pi(),
                                                        nClustersTPC);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(3)))->Fill(tpcTrack->Eta(),Pt);
+             ((TH3D *)(fRejectedCutList->At(6)))->Fill(tpcTrack->Eta(),
+                                                       tpcTrack->Phi()*180./TMath::Pi(),
+                                                       chi2PerClusterTPC);
+             ((TH3D *)(fRejectedCutList->At(10)))->Fill(tpcTrack->Eta(),
+                                                        tpcTrack->Phi()*180./TMath::Pi(),
+                                                        npointsTPCdEdx);
+             if(fProtonAnalysisBase->GetEtaMode())
+               ((TH2D *)(fQA2DList->At(3)))->Fill(tpcTrack->Eta(),gPt);
              else
-               ((TH2D *)(fQA2DList->At(3)))->Fill(Rapidity(tpcTrack->Px(),
+               ((TH2D *)(fQA2DList->At(3)))->Fill(fProtonAnalysisBase->Rapidity(tpcTrack->Px(),
                                                            tpcTrack->Py(),
                                                            tpcTrack->Pz()),
-                                                  Pt);
+                                                  gPt);
            }
            else if(track->Charge() < 0) {
              ((TH3D *)(fRejectedCutList->At(3)))->Fill(tpcTrack->Eta(),
                                                        tpcTrack->Phi()*180./TMath::Pi(),
                                                        nClustersTPC);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(7)))->Fill(tpcTrack->Eta(),Pt);
+             ((TH3D *)(fRejectedCutList->At(7)))->Fill(tpcTrack->Eta(),
+                                                       tpcTrack->Phi()*180./TMath::Pi(),
+                                                       chi2PerClusterTPC);
+             ((TH3D *)(fRejectedCutList->At(11)))->Fill(tpcTrack->Eta(),
+                                                        tpcTrack->Phi()*180./TMath::Pi(),
+                                                        npointsTPCdEdx);
+
+             if(fProtonAnalysisBase->GetEtaMode())
+               ((TH2D *)(fQA2DList->At(7)))->Fill(tpcTrack->Eta(),gPt);
              else
-               ((TH2D *)(fQA2DList->At(7)))->Fill(Rapidity(tpcTrack->Px(),
+               ((TH2D *)(fQA2DList->At(7)))->Fill(fProtonAnalysisBase->Rapidity(tpcTrack->Px(),
                                                            tpcTrack->Py(),
                                                            tpcTrack->Pz()),
-                                                  Pt);
+                                                  gPt);
            }
          }//rejected secondary particles
        }//rejected - track cuts
       }//proton check
     }//TPC only tracks
     //combined tracking
-    else if(!fUseTPCOnly) {
-      Pt = track->Pt();
-      P = track->P();
-      track->GetImpactParameters(dcaXY,dcaZ);
+    else {
+      gPt = track->Pt();
+      gP = track->P();
+      track->PropagateToDCA(vertex,
+                               esd->GetMagneticField(),
+                               100.,dca,cov);
       
       //pid
-      track->GetESDpid(probability);
-      Double_t rcc = 0.0;
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-       rcc += probability[i]*GetParticleFraction(i,P);
-      if(rcc == 0.0) continue;
-      Double_t w[5];
-      for(Int_t i = 0; i < AliPID::kSPECIES; i++)
-       w[i] = probability[i]*GetParticleFraction(i,P)/rcc;
-      Long64_t fParticleType = TMath::LocMax(AliPID::kSPECIES,w);
-      if(fParticleType == 4) {
-       if(!IsInPhaseSpace(track)) continue; //track outside the analyzed y-Pt
+      if(fProtonAnalysisBase->IsProton(track)) {
+       if(!fProtonAnalysisBase->IsInPhaseSpace(track)) continue; //track outside the analyzed y-Pt
 
        FillQA(stack,esd,vertex,track);
-       if(IsAccepted(esd,vertex,track)) {
-         if(label <= stack->GetNprimary()) {
-           if(track->Charge() > 0) {
-             for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
-               if(track->HasPointOnITSLayer(iLayer))
-                 ((TH1F *)(fAcceptedCutList->At(0)))->Fill(iLayer+1);
+       if(fProtonAnalysisBase->IsPrimary(esd,vertex,track)) {
+         if(fProtonAnalysisBase->IsAccepted(track)) {
+           if(label <= stack->GetNprimary()) {
+             if(track->Charge() > 0) {
+               for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
+                 if(track->HasPointOnITSLayer(iLayer))
+                   ((TH1F *)(fAcceptedCutList->At(0)))->Fill(iLayer+1);
+               }
+               ((TH1F *)(fAcceptedCutList->At(4)))->Fill(nClustersITS);
+               ((TH1F *)(fAcceptedCutList->At(8)))->Fill(chi2PerClusterITS);
+               ((TH1F *)(fAcceptedCutList->At(12)))->Fill(chi2ConstrainVertex);
+               ((TH1F *)(fAcceptedCutList->At(16)))->Fill(nClustersTPC);
+               ((TH1F *)(fAcceptedCutList->At(20)))->Fill(chi2PerClusterTPC);
+               ((TH1F *)(fAcceptedCutList->At(24)))->Fill(extCov[0]);
+               ((TH1F *)(fAcceptedCutList->At(28)))->Fill(extCov[2]);
+               ((TH1F *)(fAcceptedCutList->At(32)))->Fill(extCov[5]);
+               ((TH1F *)(fAcceptedCutList->At(36)))->Fill(extCov[9]);
+               ((TH1F *)(fAcceptedCutList->At(40)))->Fill(extCov[14]);
+               ((TH3D *)(fAcceptedCutList->At(44)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          nClustersTPC);
+               ((TH3D *)(fAcceptedCutList->At(48)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          chi2PerClusterTPC);
+               ((TH3D *)(fAcceptedCutList->At(52)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          npointsTPCdEdx);
+               ((TH1F *)(fAcceptedCutList->At(56)))->Fill(npointsTPCdEdx);
+               
+               ((TH1F *)(fAcceptedDCAList->At(0)))->Fill(TMath::Abs(dca[0]));
+               ((TH1F *)(fAcceptedDCAList->At(4)))->Fill(TMath::Abs(dca[1]));
+               ((TH1F *)(fAcceptedDCAList->At(8)))->Fill(nSigmaToVertex);
+               ((TH3F *)(fAcceptedDCAList->At(12)))->Fill(track->Eta(),gPt,TMath::Abs(dca[0]));
+               ((TH3F *)(fAcceptedDCAList->At(18)))->Fill(track->Eta(),gPt,TMath::Abs(dca[0]));
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH2D *)(fQA2DList->At(0)))->Fill(track->Eta(),gPt);
+               else
+                 ((TH2D *)(fQA2DList->At(0)))->Fill(fProtonAnalysisBase->Rapidity(track->Px(),
+                                                                                  track->Py(),
+                                                                                  track->Pz()),
+                                                    gPt);
              }
-             ((TH1F *)(fAcceptedCutList->At(4)))->Fill(nClustersITS);
-             ((TH1F *)(fAcceptedCutList->At(8)))->Fill(chi2PerClusterITS);
-             ((TH1F *)(fAcceptedCutList->At(12)))->Fill(chi2ConstrainVertex);
-             ((TH1F *)(fAcceptedCutList->At(16)))->Fill(nClustersTPC);
-             ((TH1F *)(fAcceptedCutList->At(20)))->Fill(chi2PerClusterTPC);
-             ((TH1F *)(fAcceptedCutList->At(24)))->Fill(extCov[0]);
-             ((TH1F *)(fAcceptedCutList->At(28)))->Fill(extCov[2]);
-             ((TH1F *)(fAcceptedCutList->At(32)))->Fill(extCov[5]);
-             ((TH1F *)(fAcceptedCutList->At(36)))->Fill(extCov[9]);
-             ((TH1F *)(fAcceptedCutList->At(40)))->Fill(extCov[14]);
-             ((TH3D *)(fAcceptedCutList->At(44)))->Fill(track->Eta(),
-                                                        track->Phi()*180./TMath::Pi(),
-                                                        nClustersTPC);
-             
-             ((TH1F *)(fAcceptedDCAList->At(0)))->Fill(TMath::Abs(dcaXY));
-             ((TH1F *)(fAcceptedDCAList->At(4)))->Fill(TMath::Abs(dcaZ));
-             ((TH1F *)(fAcceptedDCAList->At(8)))->Fill(nSigmaToVertex);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(0)))->Fill(track->Eta(),Pt);
-             else
-               ((TH2D *)(fQA2DList->At(0)))->Fill(Rapidity(track->Px(),
-                                                           track->Py(),
-                                                           track->Pz()),
-                                                  Pt);
-           }
-           else if(track->Charge() < 0) {
-             for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
-               if(track->HasPointOnITSLayer(iLayer))
-                 ((TH1F *)(fAcceptedCutList->At(1)))->Fill(iLayer+1);
+             else if(track->Charge() < 0) {
+               for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
+                 if(track->HasPointOnITSLayer(iLayer))
+                   ((TH1F *)(fAcceptedCutList->At(1)))->Fill(iLayer+1);
+               }
+               ((TH1F *)(fAcceptedCutList->At(5)))->Fill(nClustersITS);
+               ((TH1F *)(fAcceptedCutList->At(9)))->Fill(chi2PerClusterITS);
+               ((TH1F *)(fAcceptedCutList->At(13)))->Fill(chi2ConstrainVertex);
+               ((TH1F *)(fAcceptedCutList->At(17)))->Fill(nClustersTPC);
+               ((TH1F *)(fAcceptedCutList->At(21)))->Fill(chi2PerClusterTPC);
+               ((TH1F *)(fAcceptedCutList->At(25)))->Fill(extCov[0]);
+               ((TH1F *)(fAcceptedCutList->At(29)))->Fill(extCov[2]);
+               ((TH1F *)(fAcceptedCutList->At(33)))->Fill(extCov[5]);
+               ((TH1F *)(fAcceptedCutList->At(37)))->Fill(extCov[9]);
+               ((TH1F *)(fAcceptedCutList->At(41)))->Fill(extCov[14]);
+               ((TH3D *)(fAcceptedCutList->At(45)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          nClustersTPC);
+               ((TH3D *)(fAcceptedCutList->At(49)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          chi2PerClusterTPC);
+               ((TH3D *)(fAcceptedCutList->At(53)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          npointsTPCdEdx);
+               ((TH1F *)(fAcceptedCutList->At(57)))->Fill(npointsTPCdEdx);
+               
+               ((TH1F *)(fAcceptedDCAList->At(1)))->Fill(TMath::Abs(dca[0]));
+               ((TH1F *)(fAcceptedDCAList->At(5)))->Fill(TMath::Abs(dca[1]));
+               ((TH1F *)(fAcceptedDCAList->At(9)))->Fill(nSigmaToVertex);
+               ((TH3F *)(fAcceptedDCAList->At(13)))->Fill(track->Eta(),gPt,TMath::Abs(dca[0]));
+               ((TH3F *)(fAcceptedDCAList->At(19)))->Fill(track->Eta(),gPt,TMath::Abs(dca[0]));
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH2D *)(fQA2DList->At(4)))->Fill(track->Eta(),gPt);
+               else
+                 ((TH2D *)(fQA2DList->At(4)))->Fill(fProtonAnalysisBase->Rapidity(track->Px(),
+                                                                                  track->Py(),
+                                                                                  track->Pz()),
+                                                    gPt);
              }
-             ((TH1F *)(fAcceptedCutList->At(5)))->Fill(nClustersITS);
-             ((TH1F *)(fAcceptedCutList->At(9)))->Fill(chi2PerClusterITS);
-             ((TH1F *)(fAcceptedCutList->At(13)))->Fill(chi2ConstrainVertex);
-             ((TH1F *)(fAcceptedCutList->At(17)))->Fill(nClustersTPC);
-             ((TH1F *)(fAcceptedCutList->At(21)))->Fill(chi2PerClusterTPC);
-             ((TH1F *)(fAcceptedCutList->At(25)))->Fill(extCov[0]);
-             ((TH1F *)(fAcceptedCutList->At(29)))->Fill(extCov[2]);
-             ((TH1F *)(fAcceptedCutList->At(33)))->Fill(extCov[5]);
-             ((TH1F *)(fAcceptedCutList->At(37)))->Fill(extCov[9]);
-             ((TH1F *)(fAcceptedCutList->At(41)))->Fill(extCov[14]);
-             ((TH3D *)(fAcceptedCutList->At(45)))->Fill(track->Eta(),
-                                                        track->Phi()*180./TMath::Pi(),
-                                                        nClustersTPC);
-             
-             ((TH1F *)(fAcceptedDCAList->At(1)))->Fill(TMath::Abs(dcaXY));
-             ((TH1F *)(fAcceptedDCAList->At(5)))->Fill(TMath::Abs(dcaZ));
-             ((TH1F *)(fAcceptedDCAList->At(9)))->Fill(nSigmaToVertex);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(4)))->Fill(track->Eta(),Pt);
-             else
-               ((TH2D *)(fQA2DList->At(4)))->Fill(Rapidity(track->Px(),
-                                                           track->Py(),
-                                                           track->Pz()),
-                                                  Pt);
-           }
-         }//primary particles
-         else if(label > stack->GetNprimary()) {
-           Int_t lPartMother = -1;
-           Int_t motherPDGCode = -1;
-           if(particle) {
-             lPartMother = particle->GetFirstMother();
-             TParticle *motherParticle = stack->Particle(lPartMother);
-             if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
-           }
-           
-           if(fMCProcessIdFlag)
-             if(particle->GetUniqueID() != fMCProcessId) continue;
-           if(fMotherParticlePDGCodeFlag)
-             if(TMath::Abs(motherPDGCode) != fMotherParticlePDGCode) continue;
-           
-           if(track->Charge() > 0) {
-             for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
-               if(track->HasPointOnITSLayer(iLayer))
-                 ((TH1F *)(fAcceptedCutList->At(2)))->Fill(iLayer+1);
+           }//primary particles
+           else if(label > stack->GetNprimary()) {
+             Int_t lPartMother = -1;
+             Int_t motherPDGCode = -1;
+             if(particle) {
+               lPartMother = particle->GetFirstMother();
+               TParticle *motherParticle = stack->Particle(lPartMother);
+               if(motherParticle) motherPDGCode = motherParticle->GetPdgCode();
              }
-             ((TH1F *)(fAcceptedCutList->At(6)))->Fill(nClustersITS);
-             ((TH1F *)(fAcceptedCutList->At(10)))->Fill(chi2PerClusterITS);
-             ((TH1F *)(fAcceptedCutList->At(14)))->Fill(chi2ConstrainVertex);
-             ((TH1F *)(fAcceptedCutList->At(18)))->Fill(nClustersTPC);
-             ((TH1F *)(fAcceptedCutList->At(22)))->Fill(chi2PerClusterTPC);
-             ((TH1F *)(fAcceptedCutList->At(26)))->Fill(extCov[0]);
-             ((TH1F *)(fAcceptedCutList->At(30)))->Fill(extCov[2]);
-             ((TH1F *)(fAcceptedCutList->At(34)))->Fill(extCov[5]);
-             ((TH1F *)(fAcceptedCutList->At(38)))->Fill(extCov[9]);
-             ((TH1F *)(fAcceptedCutList->At(42)))->Fill(extCov[14]);
-             ((TH3D *)(fAcceptedCutList->At(46)))->Fill(track->Eta(),
-                                                        track->Phi()*180./TMath::Pi(),
-                                                        nClustersTPC);
              
-             ((TH1F *)(fAcceptedDCAList->At(2)))->Fill(TMath::Abs(dcaXY));
-             ((TH1F *)(fAcceptedDCAList->At(6)))->Fill(TMath::Abs(dcaZ));
-             ((TH1F *)(fAcceptedDCAList->At(10)))->Fill(nSigmaToVertex);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(2)))->Fill(track->Eta(),Pt);
-             else
-               ((TH2D *)(fQA2DList->At(2)))->Fill(Rapidity(track->Px(),
-                                                           track->Py(),
-                                                           track->Pz()),
-                                                  Pt);
-             if(fAnalysisEtaMode)
-               ((TH3F *)(fQA2DList->At(10)))->Fill(track->Eta(),Pt,
-                                                   ConvertPDGToInt(motherPDGCode));
-             else
-               ((TH3F *)(fQA2DList->At(10)))->Fill(Rapidity(track->Px(),
-                                                            track->Py(),
-                                                            track->Pz()),
-                                                   Pt,
-                                                   ConvertPDGToInt(motherPDGCode));
-           }
-           else if(track->Charge() < 0) {
-             for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
-               if(track->HasPointOnITSLayer(iLayer))
-                 ((TH1F *)(fAcceptedCutList->At(3)))->Fill(iLayer+1);
-             }
-             ((TH1F *)(fAcceptedCutList->At(7)))->Fill(nClustersITS);
-             ((TH1F *)(fAcceptedCutList->At(11)))->Fill(chi2PerClusterITS);
-             ((TH1F *)(fAcceptedCutList->At(15)))->Fill(chi2ConstrainVertex);
-             ((TH1F *)(fAcceptedCutList->At(19)))->Fill(nClustersTPC);
-             ((TH1F *)(fAcceptedCutList->At(23)))->Fill(chi2PerClusterTPC);
-             ((TH1F *)(fAcceptedCutList->At(27)))->Fill(extCov[0]);
-             ((TH1F *)(fAcceptedCutList->At(31)))->Fill(extCov[2]);
-             ((TH1F *)(fAcceptedCutList->At(35)))->Fill(extCov[5]);
-             ((TH1F *)(fAcceptedCutList->At(39)))->Fill(extCov[9]);
-             ((TH1F *)(fAcceptedCutList->At(43)))->Fill(extCov[14]);
-             ((TH3D *)(fAcceptedCutList->At(47)))->Fill(track->Eta(),
-                                                        track->Phi()*180./TMath::Pi(),
-                                                        nClustersTPC);
+             if(fMCProcessIdFlag)
+               if(particle->GetUniqueID() != fMCProcessId) continue;
+             if(fMotherParticlePDGCodeFlag)
+               if(TMath::Abs(motherPDGCode) != fMotherParticlePDGCode) continue;
              
-             ((TH1F *)(fAcceptedDCAList->At(3)))->Fill(TMath::Abs(dcaXY));
-             ((TH1F *)(fAcceptedDCAList->At(7)))->Fill(TMath::Abs(dcaZ));
-             ((TH1F *)(fAcceptedDCAList->At(11)))->Fill(nSigmaToVertex);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(6)))->Fill(track->Eta(),Pt);
-             else
-               ((TH2D *)(fQA2DList->At(6)))->Fill(Rapidity(track->Px(),
-                                                           track->Py(),
-                                                           track->Pz()),
-                                                  Pt);
-             if(fAnalysisEtaMode)
-               ((TH3F *)(fQA2DList->At(11)))->Fill(track->Eta(),Pt,
-                                                   ConvertPDGToInt(motherPDGCode));
-             else
-               ((TH3F *)(fQA2DList->At(11)))->Fill(Rapidity(track->Px(),
-                                                            track->Py(),
-                                                            track->Pz()),
-                                                   Pt,
-                                                   ConvertPDGToInt(motherPDGCode));
-           }
-         }//secondary particles
-       }//accepted - track cuts
-       else if(!IsAccepted(esd,vertex,track)) {
+             if(track->Charge() > 0) {
+               for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
+                 if(track->HasPointOnITSLayer(iLayer))
+                   ((TH1F *)(fAcceptedCutList->At(2)))->Fill(iLayer+1);
+               }
+               ((TH1F *)(fAcceptedCutList->At(6)))->Fill(nClustersITS);
+               ((TH1F *)(fAcceptedCutList->At(10)))->Fill(chi2PerClusterITS);
+               ((TH1F *)(fAcceptedCutList->At(14)))->Fill(chi2ConstrainVertex);
+               ((TH1F *)(fAcceptedCutList->At(18)))->Fill(nClustersTPC);
+               ((TH1F *)(fAcceptedCutList->At(22)))->Fill(chi2PerClusterTPC);
+               ((TH1F *)(fAcceptedCutList->At(26)))->Fill(extCov[0]);
+               ((TH1F *)(fAcceptedCutList->At(30)))->Fill(extCov[2]);
+               ((TH1F *)(fAcceptedCutList->At(34)))->Fill(extCov[5]);
+               ((TH1F *)(fAcceptedCutList->At(38)))->Fill(extCov[9]);
+               ((TH1F *)(fAcceptedCutList->At(42)))->Fill(extCov[14]);
+               ((TH3D *)(fAcceptedCutList->At(46)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          nClustersTPC);
+               ((TH3D *)(fAcceptedCutList->At(50)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          chi2PerClusterTPC);
+               ((TH3D *)(fAcceptedCutList->At(54)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          npointsTPCdEdx);
+               ((TH1F *)(fAcceptedCutList->At(58)))->Fill(npointsTPCdEdx);
+               
+               ((TH1F *)(fAcceptedDCAList->At(2)))->Fill(TMath::Abs(dca[0]));
+               ((TH1F *)(fAcceptedDCAList->At(6)))->Fill(TMath::Abs(dca[1]));
+               ((TH1F *)(fAcceptedDCAList->At(10)))->Fill(nSigmaToVertex);
+               if(particle->GetUniqueID() == 4) {
+                 ((TH3F *)(fAcceptedDCAList->At(14)))->Fill(track->Eta(),gPt,TMath::Abs(dca[0]));
+                 ((TH3F *)(fAcceptedDCAList->At(20)))->Fill(track->Eta(),gPt,TMath::Abs(dca[1]));
+               }
+               if(particle->GetUniqueID() == 13) {
+                 ((TH3F *)(fAcceptedDCAList->At(16)))->Fill(track->Eta(),gPt,TMath::Abs(dca[0]));
+                 ((TH3F *)(fAcceptedDCAList->At(22)))->Fill(track->Eta(),gPt,TMath::Abs(dca[1]));
+               }
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH2D *)(fQA2DList->At(2)))->Fill(track->Eta(),gPt);
+               else
+                 ((TH2D *)(fQA2DList->At(2)))->Fill(fProtonAnalysisBase->Rapidity(track->Px(),
+                                                                                  track->Py(),
+                                                                                  track->Pz()),
+                                                    gPt);
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH3F *)(fQA2DList->At(10)))->Fill(track->Eta(),gPt,
+                                                     ConvertPDGToInt(motherPDGCode));
+               else
+                 ((TH3F *)(fQA2DList->At(10)))->Fill(fProtonAnalysisBase->Rapidity(track->Px(),
+                                                                                   track->Py(),
+                                                                                   track->Pz()),
+                                                     gPt,
+                                                     ConvertPDGToInt(motherPDGCode));
+             }
+             else if(track->Charge() < 0) {
+               for(Int_t iLayer = 0; iLayer < 6; iLayer++) {
+                 if(track->HasPointOnITSLayer(iLayer))
+                   ((TH1F *)(fAcceptedCutList->At(3)))->Fill(iLayer+1);
+               }
+               ((TH1F *)(fAcceptedCutList->At(7)))->Fill(nClustersITS);
+               ((TH1F *)(fAcceptedCutList->At(11)))->Fill(chi2PerClusterITS);
+               ((TH1F *)(fAcceptedCutList->At(15)))->Fill(chi2ConstrainVertex);
+               ((TH1F *)(fAcceptedCutList->At(19)))->Fill(nClustersTPC);
+               ((TH1F *)(fAcceptedCutList->At(23)))->Fill(chi2PerClusterTPC);
+               ((TH1F *)(fAcceptedCutList->At(27)))->Fill(extCov[0]);
+               ((TH1F *)(fAcceptedCutList->At(31)))->Fill(extCov[2]);
+               ((TH1F *)(fAcceptedCutList->At(35)))->Fill(extCov[5]);
+               ((TH1F *)(fAcceptedCutList->At(39)))->Fill(extCov[9]);
+               ((TH1F *)(fAcceptedCutList->At(43)))->Fill(extCov[14]);
+               ((TH3D *)(fAcceptedCutList->At(47)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          nClustersTPC);
+               ((TH3D *)(fAcceptedCutList->At(51)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          chi2PerClusterTPC);
+               ((TH3D *)(fAcceptedCutList->At(55)))->Fill(track->Eta(),
+                                                          track->Phi()*180./TMath::Pi(),
+                                                          npointsTPCdEdx);
+               ((TH1F *)(fAcceptedCutList->At(59)))->Fill(npointsTPCdEdx);
+               
+               ((TH1F *)(fAcceptedDCAList->At(3)))->Fill(TMath::Abs(dca[0]));
+               ((TH1F *)(fAcceptedDCAList->At(7)))->Fill(TMath::Abs(dca[1]));
+               ((TH1F *)(fAcceptedDCAList->At(11)))->Fill(nSigmaToVertex);
+               if(particle->GetUniqueID() == 4) {
+                 ((TH3F *)(fAcceptedDCAList->At(15)))->Fill(track->Eta(),gPt,TMath::Abs(dca[0]));
+                 ((TH3F *)(fAcceptedDCAList->At(21)))->Fill(track->Eta(),gPt,TMath::Abs(dca[1]));
+               }
+               if(particle->GetUniqueID() == 13) {
+                 ((TH3F *)(fAcceptedDCAList->At(17)))->Fill(track->Eta(),gPt,TMath::Abs(dca[0]));
+                 ((TH3F *)(fAcceptedDCAList->At(23)))->Fill(track->Eta(),gPt,TMath::Abs(dca[1]));
+               }
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH2D *)(fQA2DList->At(6)))->Fill(track->Eta(),gPt);
+               else
+                 ((TH2D *)(fQA2DList->At(6)))->Fill(fProtonAnalysisBase->Rapidity(track->Px(),
+                                                                                  track->Py(),
+                                                                                  track->Pz()),
+                                                    gPt);
+               if(fProtonAnalysisBase->GetEtaMode())
+                 ((TH3F *)(fQA2DList->At(11)))->Fill(track->Eta(),gPt,
+                                                     ConvertPDGToInt(motherPDGCode));
+               else
+                 ((TH3F *)(fQA2DList->At(11)))->Fill(fProtonAnalysisBase->Rapidity(track->Px(),
+                                                                                   track->Py(),
+                                                                                   track->Pz()),
+                                                     gPt,
+                                                     ConvertPDGToInt(motherPDGCode));
+             }
+           }//secondary particles
+         }//accepted - track cuts
+       }//primary-like cut
+       else if((!fProtonAnalysisBase->IsAccepted(track)) || 
+               (!fProtonAnalysisBase->IsPrimary(esd,vertex,track))) {
          if(label <= stack->GetNprimary()) {
            if(track->Charge() > 0) {
              ((TH3D *)(fRejectedCutList->At(0)))->Fill(track->Eta(),
                                                        track->Phi()*180./TMath::Pi(),
                                                        nClustersTPC);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(1)))->Fill(track->Eta(),Pt);
+             ((TH3D *)(fRejectedCutList->At(4)))->Fill(track->Eta(),
+                                                       track->Phi()*180./TMath::Pi(),
+                                                       chi2PerClusterTPC);
+             ((TH3D *)(fRejectedCutList->At(8)))->Fill(track->Eta(),
+                                                       track->Phi()*180./TMath::Pi(),
+                                                       npointsTPCdEdx);
+             if(fProtonAnalysisBase->GetEtaMode())
+               ((TH2D *)(fQA2DList->At(1)))->Fill(track->Eta(),gPt);
              else
-               ((TH2D *)(fQA2DList->At(1)))->Fill(Rapidity(track->Px(),
+               ((TH2D *)(fQA2DList->At(1)))->Fill(fProtonAnalysisBase->Rapidity(track->Px(),
                                                            track->Py(),
                                                            track->Pz()),
-                                                  Pt);
+                                                  gPt);
            }
            else if(track->Charge() < 0) {
              ((TH3D *)(fRejectedCutList->At(1)))->Fill(track->Eta(),
                                                        track->Phi()*180./TMath::Pi(),
                                                        nClustersTPC);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(5)))->Fill(track->Eta(),Pt);
+             ((TH3D *)(fRejectedCutList->At(5)))->Fill(track->Eta(),
+                                                       track->Phi()*180./TMath::Pi(),
+                                                       chi2PerClusterTPC);
+             ((TH3D *)(fRejectedCutList->At(9)))->Fill(track->Eta(),
+                                                       track->Phi()*180./TMath::Pi(),
+                                                       npointsTPCdEdx);
+                                               
+             if(fProtonAnalysisBase->GetEtaMode())
+               ((TH2D *)(fQA2DList->At(5)))->Fill(track->Eta(),gPt);
              else
-               ((TH2D *)(fQA2DList->At(5)))->Fill(Rapidity(track->Px(),
+               ((TH2D *)(fQA2DList->At(5)))->Fill(fProtonAnalysisBase->Rapidity(track->Px(),
                                                            track->Py(),
                                                            track->Pz()),
-                                                  Pt);
+                                                  gPt);
            }
          }//primary particles
          else if(label > stack->GetNprimary()) {
@@ -4513,25 +4933,37 @@ void AliProtonQAAnalysis::RunQAAnalysis(AliStack *stack,
              ((TH3D *)(fRejectedCutList->At(2)))->Fill(track->Eta(),
                                                        track->Phi()*180./TMath::Pi(),
                                                        nClustersTPC);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(3)))->Fill(track->Eta(),Pt);
+             ((TH3D *)(fRejectedCutList->At(6)))->Fill(track->Eta(),
+                                                       track->Phi()*180./TMath::Pi(),
+                                                       chi2PerClusterTPC);
+             ((TH3D *)(fRejectedCutList->At(10)))->Fill(track->Eta(),
+                                                       track->Phi()*180./TMath::Pi(),
+                                                       npointsTPCdEdx);
+             if(fProtonAnalysisBase->GetEtaMode())
+               ((TH2D *)(fQA2DList->At(3)))->Fill(track->Eta(),gPt);
              else
-               ((TH2D *)(fQA2DList->At(3)))->Fill(Rapidity(track->Px(),
+               ((TH2D *)(fQA2DList->At(3)))->Fill(fProtonAnalysisBase->Rapidity(track->Px(),
                                                            track->Py(),
                                                            track->Pz()),
-                                                  Pt);
+                                                  gPt);
            }
            else if(track->Charge() < 0) {
              ((TH3D *)(fRejectedCutList->At(3)))->Fill(track->Eta(),
                                                        track->Phi()*180./TMath::Pi(),
                                                        nClustersTPC);
-             if(fAnalysisEtaMode)
-               ((TH2D *)(fQA2DList->At(7)))->Fill(track->Eta(),Pt);
+             ((TH3D *)(fRejectedCutList->At(7)))->Fill(track->Eta(),
+                                                       track->Phi()*180./TMath::Pi(),
+                                                       chi2PerClusterTPC);
+             ((TH3D *)(fRejectedCutList->At(11)))->Fill(track->Eta(),
+                                                       track->Phi()*180./TMath::Pi(),
+                                                       npointsTPCdEdx);
+             if(fProtonAnalysisBase->GetEtaMode())
+               ((TH2D *)(fQA2DList->At(7)))->Fill(track->Eta(),gPt);
              else
-               ((TH2D *)(fQA2DList->At(7)))->Fill(Rapidity(track->Px(),
+               ((TH2D *)(fQA2DList->At(7)))->Fill(fProtonAnalysisBase->Rapidity(track->Px(),
                                                            track->Py(),
                                                            track->Pz()),
-                                                  Pt);
+                                                  gPt);
            }
          }//secondary particles
        }//rejected - track cuts
@@ -4545,22 +4977,38 @@ void AliProtonQAAnalysis::RunQAAnalysis(AliStack *stack,
 void AliProtonQAAnalysis::InitMCAnalysis() {
   //MC analysis - 3D histograms: y-pT-pdg
   fPDGList = new TList();
-  TH3F *gHistYPtPDGProtons = new TH3F("gHistYPtPDGProtons",
-                                     ";;P_{T} [GeV/c];PDG",
-                                     fNBinsY,fMinY,fMaxY,
-                                     fNBinsPt,fMinPt,fMaxPt,
-                                     14,-0.5,13.5);
-  if(fAnalysisEtaMode) 
+  TH3F *gHistYPtPDGProtons = 0x0;
+  if(fUseAsymmetricBinning) {
+    Double_t gPDG[15] = {-0.5,0.5,1.5,2.5,3.5,4.5,5.5,6.5,7.5,8.5,9.5,10.5,11.5,12.5,13.5};
+  gHistYPtPDGProtons = new TH3F("gHistYPtPDGProtons",
+                               ";;P_{T} [GeV/c];PDG",
+                               fNBinsY,fY,fNBinsPt,fPt,14,gPDG);
+  }
+  else
+    gHistYPtPDGProtons = new TH3F("gHistYPtPDGProtons",
+                                 ";;P_{T} [GeV/c];PDG",
+                                 fNBinsY,fMinY,fMaxY,
+                                 fNBinsPt,fMinPt,fMaxPt,
+                                 14,-0.5,13.5);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtPDGProtons->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtPDGProtons->GetXaxis()->SetTitle("y");
   fPDGList->Add(gHistYPtPDGProtons);
-  TH3F *gHistYPtPDGAntiProtons = new TH3F("gHistYPtPDGAntiProtons",
-                                         ";;P_{T} [GeV/c];PDG",
-                                         fNBinsY,fMinY,fMaxY,
-                                         fNBinsPt,fMinPt,fMaxPt,
-                                         14,-0.5,13.5);
-  if(fAnalysisEtaMode) 
+  TH3F *gHistYPtPDGAntiProtons = 0x0;
+  if(fUseAsymmetricBinning) {
+    Double_t gPDG[15] = {-0.5,0.5,1.5,2.5,3.5,4.5,5.5,6.5,7.5,8.5,9.5,10.5,11.5,12.5,13.5};
+    gHistYPtPDGAntiProtons = new TH3F("gHistYPtPDGAntiProtons",
+                                     ";;P_{T} [GeV/c];PDG",
+                                     fNBinsY,fY,fNBinsPt,fPt,14,gPDG);
+  }
+  else
+    gHistYPtPDGAntiProtons = new TH3F("gHistYPtPDGAntiProtons",
+                                     ";;P_{T} [GeV/c];PDG",
+                                     fNBinsY,fMinY,fMaxY,
+                                     fNBinsPt,fMinPt,fMaxPt,
+                                     14,-0.5,13.5);
+  if(fProtonAnalysisBase->GetEtaMode()) 
     gHistYPtPDGAntiProtons->GetXaxis()->SetTitle("#eta");
   else 
     gHistYPtPDGAntiProtons->GetXaxis()->SetTitle("y");
@@ -4612,7 +5060,7 @@ void AliProtonQAAnalysis::InitMCAnalysis() {
 }
 
 //____________________________________________________________________//
-void AliProtonQAAnalysis::RunMCAnalysis(AliStack* stack) {
+void AliProtonQAAnalysis::RunMCAnalysis(AliStack* const stack) {
   //Main analysis part - MC 
   for(Int_t iParticle = 0; iParticle < stack->GetNtrack(); iParticle++) {
     TParticle *particle = stack->Particle(iParticle);
@@ -4620,20 +5068,20 @@ void AliProtonQAAnalysis::RunMCAnalysis(AliStack* stack) {
 
     if(TMath::Abs(particle->Eta()) > 1.0) continue;//acceptance
     if((particle->Pt() > fMaxPt)||(particle->Pt() < fMinPt)) continue;
-    if(fAnalysisEtaMode) {
+    if(fProtonAnalysisBase->GetEtaMode()) {
       if((particle->Eta() > fMaxY)||(particle->Eta() < fMinY)) continue;
     }
     else {
-      if((Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
+      if((fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) > fMaxY)||(fProtonAnalysisBase->Rapidity(particle->Px(),particle->Py(),particle->Pz()) < fMinY)) continue;
     }
 
     Int_t pdgcode = particle->GetPdgCode();
     if(pdgcode == 2212) {
       if(iParticle <= stack->GetNprimary()) {
-       if(fAnalysisEtaMode)
+       if(fProtonAnalysisBase->GetEtaMode())
          ((TH3F *)(fPDGList->At(0)))->Fill(particle->Eta(),particle->Pt(),0);
        else
-         ((TH3F *)(fPDGList->At(0)))->Fill(Rapidity(particle->Px(),
+         ((TH3F *)(fPDGList->At(0)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                     particle->Py(),
                                                     particle->Pz()),
                                            particle->Pt(),0);
@@ -4648,12 +5096,12 @@ void AliProtonQAAnalysis::RunMCAnalysis(AliStack* stack) {
        if(fMotherParticlePDGCodeFlag)
          if(TMath::Abs(motherPDGCode) != fMotherParticlePDGCode) continue;
 
-       if(fAnalysisEtaMode)
+       if(fProtonAnalysisBase->GetEtaMode())
          ((TH3F *)(fPDGList->At(0)))->Fill(particle->Eta(),
                                            particle->Pt(),
                                            ConvertPDGToInt(motherParticle->GetPdgCode()));
        else
-         ((TH3F *)(fPDGList->At(0)))->Fill(Rapidity(particle->Px(),
+         ((TH3F *)(fPDGList->At(0)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                     particle->Py(),
                                                     particle->Pz()),
                                            particle->Pt(),
@@ -4688,10 +5136,10 @@ void AliProtonQAAnalysis::RunMCAnalysis(AliStack* stack) {
 
     if(pdgcode == -2212) {
       if(iParticle <= stack->GetNprimary()) {
-       if(fAnalysisEtaMode)
+       if(fProtonAnalysisBase->GetEtaMode())
          ((TH3F *)(fPDGList->At(1)))->Fill(particle->Eta(),particle->Pt(),0);
        else
-         ((TH3F *)(fPDGList->At(1)))->Fill(Rapidity(particle->Px(),
+         ((TH3F *)(fPDGList->At(1)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                     particle->Py(),
                                                     particle->Pz()),
                                            particle->Pt(),0);
@@ -4706,12 +5154,12 @@ void AliProtonQAAnalysis::RunMCAnalysis(AliStack* stack) {
        if(fMotherParticlePDGCodeFlag)
          if(TMath::Abs(motherPDGCode) != fMotherParticlePDGCode) continue;
 
-       if(fAnalysisEtaMode)
+       if(fProtonAnalysisBase->GetEtaMode())
          ((TH3F *)(fPDGList->At(1)))->Fill(particle->Eta(),
                                            particle->Pt(),
                                            ConvertPDGToInt(motherParticle->GetPdgCode()));
        else
-         ((TH3F *)(fPDGList->At(1)))->Fill(Rapidity(particle->Px(),
+         ((TH3F *)(fPDGList->At(1)))->Fill(fProtonAnalysisBase->Rapidity(particle->Px(),
                                                     particle->Py(),
                                                     particle->Pz()),
                                            particle->Pt(),
@@ -4741,7 +5189,7 @@ void AliProtonQAAnalysis::RunMCAnalysis(AliStack* stack) {
 }
 
 //____________________________________________________________________//
-Int_t AliProtonQAAnalysis::ConvertPDGToInt(Int_t pdgCode) {
+Int_t AliProtonQAAnalysis::ConvertPDGToInt(Int_t pdgCode) const {
   //Converts the pdg code to an int based on the following scheme:
   //1: PDG code: 130 - Name: K_L0
   //2: PDG code: 211 - Name: pi+
@@ -4814,52 +5262,6 @@ Int_t AliProtonQAAnalysis::ConvertPDGToInt(Int_t pdgCode) {
   return code;
 }
 
-//________________________________________________________________________
-/*const AliESDVertex* AliProtonQAAnalysis::GetVertex(AliESDEvent* esd,
-                                                  Double_t gVxMax,
-                                                  Double_t gVyMax,
-                                                  Double_t gVzMax) {
-  // Get the vertex from the ESD and returns it if the vertex is valid
-  // depending on the analysis mode: TPC - Hybrid - Global
-  const AliESDVertex* vertex = 0;
-  if((fUseTPCOnly)&&(!fUseHybridTPC)) {
-    Double_t kBz = esd->GetMagneticField();
-    AliVertexerTracks vertexer(kBz);
-    vertexer.SetTPCMode();
-    AliESDVertex *vTPC = vertexer.FindPrimaryVertex(esd);
-    esd->SetPrimaryVertexTPC(vTPC);
-    for (Int_t i=0; i<esd->GetNumberOfTracks(); i++) {
-      AliESDtrack *t = esd->GetTrack(i);
-      t->RelateToVertexTPC(vTPC, kBz, kVeryBig);
-    }
-    delete vTPC;
-    vertex = esd->GetPrimaryVertexTPC();
-  }
-  else if(fUseHybridTPC)
-    vertex = esd->GetPrimaryVertexSPD();
-  else if(!fUseTPCOnly)
-    vertex = esd->GetPrimaryVertex();
-  else
-    Printf("GetVertex: ERROR: Invalid analysis mode");
-  
-  if(!vertex) return 0;
-  
-  // check Ncontributors
-  if(vertex->GetNContributors() <= 0) return 0;
-  
-  // check resolution
-  Double_t zRes = vertex->GetZRes();
-  if(zRes == 0) return 0;
-  
-  //check position
-  if(TMath::Abs(vertex->GetXv()) > gVxMax) return 0;
-  if(TMath::Abs(vertex->GetYv()) > gVyMax) return 0;
-  if(TMath::Abs(vertex->GetZv()) > gVzMax) return 0;
-
-  return vertex;
-  }*/
-
-