Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGHF / hfe / AliHFEtpcPIDqa.cxx

diff --git a/PWGHF/hfe/AliHFEtpcPIDqa.cxx b/PWGHF/hfe/AliHFEtpcPIDqa.cxx
index aa973428b05424ea79b1c69a6d3bc16201c140da..11a2443a77aa573317944e56d2fcfac22bf33180 100644 (file)
--- a/PWGHF/hfe/AliHFEtpcPIDqa.cxx
+++ b/PWGHF/hfe/AliHFEtpcPIDqa.cxx
@@ -194,20 +194,20 @@ void AliHFEtpcPIDqa::Initialize(){
   const Double_t kMaxEta = 0.9;
 
   // Quantities where one can switch between low and high resolution
-  Int_t kPbins = fQAmanager->HasHighResolutionHistos() ? 1000 : 100;
+  Int_t kPbins = (fQAmanager->HasHighResolutionHistos() || fQAmanager->HasMidResolutionHistos()) ? 1000 : 100;
   Int_t kDedxbins = fQAmanager->HasHighResolutionHistos() ? 400 : 200;
   Int_t kSigmaBins = fQAmanager->HasHighResolutionHistos() ? 1400 : 240;
   kSigmaBins = fQAmanager->HasMidResolutionHistos() ? 400 : kSigmaBins;
-  Int_t kEtabins = fQAmanager->HasHighResolutionEtaHistos() ? 27 : 18;
+  Int_t kEtabins = fQAmanager->HasHighResolutionEtaHistos() ? 33 : 18;
 
   // 1st histogram: TPC dEdx: (species, p, dEdx, step)
-  Int_t nBinsdEdx[kNdim] = {kPIDbins, kPbins, kDedxbins, kSteps, kCentralityBins, kEtabins, 50};
+  Int_t nBinsdEdx[kNdim] = {kPIDbins, kPbins, kDedxbins, kSteps, kCentralityBins, kEtabins, 33};
   Double_t mindEdx[kNdim] =  {kMinPID, kMinP, 20., 0., 0., kMinEta, 0};
-  Double_t maxdEdx[kNdim] =  {kMaxPID, kMaxP, 160, 2., 11., kMaxEta, 2000};
+  Double_t maxdEdx[kNdim] =  {kMaxPID, kMaxP, 130, 2., 11., kMaxEta, 2000};
   fHistos->CreateTHnSparse("tpcDedx", "TPC signal; species; p [GeV/c]; TPC signal [a.u.]; Selection Step; Centrality; Eta; pVx contrib", kNdim, nBinsdEdx, mindEdx, maxdEdx);
   
   // 2nd histogram: TPC sigmas: (species, p nsigma, step)
-  Int_t nBinsSigma[kNdim] = {kPIDbins, kPbins, kSigmaBins, kSteps, kCentralityBins, kEtabins, 50};
+  Int_t nBinsSigma[kNdim] = {kPIDbins, kPbins, kSigmaBins, kSteps, kCentralityBins, kEtabins, 33};
   Double_t minSigma[kNdim] = {kMinPID, kMinP, -12., 0., 0., kMinEta, 0};
   Double_t maxSigma[kNdim] = {kMaxPID, kMaxP, 12., 2., 11., kMaxEta, 2000};
   fHistos->CreateTHnSparse("tpcnSigma", "TPC signal; species; p [GeV/c]; TPC signal [a.u.]; Selection Step; Centrality; Eta; pVx contrib", kNdim, nBinsSigma, minSigma, maxSigma);
@@ -222,23 +222,26 @@ void AliHFEtpcPIDqa::ProcessTrack(const AliHFEpidObject *track, AliHFEdetPIDqa::
   //
   AliDebug(1, Form("QA started for TPC PID for step %d", (Int_t)step));
   AliHFEpidObject::AnalysisType_t anatype = track->IsESDanalysis() ? AliHFEpidObject::kESDanalysis : AliHFEpidObject::kAODanalysis;
-  Float_t centrality = track->GetCentrality();
   Int_t species = track->GetAbInitioPID();
   if(species >= AliPID::kSPECIES) species = -1;
 
   AliHFEpidTPC *tpcpid = dynamic_cast<AliHFEpidTPC *>(fQAmanager->GetDetectorPID(AliHFEpid::kTPCpid));
   const AliPIDResponse *pidResponse = tpcpid ? tpcpid->GetPIDResponse() : NULL;
-  Double_t contentSignal[6];
+  Double_t contentSignal[7];
   contentSignal[0] = species;
   contentSignal[1] = tpcpid ? tpcpid->GetP(track->GetRecTrack(), anatype) : 0.;
   contentSignal[2] = GetTPCsignal(track->GetRecTrack(), anatype);
   contentSignal[3] = step;
-  contentSignal[4] = centrality;
+  contentSignal[4] = track->GetCentrality();
   contentSignal[5] = GetEta(track->GetRecTrack(), anatype);
   contentSignal[6] = fQAmanager->HasFillMultiplicity() ? track->GetMultiplicity() : 0;
   fHistos->Fill("tpcDedx", contentSignal);
 
-  contentSignal[2] = pidResponse ? pidResponse->NumberOfSigmasTPC(track->GetRecTrack(), AliPID::kElectron) : -100.; 
+  if(track->HasCorrectedTPCnSigma())
+    contentSignal[2] = track->GetCorrectedTPCnSigma();
+  else
+    contentSignal[2] = pidResponse ? pidResponse->NumberOfSigmasTPC(track->GetRecTrack(), AliPID::kElectron) : -100.;
+  
   fHistos->Fill("tpcnSigma", contentSignal);
 }