]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWGPP/TRD/AliTRDcheckESD.cxx
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
[u/mrichter/AliRoot.git] / PWGPP / TRD / AliTRDcheckESD.cxx
index 242348be668456f4435e01f1b6d9bc3d263691a9..65d57bce4797a20e7f2ee3e2ce38190a1c829e43 100644 (file)
 * provided "as is" without express or implied warranty.                  *
 **************************************************************************/
 
-/////////////////////////////////////////////////////
-//
-// Check basic detector results at ESD level
-//   - Geometrical efficiency  
-//   - Tracking efficiency  
-//   - PID efficiency  
-//   - Refit efficiency  
-//
-// Author
-//   Alex Bercuci <A.Bercuci@gsi.de>
-//
-//////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//                                                                      //
+// Check basic detector results at ESD level                            //
+//   - Geometrical efficiency                                           //
+//   - Tracking efficiency                                              //
+//   - PID efficiency                                                   //
+//   - Refit efficiency                                                 //
+//                                                                      //
+// Author                                                               //
+//   Alex Bercuci <A.Bercuci@gsi.de>                                    //
+//   Ionut Arsene <i.c.arsene@gsi.de>                                   //
+//                                                                      //
+//     The analysis task fills AliCFContainer objects defined in the    //
+//   configuration macro using the AddCFContainer() method.             //
+//   The CF containers can be filled with any of the variables defined  //
+//   in ETrdCfVariables and at any of the steps defined in ETrdCfSteps. //
+//     To define a new variable one needs to:                           //
+//   1. Add an entry in the ETrdCfVariables enumeration                 //
+//   2. Add the corresponding variable name (and in the correct order)  //
+//      in fgkVarNames                                                  //
+//   3. Define how the variable is filled in one of the Fill functions: //
+//      FillEventInfo(), FillTrackInfo(), FillTrackletInfo(),           //
+//      FillTrackletSliceInfo().                                        //
+//     To define a new step one needs to:                               //
+//   1. Add an entry in the ETrdCfSteps                                 //
+//   2. Add the corresponding name in fgkStepNames                      //
+//   3. Define the track level cuts for this step in IsTrackSelected()  //
+//                                                                      //
+//////////////////////////////////////////////////////////////////////////
 
 #include <TClonesArray.h>
 #include <TCanvas.h>
 #include "AliESDInputHandler.h"
 #include "AliMCEventHandler.h"
 #include "AliESDpid.h"
+#include "AliExternalTrackParam.h"
 
 #include "AliESDtrack.h"
 #include "AliMCParticle.h"
 #include "AliPID.h"
 #include "AliStack.h"
 #include "AliTrackReference.h"
-//#include "AliESDCentrality.h"
 #include "AliMultiplicity.h"
 #include "AliCFContainer.h"
 
 #include "AliTRDcheckESD.h"
 #include <iostream>
-using namespace std;
+using std::cout;
+using std::endl;
 
 ClassImp(AliTRDcheckESD)
 
 const Float_t AliTRDcheckESD::fgkxTPC = 290.;
 const Float_t AliTRDcheckESD::fgkxTOF = 365.;
-const UChar_t AliTRDcheckESD::fgkNgraph[AliTRDcheckESD::kNrefs] ={
-8, 4, 2, 20};
-FILE* AliTRDcheckESD::fgFile = NULL;
+const Char_t* AliTRDcheckESD::fgkVarNames[AliTRDcheckESD::kNTrdCfVariables] = {
+    "vtxZ", "multiplicity", "trigger", "BC", "TOFBC", "DCAxy", "DCAz", "charge", "OuterParam rad.", "phiVtx", "phi", 
+    "etaVtx", "eta", "pt", "ptTRD", "P", "PTRD", "TRDchi2", "tracklets", "clusters", "TrdQuality", 
+    "TrdBudget", "Qtot0", "ClustersPerRows", "Clusters/tracklet", "TrdP", "TrdPloss", "layer", "slice", "PH0"
+}; 
+const Char_t* AliTRDcheckESD::fgkStepNames[AliTRDcheckESD::kNSteps] = {"TPC", "TRD", "TOF", "TOFin", "TOFout"};  
 
-const Float_t AliTRDcheckESD::fgkEvVertexZ = 15.;
-const Int_t   AliTRDcheckESD::fgkEvVertexN = 1;
-const Float_t AliTRDcheckESD::fgkTrkDCAxy  = 40.;
-const Float_t AliTRDcheckESD::fgkTrkDCAz   = 15.;
-const Int_t   AliTRDcheckESD::fgkNclTPC    = 100;
-const Float_t AliTRDcheckESD::fgkPt        = 0.2;
-const Float_t AliTRDcheckESD::fgkEta       = 0.9;
-const Float_t AliTRDcheckESD::fgkQs        = 0.002;
+FILE* AliTRDcheckESD::fgFile = NULL;
 
 //____________________________________________________________________
 AliTRDcheckESD::AliTRDcheckESD():
@@ -104,14 +118,6 @@ AliTRDcheckESD::AliTRDcheckESD():
   ,fMC(NULL)
   ,fESDpid(new AliESDpid)
   ,fHistos(NULL)
-  ,fResults(NULL)
-  ,fExpertCF(NULL)
-  ,fMatchingPhiEtaCF(NULL)
-  ,fMatchingPtCF(NULL)
-  ,fBunchCrossingsCF(NULL)
-  ,fCentralityCF(NULL)
-  ,fQtotCF(NULL)
-  ,fPulseHeightCF(NULL)
   ,fReferenceTrackFilter(NULL)
   ,fPhysSelTriggersEnabled(kFALSE)
   ,fUserEnabledTriggers("")
@@ -120,20 +126,6 @@ AliTRDcheckESD::AliTRDcheckESD():
   //
   // Default constructor
   //
-  for(Int_t i=0; i<kNTrdCfVariables; ++i) {
-    fExpertCFVars[i] = -1;
-    fMatchingPhiEtaCFVars[i] = -1;
-    fMatchingPtCFVars[i] = -1;
-    fBunchCrossingsCFVars[i] = -1;
-    fCentralityCFVars[i] = -1;
-    fQtotCFVars[i] = -1;
-    fPulseHeightCFVars[i] = -1;
-    fExpertCFVarsEnabled[i] = kFALSE;
-    fExpertCFVarNBins[i] = 0;
-    fExpertCFVarRanges[i][0] = -999.; fExpertCFVarRanges[i][1] = -999.;
-    fExpertCFVarBins[i] = "";
-  }
-  fExpertCFEnabledSteps[0] = kFALSE; fExpertCFEnabledSteps[1] = kFALSE; fExpertCFEnabledSteps[2] = kFALSE;
   SetNameTitle("TRDcheckESD", "Check TRD @ ESD level");
   SetMC(kTRUE);
 }
@@ -147,14 +139,6 @@ AliTRDcheckESD::AliTRDcheckESD(char* name):
   ,fMC(NULL)
   ,fESDpid(new AliESDpid)
   ,fHistos(NULL)
-  ,fResults(NULL)
-  ,fExpertCF(NULL)
-  ,fMatchingPhiEtaCF(NULL)
-  ,fMatchingPtCF(NULL)
-  ,fBunchCrossingsCF(NULL)
-  ,fCentralityCF(NULL)
-  ,fQtotCF(NULL)
-  ,fPulseHeightCF(NULL)
   ,fReferenceTrackFilter(NULL)
   ,fPhysSelTriggersEnabled(kFALSE)
   ,fUserEnabledTriggers("")
@@ -163,20 +147,6 @@ AliTRDcheckESD::AliTRDcheckESD(char* name):
   //
   // Default constructor
   //
-  for(Int_t i=0; i<kNTrdCfVariables; ++i) {
-    fExpertCFVars[i] = -1;
-    fMatchingPhiEtaCFVars[i] = -1;
-    fMatchingPtCFVars[i] = -1;
-    fBunchCrossingsCFVars[i] = -1;
-    fCentralityCFVars[i] = -1;
-    fQtotCFVars[i] = -1;
-    fPulseHeightCFVars[i] = -1;
-    fExpertCFVarsEnabled[i] = kFALSE;
-    fExpertCFVarNBins[i] = 0;
-    fExpertCFVarRanges[i][0] = -999.; fExpertCFVarRanges[i][1] = -999.;
-    fExpertCFVarBins[i] = "";
-  }
-  fExpertCFEnabledSteps[0] = kFALSE; fExpertCFEnabledSteps[1] = kFALSE; fExpertCFEnabledSteps[2] = kFALSE;
   SetMC(kTRUE);
   SetTitle("Check TRD @ ESD level");
   DefineOutput(1, TObjArray::Class());
@@ -191,37 +161,103 @@ AliTRDcheckESD::~AliTRDcheckESD()
     delete fHistos;
     fHistos = NULL;
   }
-  
-  if(fResults){
-    fResults->Delete();
-    delete fResults;
-  }
 }
 
+//____________________________________________________________________
+void AliTRDcheckESD::FillEventInfo(Double_t* values) {
+  //
+  // Fill event information
+  //
+  values[kEventVtxZ] = fESD->GetPrimaryVertex()->GetZv();
+  values[kEventBC] = fESD->GetBunchCrossNumber();
+  
+  const AliMultiplicity* mult=fESD->GetMultiplicity();
+  Double_t itsNTracklets = mult->GetNumberOfTracklets();
+  values[kEventMult] = itsNTracklets;
+}
 
 //____________________________________________________________________
-void AliTRDcheckESD::AddExpertCFVar(AliTRDcheckESD::ETrdCfVariables var, 
-                                   Int_t nbins, Double_t lowLim, Double_t highLim) {
+void AliTRDcheckESD::FillTrackInfo(Double_t* values, AliESDtrack* esdTrack) {
   //
-  // Configure variables for the expert CF container
+  // Fill track information
   //
-  fExpertCFVarsEnabled[var] = kTRUE;
-  fExpertCFVarNBins[var] = nbins;
-  fExpertCFVarRanges[var][0] = lowLim;
-  fExpertCFVarRanges[var][1] = highLim;
+  Float_t dcaxy,dcaz;
+  esdTrack->GetImpactParameters(dcaxy,dcaz);
+  values[kTrackDCAxy]  = dcaxy;
+  values[kTrackDCAz]   = dcaz;  
+  values[kTrackCharge] = esdTrack->Charge();
+  values[kTrackPt]     = esdTrack->Pt();
+  values[kTrackPhi]    = esdTrack->Phi();
+  values[kTrackEta]    = esdTrack->Eta();
+  values[kTrackP]      = esdTrack->P();
+  values[kTrackTrdTracklets] = esdTrack->GetTRDntracklets();
+  values[kTrackTrdClusters]  = esdTrack->GetTRDncls();
+  values[kTrackTrdChi2]      = esdTrack->GetTRDchi2()/(esdTrack->GetTRDntracklets()>0 ? esdTrack->GetTRDntracklets() : 1.0);
+  values[kTrackTrdQuality]   = esdTrack->GetTRDQuality();
+  values[kTrackTRDBudget]    = esdTrack->GetTRDBudget();
+  values[kTrackTOFBC]        = esdTrack->GetTOFBunchCrossing(fESD->GetMagneticField());
+  const AliExternalTrackParam *out=esdTrack->GetOuterParam();
+  Double_t p[3];
+  if(out->GetXYZ(p)) 
+    values[kTrackOuterParamRadius] = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
+  else 
+    values[kTrackOuterParamRadius] = 0.0;
 }
 
+//____________________________________________________________________
+void AliTRDcheckESD::FillTrackletInfo(Double_t* values, AliESDtrack* esdTrack, Int_t iPlane,
+                                      Double_t* localSagitaPhi, Double_t localMom[][3], Bool_t* localMomGood) {
+  //
+  // Fill TRD tracklet info
+  //
+  values[kTrackletClustersVsRows] = esdTrack->GetTRDtrkltClCross(iPlane);
+  values[kTrackletClusters]       = esdTrack->GetTRDtrkltOccupancy(iPlane);
+  values[kTrackletQtot]           = esdTrack->GetTRDslice(iPlane, 0);
+  values[kTrackletP]              = esdTrack->GetTRDmomentum(iPlane);
+  values[kTrackPlossTRDlayer]     = esdTrack->P() - values[kTrackletP];
+  values[kTrackletLayer]          = iPlane;
+  values[kTrackPhiTRD]            = localSagitaPhi[iPlane];
+  values[kTrackPtTRD]         = (localMomGood[iPlane] ? TMath::Sqrt(localMom[iPlane][0]*localMom[iPlane][0]+
+                                                                   localMom[iPlane][1]*localMom[iPlane][1]) : values[kTrackPt]);
+  values[kTrackPTRD]          = (localMomGood[iPlane] ? TMath::Sqrt(values[kTrackPtTRD]*values[kTrackPtTRD]+
+                                                                    localMom[iPlane][2]*localMom[iPlane][2]) : values[kTrackP]);       
+  values[kTrackEtaTRD] = values[kTrackPTRD]-(localMomGood[iPlane] ? localMom[iPlane][2] : esdTrack->Pz());
+  values[kTrackEtaTRD] = (TMath::Abs(values[kTrackPTRD])>1.0e-8 ? (values[kTrackPTRD]+(localMomGood[iPlane] ? localMom[iPlane][2] : esdTrack->Pz()))/values[kTrackEtaTRD] : 0.0);
+  values[kTrackEtaTRD] = (values[kTrackEtaTRD]>1.0e-8 ? 0.5*TMath::Log(values[kTrackEtaTRD]) : -999.);
+}
 
 //____________________________________________________________________
-void AliTRDcheckESD::AddExpertCFVar(AliTRDcheckESD::ETrdCfVariables var, 
-                                   const Char_t* bins) {
+void AliTRDcheckESD::FillTrackletSliceInfo(Double_t* values, AliESDtrack* esdTrack, Int_t iSlice) {
   //
-  // Configure variables for the expert CF container
+  // Fill TRD tracklet info
   //
-  fExpertCFVarsEnabled[var] = kTRUE;
-  fExpertCFVarBins[var] = bins;
+  values[kTrackletPHslice] = esdTrack->GetTRDslice(Int_t(values[kTrackletLayer]), iSlice);
+  values[kTrackletSlice] = iSlice;
 }
 
+//____________________________________________________________________
+Bool_t AliTRDcheckESD::IsTrackSelected(AliESDtrack* track, Double_t* /*values*/, Int_t step) {
+  //
+  // Select tracks at each step
+  //
+  Bool_t referenceFilter = fReferenceTrackFilter->IsSelected(track);
+  if(step==kTPCreference) {    // reference track filter
+    return referenceFilter;
+  }
+  if(step==kTRD) {    // TRD reference track filter
+    return (referenceFilter && track->GetTRDntracklets()>0);
+  }
+  if(step==kTOF) {    // TOFpid request
+    return (referenceFilter && track->GetTRDntracklets()>0 && (track->GetStatus() & AliESDtrack::kTOFpid)); 
+  }
+  if(step==kTOFin) {    // TOFin request
+    return (referenceFilter && (track->GetStatus() & AliESDtrack::kTOFin)); 
+  }
+  if(step==kTOFout) {    // TOFout request
+    return (referenceFilter && (track->GetStatus() & AliESDtrack::kTOFout)); 
+  }
+  return kFALSE;
+}
 
 //____________________________________________________________________
 void AliTRDcheckESD::UserCreateOutputObjects()
@@ -234,7 +270,7 @@ void AliTRDcheckESD::UserCreateOutputObjects()
 }
 
 //____________________________________________________________________
-void AliTRDcheckESD::MakeSummaryFromCF(Double_t* trendValues, const Char_t* triggerName, Bool_t useIsolatedBC, Bool_t cutTOFbc){
+void AliTRDcheckESD::MakeSummaryFromCF(Double_t* trendValues, const Char_t* /*triggerName*/, Bool_t /*useIsolatedBC*/, Bool_t /*cutTOFbc*/){
   //
   // Draw summary plots for the ESDcheck task using the CF container
   //
@@ -244,209 +280,30 @@ void AliTRDcheckESD::MakeSummaryFromCF(Double_t* trendValues, const Char_t* trig
   if(gROOT->FindObject("trackingSummary")) delete gROOT->FindObject("trackingSummary");
   cOut = new TCanvas("trackingSummary", "Tracking summary for the ESD task", 1600, 1200);
   cOut->cd();
-  PlotTrackingSummaryFromCF(trendValues, triggerName, useIsolatedBC, cutTOFbc);
+  //PlotTrackingSummaryFromCF(trendValues, triggerName, useIsolatedBC, cutTOFbc);
+  PlotTrackingSummaryFromCF(trendValues);
   cOut->SaveAs("trackingSummary.gif");
   
   if(gROOT->FindObject("pidSummary")) delete gROOT->FindObject("pidSummary");
   cOut = new TCanvas("pidSummary", "PID summary for the ESD task", 1600, 1200);
   cOut->cd();
-  //GetRefFigure(6);
-  PlotPidSummaryFromCF(trendValues, triggerName, useIsolatedBC, cutTOFbc);
+  //PlotPidSummaryFromCF(trendValues, triggerName, useIsolatedBC, cutTOFbc);
+  PlotPidSummaryFromCF(trendValues);
   cOut->SaveAs("pidSummary.gif");
 
   if(gROOT->FindObject("centSummary")) delete gROOT->FindObject("centSummary");
   cOut = new TCanvas("centSummary", "Centrality summary for the ESD task", 1600, 1200);
   cOut->cd();
-  //GetRefFigure(7);
-  PlotCentSummaryFromCF(trendValues, triggerName, useIsolatedBC, cutTOFbc);
+  //PlotCentSummaryFromCF(trendValues, triggerName, useIsolatedBC, cutTOFbc);
+  PlotCentSummaryFromCF(trendValues);
   cOut->SaveAs("centSummary.gif");
-}
-
-
-//____________________________________________________________________
-void AliTRDcheckESD::MakeSummary(Double_t* trendValues){
-  //
-  // Draw summary plots for the ESDcheck task
-  //
-  // Old method to draw summary pictures from histograms. Use the MakeSummaryFromCF() when CF container is present
   
-  cout << "Make summary" << endl;
-  TCanvas *cTracking=0x0;
-  if(gROOT->FindObject("trackingSummary")) delete gROOT->FindObject("trackingSummary");
-  cTracking = new TCanvas("trackingSummary", "Tracking summary for the ESD task", 1600, 1200);
-  cTracking->cd();
-  //GetRefFigure(5);
-  if(PlotTrackingSummary(0, trendValues))
-    cTracking->SaveAs("trackingSummary.gif");
+  PlotOtherSummaryFromCF(trendValues);
   
-  TCanvas* cPid = 0x0;
-  if(gROOT->FindObject("pidSummary")) delete gROOT->FindObject("pidSummary");
-  cPid = new TCanvas("pidSummary", "PID summary for the ESD task", 1600, 1200);
-  cPid->cd();
-  //GetRefFigure(6);
-  if(PlotPidSummary(0, trendValues))
-    cPid->SaveAs("pidSummary.gif");
-
-  TCanvas* cCent=0x0;
-  if(gROOT->FindObject("centSummary")) delete gROOT->FindObject("centSummary");
-  cCent = new TCanvas("centSummary", "Centrality summary for the ESD task", 1600, 1200);
-  cCent->cd();
-  //GetRefFigure(7);
-  if(PlotCentSummary(trendValues))
-    cCent->SaveAs("centSummary.gif");
+  if(trendValues)
+    for(Int_t i=0;i<50;++i) cout << "trend #" << i << " :: " << trendValues[i] << endl;
 }
 
-//____________________________________________________________________
-Bool_t AliTRDcheckESD::GetRefFigure(Int_t ifig)
-{
-  //
-  // Produce reference Plots during PostProcessing
-  //
-  if(ifig>=fNRefFigures){
-    AliWarning(Form("Ref plot %d not available. Valid only up to %d", ifig, fNRefFigures));
-    return kFALSE;
-  }
-  if(!gPad){
-    AliWarning("Please provide a canvas to draw results.");
-    return kFALSE;
-  } else {
-    gPad->SetLogx(0);gPad->SetLogy(0);
-    gPad->SetMargin(0.125, 0.015, 0.1, 0.015);
-  }
-
-  const Char_t *title[20];
-  TH1 *hF(NULL);
-  if((hF=(TH1S*)gROOT->FindObject("hFcheckESD"))) delete hF;
-  TLegend *leg(NULL);
-  TList *l(NULL); TVirtualPad *pad(NULL);
-  TGraphErrors *g(NULL);TGraphAsymmErrors *ga(NULL);
-  TObjArray *arr(NULL);
-  TLatex *lat=new TLatex();
-  lat->SetTextSize(0.07);
-  lat->SetTextColor(2);
-  TLine line;
-  TTimeStamp now;
-  switch(ifig){
-  case kNCl: // number of clusters/track
-    if(!(arr = (TObjArray*)fResults->At(kNCl))) return kFALSE;
-
-    leg = new TLegend(.83, .7, .99, .96);
-    leg->SetHeader("Species");
-    leg->SetBorderSize(0); leg->SetFillStyle(0);
-    for(Int_t ig(0); ig<fgkNgraph[kNCl-1]; ig++){
-      if(!(g = (TGraphErrors*)arr->At(ig))) return kFALSE;
-      if(!g->GetN()) continue;
-      g->Draw(ig?"pc":"apc"); leg->AddEntry(g, g->GetTitle(), "pl");
-      if(ig) continue;
-      hF=g->GetHistogram();
-      hF->SetXTitle("no of clusters");
-      hF->SetYTitle("entries"); 
-      hF->GetYaxis()->CenterTitle(1);
-      hF->GetYaxis()->SetTitleOffset(1.2);
-      hF->SetMinimum(5);
-    }
-    leg->Draw(); gPad->SetLogy();
-    break;
-  case kTRDstat: // Efficiency
-    if(!(arr = (TObjArray*)fResults->At(kTRDstat))) return kFALSE;
-    leg = new TLegend(.62, .77, .98, .98);
-    leg->SetHeader("TRD Efficiency");
-    leg->SetBorderSize(0); leg->SetFillStyle(0);
-    title[0] = "Geometrical (TRDin/TPCout)";
-    title[1] = "Tracking (TRDout/TRDin)";
-    title[2] = "PID (TRDpid/TRDin)";
-    title[3] = "Refit (TRDrefit/TRDin)";
-    hF = new TH1S("hFcheckESD", ";p [GeV/c];Efficiency", 10, 0.1, 10.);
-    hF->SetMaximum(1.4);
-    hF->GetXaxis()->SetMoreLogLabels();
-    hF->GetYaxis()->CenterTitle(1);
-    hF->Draw("p");
-    for(Int_t ig(0); ig<fgkNgraph[kTRDstat-1]; ig++){
-      if(!(g = (TGraphErrors*)arr->At(ig))) return kFALSE;
-      g->Draw("pl"); leg->AddEntry(g, title[ig], "pl");
-      //PutTrendValue(name[id], g->GetMean(2));
-      //PutTrendValue(Form("%sRMS", name[id]), g->GetRMS(2));
-    }
-    leg->Draw(); gPad->SetLogx();
-    break;
-  case kTRDmom: // Energy loss
-    if(!(arr = (TObjArray*)fResults->At(kTRDmom))) return kFALSE;
-    leg = new TLegend(.65, .7, .95, .99);
-    leg->SetHeader("Energy Loss");
-    leg->SetBorderSize(1); leg->SetFillColor(0);
-    title[0] = "Max & 90% quantile";
-    title[1] = "Mean & 60% quantile";
-    hF = new TH1S("hFcheckESD", ";layer;#Delta E", 6, -0.5, 5.5);
-    hF->SetMaximum(1.3);hF->SetMinimum(-.3);
-    hF->Draw("p");
-    for(Int_t ig(0); ig<fgkNgraph[kTRDmom-1]; ig++){
-      if(!(ga = (TGraphAsymmErrors*)arr->At(ig))) return kFALSE;
-      ga->Draw("pl"); leg->AddEntry(ga, title[ig], "pl");
-      //PutTrendValue(name[id], g->GetMean(2));
-      //PutTrendValue(Form("%sRMS", name[id]), g->GetRMS(2));
-    }
-    leg->Draw();gPad->SetLogx(kFALSE);
-    break;
-  case kPtRes: // Pt resolution @ vertex
-    if(!(arr = (TObjArray*)fResults->At(kPtRes))) return kFALSE;
-    gPad->Divide(2, 1, 1.e-5, 1.e-5); l=gPad->GetListOfPrimitives(); 
-    pad = ((TVirtualPad*)l->At(0)); pad->cd(); pad->SetLogx();
-    pad->SetMargin(0.1, 0.022, 0.1, 0.023);
-    hF = new TH1S("hFcheckESD", "ITS+TPC+TRD;p_{t} [GeV/c];#Delta p_{t} / p_{t} [%]", 10, 0.2, 10.);
-    hF->SetMaximum(10.);hF->SetMinimum(-3.);
-    hF->GetXaxis()->SetMoreLogLabels();
-    hF->GetXaxis()->SetTitleOffset(1.2);
-    hF->GetYaxis()->CenterTitle();
-    hF->Draw("p");
-    //for(Int_t ig(0); ig<fgkNgraph[kPtRes-1]/2; ig++){
-    for(Int_t ig(2); ig<6; ig++){
-      if(!(g = (TGraphErrors*)arr->At(ig))) continue;
-      if(!g->GetN()) continue;
-      g->Draw("pl");
-      //PutTrendValue(name[id], g->GetMean(2));
-      //PutTrendValue(Form("%sRMS", name[id]), g->GetRMS(2));
-    }
-    pad = ((TVirtualPad*)l->At(1)); pad->cd(); pad->SetLogx();
-    pad->SetMargin(0.1, 0.22, 0.1, 0.023);
-    hF = (TH1*)hF->Clone("hFcheckESD1");
-    hF->SetTitle("ITS+TPC");
-    hF->SetMaximum(10.);hF->SetMinimum(-3.);
-    hF->Draw("p");
-    leg = new TLegend(.78, .1, .99, .98);
-    leg->SetHeader("P_{t} @ DCA");
-    leg->SetBorderSize(1); leg->SetFillColor(0);
-    leg->SetTextAlign(22);
-    leg->SetTextFont(12);
-    leg->SetTextSize(0.03813559);
-    {
-      Int_t nPlots(0);
-      //for(Int_t ig(fgkNgraph[kPtRes-1]/2); ig<fgkNgraph[kPtRes-1]; ig++){
-      for(Int_t ig(12); ig<16; ig++){
-        if(!(g = (TGraphErrors*)arr->At(ig))) continue;
-        if(!g->GetN()) continue;
-        nPlots++;
-        g->Draw("pl"); leg->AddEntry(g, g->GetTitle(), "pl");
-        //PutTrendValue(name[id], g->GetMean(2));
-        //PutTrendValue(Form("%sRMS", name[id]), g->GetRMS(2));
-      }
-      if(nPlots) leg->Draw();
-    }
-    break;
-  case 5: // plot a 3x3 canvas with tracking related histograms
-    PlotTrackingSummary(0);
-    break;
-    
-  case 6: // plot a 3x3 canvas with PID related histograms
-    PlotPidSummary(0);
-    break;
-
-  case 7: // plot a 3x3 canvas with centrality dependence histograms
-    PlotCentSummary();
-    break;
-
-  }
-  return kTRUE;
-}
 
 //____________________________________________________________________
 void AliTRDcheckESD::UserExec(Option_t *){
@@ -477,318 +334,166 @@ void AliTRDcheckESD::UserExec(Option_t *){
     }
   }
   if(!isSelected) return;
-  
+
   TString triggerClasses = fESD->GetFiredTriggerClasses();
-  //cout << "triggers fired:  " << triggerClasses.Data() << endl;
+  //cout << "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++triggers fired:  " << triggerClasses.Data() << endl;
   TObjArray* triggers = triggerClasses.Tokenize(" ");
-  if(triggers->GetEntries()<1) return;
+  TObjArray* userTriggers = fUserEnabledTriggers.Tokenize(";");
+  if(triggers->GetEntries()<1) {delete triggers; delete userTriggers; return;}
+  Bool_t hasGoodTriggers = kFALSE;
   Int_t triggerIndices[kNMaxAssignedTriggers] = {0};
+  Int_t nTrigFired=0;
+  Bool_t trigAlreadyChecked = kFALSE;
+  Bool_t trigSelected = kFALSE;
+  Int_t trigIdx = 0;
   for(Int_t i=0; i<triggers->GetEntries(); ++i) {
-    //cout << "check trigger " << triggers->At(i)->GetName() << endl;
+    TString trigStr=triggers->At(i)->GetName();
+    if(!trigStr.Contains("NOTRD") && !trigStr.Contains("MUON")) hasGoodTriggers = kTRUE;    // check wheter TRD was read out in this event
+    if(trigStr.Contains("NOTRD")) continue;
+    if(trigStr.Contains("MUON")) continue;
     if(i>=kNMaxAssignedTriggers) continue;
-    triggerIndices[i] = GetTriggerIndex(triggers->At(i)->GetName(), kFALSE);
-  }  
-  if(!fNAssignedTriggers) {
-    triggerIndices[0] = 1;
-    ((TH1F*)fHistos->At(kTriggerDefs))->Fill(triggerIndices[0]);
+    
+    hasGoodTriggers = kTRUE;
+    // enable the "All triggers" bit
+    trigIdx = 1;
+    trigAlreadyChecked = kFALSE;
+    for(Int_t k=0;k<nTrigFired;++k) 
+      if(triggerIndices[k]==trigIdx) {
+       trigAlreadyChecked = kTRUE;
+       break;
+    }
+    if(!trigAlreadyChecked) triggerIndices[nTrigFired++] = trigIdx;  
+    
+    trigSelected = kFALSE;
+    // check whether this trigger matches any of the user defined trigger families
+    for(Int_t j=0;j<userTriggers->GetEntries();++j) {
+      TString userTrigStr=userTriggers->At(j)->GetName();
+      if(trigStr.Contains(userTrigStr.Data())) {
+       trigSelected = kTRUE;
+       trigIdx = GetTriggerIndex(userTrigStr.Data(), kFALSE);
+       trigAlreadyChecked = kFALSE;
+       for(Int_t k=0;k<nTrigFired;++k) 
+         if(triggerIndices[k]==trigIdx) {
+           trigAlreadyChecked = kTRUE;
+           break;
+         }
+       if(!trigAlreadyChecked) {    // add trigger to the list of enabled triggers only if it was not added already
+         triggerIndices[nTrigFired++] = trigIdx;  
+       }
+      }
+    }
+    
+    trigIdx = GetTriggerIndex(trigStr.Data(), kFALSE);
+    if(trigIdx>0) trigSelected = kTRUE;
+    if(trigIdx==-1) trigIdx=1;  
+    trigAlreadyChecked = kFALSE;
+    for(Int_t k=0;k<nTrigFired;++k) 
+      if(triggerIndices[k]==trigIdx) {
+        trigAlreadyChecked = kTRUE;
+       break;
+      }
+    if(!trigAlreadyChecked) {
+      triggerIndices[nTrigFired++]=1;  // 0-assigned to all other triggers
+    }
+  }  // end loop over triggers  
+  
+  if(!trigSelected && hasGoodTriggers) {
+    triggerIndices[nTrigFired++]=2;
   }
-  else {
-    for(Int_t i=0; i<triggers->GetEntries(); ++i) 
-      ((TH1F*)fHistos->At(kTriggerDefs))->Fill(triggerIndices[i]);
+  
+  TH1F* hTrig = (TH1F*)fHistos->FindObject("hTriggerDefs");
+  for(Int_t i=0; i<nTrigFired; ++i)
+    hTrig->Fill(triggerIndices[i]);
+
+  if(!hasGoodTriggers) {
+    PostData(1, fHistos);
+    delete triggers;
+    delete userTriggers;
+    return;
   }
   
+  Int_t* trigFiredIdx=new Int_t[nTrigFired];
+  for(Int_t i=0;i<nTrigFired;++i) trigFiredIdx[i] = triggerIndices[i];
+  
   // Get MC information if available
-  AliStack * fStack = NULL;
+  //AliStack * fStack = NULL;
   if(HasMC()){
     if(!fMC){ 
       AliWarning("MC event missing");
       SetMC(kFALSE);
     } else {
-      if(!(fStack = fMC->Stack())){
+      if(!fMC->Stack()){
         AliWarning("MC stack missing");
         SetMC(kFALSE);
       }
     }
   }
-  TH1 *h(NULL);
   
   Double_t values[kNTrdCfVariables];      // array where the CF container variables are stored
-  values[kEventVtxZ] = fESD->GetPrimaryVertex()->GetZv();
-  values[kEventBC] = fESD->GetBunchCrossNumber();
+  for(Int_t i=0;i<kNTrdCfVariables; ++i) values[i] = -999.;
+  FillEventInfo(values);  
   
-  const AliMultiplicity* mult=fESD->GetMultiplicity();
-  Double_t itsNTracklets = mult->GetNumberOfTracklets();
-  if(itsNTracklets<1) return;
   Int_t multLimits[6] = {0, 700, 1400, 2100, 2800, 3500};
   Int_t centralityClass = 0;
   for(Int_t iCent=0; iCent<5; ++iCent) {
-    if(itsNTracklets>=multLimits[iCent] && itsNTracklets<multLimits[iCent+1])
+    if(values[kEventMult]>=multLimits[iCent] && values[kEventMult]<multLimits[iCent+1])
       centralityClass=iCent+1;
   }
-  values[kEventMult] = itsNTracklets;
   if(centralityClass == 0) return;
   
-  Double_t* valuesMatchingPhiEtaCF = new Double_t[fMatchingPhiEtaCF->GetNVar()];
-  Double_t* valuesMatchingPtCF = new Double_t[fMatchingPtCF->GetNVar()];
-  Double_t* valuesBCCF = new Double_t[fBunchCrossingsCF->GetNVar()];
-  Double_t* valuesCentCF = new Double_t[fCentralityCF->GetNVar()];
-  Double_t* valuesQtotCF = new Double_t[fQtotCF->GetNVar()];
-  Double_t* valuesPHCF = new Double_t[fPulseHeightCF->GetNVar()];
-  Double_t* valuesExpertCF = (fExpertCF ? new Double_t[fExpertCF->GetNVar()] : 0x0);
+  // radius of TRD entrance plane in each layer
+  Double_t rTRD[6] = {298.0, 311.0, 324.0, 337.0, 350.0, 363.0};
   
   AliESDtrack *esdTrack(NULL);
   for(Int_t itrk = 0; itrk < fESD->GetNumberOfTracks(); itrk++){
     esdTrack = fESD->GetTrack(itrk);
-    if(!fReferenceTrackFilter->IsSelected(esdTrack)) continue;
     
-    ULong_t status = esdTrack->GetStatus(); //PrintStatus(status);
-            
-    // pid quality
-    Bool_t kBarrel = Bool_t(status & AliESDtrack::kTRDin);
-
+    Bool_t stepSelections[kNSteps]; 
+    for(Int_t is=0;is<kNSteps;++is) {
+      stepSelections[is] = IsTrackSelected(esdTrack, values, is);
+    }
+    if(!stepSelections[0]) continue;
+    
+    FillTrackInfo(values, esdTrack);
+    
     // find position and momentum of the track at entrance in TRD
-    Double_t rTRD[6] = {298.0, 311.0, 324.0, 337.0, 350.0, 363.0};
+    const AliExternalTrackParam *outerParam = esdTrack->GetOuterParam();
     Double_t localCoord[6][3] = {{0.0}};
     Bool_t localCoordGood[6];
-    for(Int_t il=0;il<6;++il) localCoordGood[il] = esdTrack->GetXYZAt(rTRD[il], fESD->GetMagneticField(), localCoord[il]);
+    for(Int_t il=0;il<6;++il) 
+      localCoordGood[il] = (outerParam ? outerParam : esdTrack)->GetXYZAt(rTRD[il], fESD->GetMagneticField(), localCoord[il]);  
     Double_t localMom[6][3] = {{0.0}};
     Bool_t localMomGood[6];
-    for(Int_t il=0; il<6; ++il) localMomGood[il] = esdTrack->GetPxPyPzAt(rTRD[il], fESD->GetMagneticField(), localMom[il]);
-    //Double_t localPhi = (localMomGood ? TMath::ATan2(localMom[1], localMom[0]) : 0.0);
+    for(Int_t il=0; il<6; ++il) 
+      localMomGood[il] = (outerParam ? outerParam : esdTrack)->GetPxPyPzAt(rTRD[il], fESD->GetMagneticField(), localMom[il]);
     Double_t localSagitaPhi[6] = {-999.};
-    for(Int_t il=0; il<6; ++il) localSagitaPhi[il] = (localCoordGood[il] ? TMath::ATan2(localCoord[il][1], localCoord[il][0]) : -999.);
-
-    values[kTrackTOFBC]      = esdTrack->GetTOFBunchCrossing(fESD->GetMagneticField());
-    Float_t dcaXY=0.0; Float_t dcaZ=0.0;
-    esdTrack->GetImpactParameters(dcaXY, dcaZ);
-    values[kTrackDCAxy]  = dcaXY;
-    values[kTrackDCAz]   = dcaZ;
-    values[kTrackCharge] = esdTrack->Charge();
-    values[kTrackPhi]    = localSagitaPhi[0];
-    values[kTrackEta]    = esdTrack->Eta();
-    values[kTrackPt]     = esdTrack->Pt();
-    values[kTrackP]      = esdTrack->P();
-    values[kTrackTrdTracklets] = esdTrack->GetTRDntracklets();
-    values[kTrackTrdClusters] = esdTrack->GetTRDncls();
-    for(Int_t i=0; i<6; ++i) values[kTrackQtot+i] = 0.0;
-        
-    if(localCoordGood[0] && localMomGood[0]) {
-      for(Int_t itrig=0; itrig<triggers->GetEntries(); ++itrig) {
-       values[kEventTrigger] = triggerIndices[itrig];
-       if((fMatchingPhiEtaCF->GetVar("trigger")<0 && itrig==0) || (fMatchingPhiEtaCF->GetVar("trigger")>=0)) {
-         for(Int_t iv=0; iv<fMatchingPhiEtaCF->GetNVar(); ++iv) valuesMatchingPhiEtaCF[iv] = values[fMatchingPhiEtaCFVars[iv]];
-         fMatchingPhiEtaCF->Fill(valuesMatchingPhiEtaCF, 0);
-       }
-       if((fMatchingPtCF->GetVar("trigger")<0 && itrig==0) || (fMatchingPtCF->GetVar("trigger")>=0)) {
-         for(Int_t iv=0; iv<fMatchingPtCF->GetNVar(); ++iv) valuesMatchingPtCF[iv] = values[fMatchingPtCFVars[iv]];
-         fMatchingPtCF->Fill(valuesMatchingPtCF, 0);
-       }
-       if(values[kTrackPt]>1.0 && values[kTrackPt]<3.0)
-         if((fBunchCrossingsCF->GetVar("trigger")<0 && itrig==0) || (fBunchCrossingsCF->GetVar("trigger")>=0)) {
-           for(Int_t iv=0; iv<fBunchCrossingsCF->GetNVar(); ++iv) valuesBCCF[iv] = values[fBunchCrossingsCFVars[iv]];
-           fBunchCrossingsCF->Fill(valuesBCCF, 0);
-         }
-       if(fExpertCF) {
-         if((fExpertCF->GetVar("trigger")<0 && itrig==0) || (fExpertCF->GetVar("trigger")>=0))
-           if(fExpertCF->GetStep("TPC")>=0 && fExpertCF->GetStep("TPC")<3) {
-             for(Int_t iv=0; iv<fExpertCF->GetNVar(); ++iv) valuesExpertCF[iv] = values[fExpertCFVars[iv]];
-             fExpertCF->Fill(valuesExpertCF, fExpertCF->GetStep("TPC"));
-           }
-       }
-      }
-    }
-            
-    // TRD reference tracks
-    if(values[kTrackTrdTracklets]>=1) {
-      // (slicePH,sliceNo) distribution and Qtot from slices
-      for(Int_t iPlane=0; iPlane<6; iPlane++) {
-        values[kTrackQtot+iPlane] = fgkQs*esdTrack->GetTRDslice(iPlane, 0);
-       values[kTrackPhi] = localSagitaPhi[iPlane];
-       for(Int_t itrig=0; itrig<triggers->GetEntries(); ++itrig) {
-         values[kEventTrigger] = triggerIndices[itrig];
-         if((fCentralityCF->GetVar("trigger")<0 && itrig==0) || (fCentralityCF->GetVar("trigger")>=0)) {
-           for(Int_t iv=0; iv<fCentralityCF->GetNVar(); ++iv) valuesCentCF[iv] = values[fCentralityCFVars[iv]];
-           valuesCentCF[fCentralityCF->GetNVar()-1] = values[kTrackQtot+iPlane];
-           fCentralityCF->Fill(valuesCentCF, 0);
-         }
-         if(values[kTrackTrdTracklets]>=4)
-           if((fQtotCF->GetVar("trigger")<0 && itrig==0) || (fQtotCF->GetVar("trigger")>=0)) {
-             for(Int_t iv=0; iv<fQtotCF->GetNVar()-2; ++iv) valuesQtotCF[iv] = values[fQtotCFVars[iv]];
-             valuesQtotCF[fQtotCF->GetNVar()-2] = values[kTrackQtot+iPlane];
-             valuesQtotCF[fQtotCF->GetNVar()-1] = iPlane;
-             fQtotCF->Fill(valuesQtotCF, 0);
-           }
-       }
-        for(Int_t iSlice=0; iSlice<8; iSlice++) {
-         if(esdTrack->GetTRDslice(iPlane, iSlice)>20.) {
-           values[kTrackPHslice+iSlice] =  fgkQs*esdTrack->GetTRDslice(iPlane, iSlice);
-           h = (TH2F*)fHistos->At(kPHSlice); h->Fill(iSlice, values[kTrackPHslice+iSlice]);
-           h = (TH2F*)fHistos->At(kPHSlice+centralityClass); h->Fill(iSlice, values[kTrackPHslice+iSlice]);
-           for(Int_t itrig=0; itrig<triggers->GetEntries(); ++itrig) {
-             values[kEventTrigger] = triggerIndices[itrig];
-             if((fPulseHeightCF->GetVar("trigger")<0 && itrig==0) || (fPulseHeightCF->GetVar("trigger")>=0)) {
-               for(Int_t iv=0; iv<fPulseHeightCF->GetNVar()-2; ++iv) valuesPHCF[iv] = values[fPulseHeightCFVars[iv]];
-               valuesPHCF[fPulseHeightCF->GetNVar()-2] = values[kTrackPHslice+iSlice];
-               valuesPHCF[fPulseHeightCF->GetNVar()-1] = iSlice;
-               fPulseHeightCF->Fill(valuesPHCF, 0);
-             }
-           }
-         }
-       }
-      }
-      values[kTrackPhi] = localSagitaPhi[0];
-            
-      if(localCoordGood[0] && localMomGood[0]) {
-       for(Int_t itrig=0; itrig<triggers->GetEntries(); ++itrig) {
-         values[kEventTrigger] = triggerIndices[itrig];
-         if((fMatchingPhiEtaCF->GetVar("trigger")<0 && itrig==0) || (fMatchingPhiEtaCF->GetVar("trigger")>=0)) {
-           for(Int_t iv=0; iv<fMatchingPhiEtaCF->GetNVar(); ++iv) valuesMatchingPhiEtaCF[iv] = values[fMatchingPhiEtaCFVars[iv]];
-           fMatchingPhiEtaCF->Fill(valuesMatchingPhiEtaCF, 1);
-         }
-         if((fMatchingPtCF->GetVar("trigger")<0 && itrig==0) || (fMatchingPtCF->GetVar("trigger")>=0)) {
-           for(Int_t iv=0; iv<fMatchingPtCF->GetNVar(); ++iv) valuesMatchingPtCF[iv] = values[fMatchingPtCFVars[iv]];
-           fMatchingPtCF->Fill(valuesMatchingPtCF, 1);
-         }
-         if(values[kTrackPt]>1.0 && values[kTrackPt]<3.0)
-           if((fBunchCrossingsCF->GetVar("trigger")<0 && itrig==0) || (fBunchCrossingsCF->GetVar("trigger")>=0)) {
-             for(Int_t iv=0; iv<fBunchCrossingsCF->GetNVar(); ++iv) valuesBCCF[iv] = values[fBunchCrossingsCFVars[iv]];
-             fBunchCrossingsCF->Fill(valuesBCCF, 1);
-           }
-         if(fExpertCF) {
-           if((fExpertCF->GetVar("trigger")<0 && itrig==0) || (fExpertCF->GetVar("trigger")>=0)) {
-             if(fExpertCF->GetStep("TRD")>=0 && fExpertCF->GetStep("TRD")<3) {
-               for(Int_t iv=0; iv<fExpertCF->GetNVar(); ++iv) valuesExpertCF[iv] = values[fExpertCFVars[iv]];
-               fExpertCF->Fill(valuesExpertCF, fExpertCF->GetStep("TRD"));
-             }
-           }
-         } 
-       }
-        if(Bool_t(status & AliESDtrack::kTOFpid)) {
-         for(Int_t itrig=0; itrig<triggers->GetEntries(); ++itrig) {
-           values[kEventTrigger] = triggerIndices[itrig];
-           if((fMatchingPhiEtaCF->GetVar("trigger")<0 && itrig==0) || (fMatchingPhiEtaCF->GetVar("trigger")>=0)) {
-             for(Int_t iv=0; iv<fMatchingPhiEtaCF->GetNVar(); ++iv) valuesMatchingPhiEtaCF[iv] = values[fMatchingPhiEtaCFVars[iv]];
-             fMatchingPhiEtaCF->Fill(valuesMatchingPhiEtaCF, 2);
-           }
-           if((fMatchingPtCF->GetVar("trigger")<0 && itrig==0) || (fMatchingPtCF->GetVar("trigger")>=0)) {
-             for(Int_t iv=0; iv<fMatchingPtCF->GetNVar(); ++iv) valuesMatchingPtCF[iv] = values[fMatchingPtCFVars[iv]];
-             fMatchingPtCF->Fill(valuesMatchingPtCF, 2);
-           }
-           if(values[kTrackPt]>1.0 && values[kTrackPt]<3.0)
-             if((fBunchCrossingsCF->GetVar("trigger")<0 && itrig==0) || (fBunchCrossingsCF->GetVar("trigger")>=0)) {
-               for(Int_t iv=0; iv<fBunchCrossingsCF->GetNVar(); ++iv) valuesBCCF[iv] = values[fBunchCrossingsCFVars[iv]];
-               fBunchCrossingsCF->Fill(valuesBCCF, 2);
-             }
-           if(fExpertCF) {
-             if((fExpertCF->GetVar("trigger")<0 && itrig==0) || (fExpertCF->GetVar("trigger")>=0)) {
-               if(fExpertCF->GetStep("TOF")>=0 && fExpertCF->GetStep("TOF")<3) {
-                 for(Int_t iv=0; iv<fExpertCF->GetNVar(); ++iv) valuesExpertCF[iv] = values[fExpertCFVars[iv]];
-                 fExpertCF->Fill(valuesExpertCF, fExpertCF->GetStep("TOF"));
-               }
-             }
-           }
-         }
-       }
-      }
-    }  // end if nTRDtrkl>=1
+    for(Int_t il=0; il<6; ++il) 
+      localSagitaPhi[il] = (localCoordGood[il] ? TMath::ATan2(localCoord[il][1], localCoord[il][0]) : -999.);
+    if(!localMomGood[0]) continue;
     
-    // look at external track param
-    const AliExternalTrackParam *op = esdTrack->GetOuterParam();
-    const AliExternalTrackParam *ip = esdTrack->GetInnerParam();
-
-    Double_t pt(0.), pt0(0.), ptTRD(0.); 
-    // read MC info if available
-    Bool_t kFOUND(kFALSE), kPhysPrim(kFALSE);
-    AliMCParticle *mcParticle(NULL);
-    if(HasMC()){
-      AliTrackReference *ref(NULL); 
-      Int_t fLabel(esdTrack->GetLabel());
-      Int_t fIdx(TMath::Abs(fLabel));
-      if(!fStack || fIdx > fStack->GetNtrack()) continue; 
+    FillTrackletInfo(values, esdTrack, 0, localSagitaPhi, localMom, localMomGood);
+        
+    for(Int_t itrig=0; itrig<nTrigFired; ++itrig) {
+      values[kEventTrigger] = Double_t(trigFiredIdx[itrig]);
       
-      // read MC particle 
-      if(!(mcParticle = (AliMCParticle*) fMC->GetTrack(fIdx))) {
-        AliWarning(Form("MC particle missing. Label[ %d].", fLabel));
-        continue;
-      }
-  
-      pt   = esdTrack->Pt();
-      pt0  = mcParticle->Pt();
-      //Double_t eta0 = mcParticle->Eta();
-      //Double_t phi0 = mcParticle->Phi();
-      kPhysPrim = fMC->IsPhysicalPrimary(fIdx);
-
-      // read track references
-      Int_t nRefs = mcParticle->GetNumberOfTrackReferences();
-      if(!nRefs){
-        AliWarning(Form("No TR found for track @ Label[%d].", fLabel));
-        continue;
-      }
-      Int_t iref = 0;
-      while(iref<nRefs){
-        ref = mcParticle->GetTrackReference(iref);
-        if(ref->LocalX() > fgkxTPC) break;
-        ref=NULL; iref++;
-      }
-      if(ref){ 
-        if(ref->LocalX() > fgkxTOF){ // track skipping TRD fiducial volume
-          ref = mcParticle->GetTrackReference(TMath::Max(iref-1, 0));
-        }
-      } else { // track stopped in TPC 
-        ref = mcParticle->GetTrackReference(TMath::Max(iref-1, 0));
-      }
-      ptTRD = ref->Pt();kFOUND=kTRUE;
-    } else { // use reconstructed values
-      if(op){
-        Double_t x(op->GetX());
-        if(x<fgkxTOF && x>fgkxTPC){
-          ptTRD=op->Pt();
-          kFOUND=kTRUE;
-        }
-      }
-
-      if(!kFOUND && ip){
-        ptTRD=ip->Pt();
-        kFOUND=kTRUE;
-      }
-    }     // end if(HasMC())
-
-    if(kFOUND){
-      h = (TH2I*)fHistos->At(kTRDstat);
-      if(status & AliESDtrack::kTPCout) h->Fill(ptTRD, kTPCout);
-      if(status & AliESDtrack::kTRDin) h->Fill(ptTRD, kTRDin);
-      if(kBarrel && (status & AliESDtrack::kTRDout)) h->Fill(ptTRD, kTRDout);
-      if(kBarrel && (status & AliESDtrack::kTRDpid)) h->Fill(ptTRD, kTRDpid);
-      if(kBarrel && (status & AliESDtrack::kTRDrefit)) h->Fill(ptTRD, kTRDref);
-    }
-    Int_t idx(HasMC() ? Pdg2Idx(TMath::Abs(mcParticle->PdgCode())): 0)
-         ,sgn(esdTrack->Charge()<0?0:1);
-    if(kBarrel && kPhysPrim) {
-      TH3 *h3 = (TH3S*)fHistos->At(kPtRes);
-      Int_t offset = (status & AliESDtrack::kTRDrefit) ? 0 : 10; 
-      h3->Fill(pt0, 1.e2*(pt/pt0-1.), 
-        offset + 2*idx + sgn);
-    }
-    ((TH1*)fHistos->At(kNCl))->Fill(esdTrack->GetTRDncls(), 2*idx + sgn);
-    if(ip){
-      h = (TH2I*)fHistos->At(kTRDmom);
-      Float_t pTRD(0.);
-      for(Int_t ily=6; ily--;){
-        if((pTRD=esdTrack->GetTRDmomentum(ily))<0.) continue;
-        h->Fill(ip->GetP()-pTRD, ily);
-      }
-    }
+      // check if cf needs tracklet or slice info
+      FillGlobalTrackContainers(values, stepSelections, itrig);
+      
+      for(Int_t iPlane=0; iPlane<6; iPlane++) {
+        FillTrackletInfo(values, esdTrack, iPlane, localSagitaPhi, localMom, localMomGood);
+       if(values[kTrackletQtot]>20.0) FillTrdTrackletContainers(values, stepSelections, itrig);
+       
+       for(Int_t iSlice=0; iSlice<8; iSlice++) {
+         FillTrackletSliceInfo(values, esdTrack, iSlice);
+         if(values[kTrackletPHslice]>20.0) FillTrdSliceContainers(values, stepSelections, itrig);
+       }  // end loop over slices
+      }  // end loop over TRD layers
+    }  // end loop over triggers
   }  // end loop over tracks
   
-  
-  
-  delete [] valuesMatchingPhiEtaCF;
-  delete [] valuesMatchingPtCF;
-  delete [] valuesBCCF;
-  delete [] valuesCentCF;
-  delete [] valuesQtotCF;
-  delete [] valuesPHCF;
-  if(valuesExpertCF) delete [] valuesExpertCF;
+  delete triggers;
+  delete userTriggers;
+  delete [] trigFiredIdx;  
   
   PostData(1, fHistos);
 }
@@ -796,460 +501,20 @@ void AliTRDcheckESD::UserExec(Option_t *){
 //____________________________________________________________________
 TObjArray* AliTRDcheckESD::Histos()
 {
-// Retrieve histograms array if already build or build it
-
-  if(fHistos) return fHistos;
-
-  fHistos = new TObjArray(kNhistos+1);
-  fHistos->SetOwner(kTRUE);
-
-  TH1 *h = NULL;
-
-  // clusters per track
-  const Int_t kNpt(30);
-  Float_t pt(0.2);
-  Float_t binsPt[kNpt+1];
-  for(Int_t i=0;i<kNpt+1; i++,pt+=(TMath::Exp(i*i*.001)-1.)) binsPt[i]=pt;
-  if(!(h = (TH2I*)gROOT->FindObject("hNCl"))){
-    h = new TH2I("hNCl", "Clusters per TRD track;N_{cl}^{TRD};SPECIES;entries", 60, 0., 180., 10, -0.5, 9.5);
-    TAxis *ay(h->GetYaxis());
-    ay->SetLabelOffset(0.015);
-    for(Int_t i(0); i<AliPID::kSPECIES; i++){
-      ay->SetBinLabel(2*i+1, Form("%s^{-}", AliPID::ParticleLatexName(i)));
-      ay->SetBinLabel(2*i+2, Form("%s^{+}", AliPID::ParticleLatexName(i)));
-    }
-  } else h->Reset();
-  fHistos->AddAt(h, kNCl); fNRefFigures++;
-
-  // status bits histogram
-  const Int_t kNbits(5);
-  Float_t bits(.5);
-  Float_t binsBits[kNbits+1];
-  for(Int_t i=0; i<kNbits+1; i++,bits+=1.) binsBits[i]=bits;
-  if(!(h = (TH2I*)gROOT->FindObject("hTRDstat"))){
-    h = new TH2I("hTRDstat", "TRD status bits;p_{t} @ TRD [GeV/c];status;entries", kNpt, binsPt, kNbits, binsBits);
-    TAxis *ay(h->GetYaxis());
-    ay->SetBinLabel(1, "kTPCout");
-    ay->SetBinLabel(2, "kTRDin");
-    ay->SetBinLabel(3, "kTRDout");
-    ay->SetBinLabel(4, "kTRDpid");
-    ay->SetBinLabel(5, "kTRDrefit");
-  } else h->Reset();
-  fHistos->AddAt(h, kTRDstat);
-
-  // energy loss
-  if(!(h = (TH2I*)gROOT->FindObject("hTRDmom"))){
-    h = new TH2I("hTRDmom", "TRD energy loss;p_{inner} - p_{ly} [GeV/c];ly;entries", 100, -1., 2., 6, -0.5, 5.5);
-  } else h->Reset();
-  fHistos->AddAt(h, kTRDmom);
-  //if(!HasMC()) return fHistos;
-
-  // pt resolution
-  const Int_t kNdpt(100), kNspec(4*AliPID::kSPECIES);
-  Float_t dpt(-3.), spec(-0.5);
-  Float_t binsDPt[kNdpt+1], binsSpec[kNspec+1];
-  for(Int_t i=0; i<kNdpt+1; i++,dpt+=6.e-2) binsDPt[i]=dpt;
-  for(Int_t i=0; i<kNspec+1; i++,spec+=1.) binsSpec[i]=spec;
-  if(!(h = (TH3S*)gROOT->FindObject("hPtRes"))){
-    h = new TH3S("hPtRes", "P_{t} resolution @ DCA;p_{t}^{MC} [GeV/c];#Delta p_{t}/p_{t}^{MC} [%];SPECIES", kNpt, binsPt, kNdpt, binsDPt, kNspec, binsSpec);
-    TAxis *az(h->GetZaxis());
-    az->SetLabelOffset(0.015);
-    for(Int_t i(0); i<AliPID::kSPECIES; i++){
-      az->SetBinLabel(2*i+1, Form("%s^{-}", AliPID::ParticleLatexName(i)));
-      az->SetBinLabel(2*i+2, Form("%s^{+}", AliPID::ParticleLatexName(i)));
-      az->SetBinLabel(10+2*i+1, Form("%s^{-}", AliPID::ParticleLatexName(i)));
-      az->SetBinLabel(10+2*i+2, Form("%s^{+}", AliPID::ParticleLatexName(i)));
-    }
-  } else h->Reset();
-  fHistos->AddAt(h, kPtRes);
-
-  // TPC event vertex distribution
-  if(!(h = (TH1F*)gROOT->FindObject("hTPCVertex"))){
-    h = new TH1F("hTPCVertex", "Event vertex Z coord. from TPC tracks", 100, -25., 25.);
-  } else h->Reset();
-  fHistos->AddAt(h, kTPCVertex);
-  
-  // Event vertex
-  if(!(h = (TH1F*)gROOT->FindObject("hEventVertex"))){
-    h = new TH1F("hEventVertex", "Event vertex Z coord.", 100, -25., 25.);
-  } else h->Reset();
-  fHistos->AddAt(h, kEventVertex);
-  
-  // Number of all tracks
-  if(!(h = (TH1I*)gROOT->FindObject("hNTracksAll"))){
-    h = new TH1I("hNTracksAll", "Number of tracks per event, event vertex cuts", 5000, 0, 5000);
-  } else h->Reset();
-  fHistos->AddAt(h, kNTracksAll);
-  
-  // Number of tracks in acceptance and DCA cut
-  if(!(h = (TH1I*)gROOT->FindObject("hNTracksAcc"))){
-    h = new TH1I("hNTracksAcc", Form("Number of tracks per event, |#eta|<%.1f, |DCAxy|<%.1f, |DCAz|<%.1f",
-                                    fgkEta, fgkTrkDCAxy, fgkTrkDCAz), 5000, 0, 5000);
-  } else h->Reset();
-  fHistos->AddAt(h, kNTracksAcc);
-  
-  // Number of tracks in TPC (Ncls>10)
-  if(!(h = (TH1I*)gROOT->FindObject("hNTracksTPC"))){
-    h = new TH1I("hNTracksTPC", Form("Number of tracks per event, |#eta|<%.1f, pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                                    fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 5000, 0, 5000);
-  } else h->Reset();
-  fHistos->AddAt(h, kNTracksTPC);
-  
-  // Distribution of DCA-xy
-  if(!(h = (TH1F*)gROOT->FindObject("hDCAxy"))){
-    h = new TH1F("hDCAxy", "Distribution of transverse DCA", 100, -100., 100.);
-  } else h->Reset();
-  fHistos->AddAt(h, kDCAxy);
-  
-  // Distribution of DCA-z
-  if(!(h = (TH1F*)gROOT->FindObject("hDCAz"))){
-    h = new TH1F("hDCAz", "Distribution of longitudinal DCA", 100, -100., 100.);
-  } else h->Reset();
-  fHistos->AddAt(h, kDCAz);
-  
-  Double_t binPtLimits[33] = {0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9,
-                            1.0, 1.1, 1.2, 1.3, 1.4, 
-                            1.6, 1.8, 2.0, 2.2, 2.4, 2.6, 2.8, 3.0,
-                            3.4, 3.8, 4.2, 4.6, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0};
-  // Pt distributions
-  if(!(h = (TH1F*)gROOT->FindObject("hPt1"))){
-    h = new TH1F("hPt1", Form("dN/dpt, |#eta|<%.1f and pt>%.1f", fgkEta, fgkPt), 32, binPtLimits);
-  } else h->Reset();
-  fHistos->AddAt(h, kPt1);
-  
-  if(!(h = (TH1F*)gROOT->FindObject("hPt2"))){
-    h = new TH1F("hPt2", Form("dN/dpt, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f",
-                             fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz), 32, binPtLimits);
-  } else h->Reset();
-  fHistos->AddAt(h, kPt2);
-  
-  if(!(h = (TH1F*)gROOT->FindObject("hPt3pos"))){
-    h = new TH1F("hPt3pos", Form("dN/dpt (positives), |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 32, binPtLimits);
-  } else h->Reset();
-  fHistos->AddAt(h, kPt3pos);
-  
-  if(!(h = (TH1F*)gROOT->FindObject("hPt3neg"))){
-    h = new TH1F("hPt3neg", Form("dN/dpt (negatives), |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 32, binPtLimits);
-  } else h->Reset();
-  fHistos->AddAt(h, kPt3neg);
-  
-  if(!(h = (TH1F*)gROOT->FindObject("hPt4pos"))){
-    h = new TH1F("hPt4pos", Form("dN/dpt (positives), |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq 1",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 32, binPtLimits);
-  } else h->Reset();
-  fHistos->AddAt(h, kPt4pos);
-  
-  if(!(h = (TH1F*)gROOT->FindObject("hPt4neg"))){
-    h = new TH1F("hPt4pos", Form("dN/dpt (negatives), |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq 1",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 32, binPtLimits);
-  } else h->Reset();
-  fHistos->AddAt(h, kPt4neg);
-  
-  // theta distribution of TRD tracks
-  if(!(h = (TH1F*)gROOT->FindObject("hTheta"))){
-    h = new TH1F("hTheta", Form("dN/d#theta, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq 1",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 220,.5,2.7);
-  } else h->Reset();
-  fHistos->AddAt(h, kTheta);
-  
-  // phi distribution of TRD tracks
-  if(!(h = (TH1F*)gROOT->FindObject("hPhi"))){
-    h = new TH1F("hPhi", Form("dN/d#varphi, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq 1",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 157,0,6.28);
-  } else h->Reset();
-  fHistos->AddAt(h, kPhi);
-  
-  // TPC cluster distribution
-  if(!(h = (TH1F*)gROOT->FindObject("hNTPCCl"))){
-    h = new TH1I("hNTPCCl", Form("Number of TPC clusters/track, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz), 160, 0, 160);
-  } else h->Reset();
-  fHistos->AddAt(h, kNTPCCl);
-  
-  if(!(h = (TH1I*)gROOT->FindObject("hNTPCCl2"))){
-    h = new TH1F("hNTPCCl2", Form("Number of TPC clusters/track, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, pt>1.0 GeV/c",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz), 160, 0, 160);
-  } else h->Reset();
-  fHistos->AddAt(h, kNTPCCl2);
-  
-  // dE/dx vs P for TPC reference tracks
-  if(!(h = (TH2F*)gROOT->FindObject("hTPCDedx"))){
-    h = new TH2F("hTPCDedx", Form("TPC dE/dx vs P, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, 0.1,10.1, 150, 0, 150.);
-  } else h->Reset();
-  fHistos->AddAt(h, kTPCDedx);
-  
-  // eta,phi distribution of TPC reference tracks
-  if(!(h = (TH2F*)gROOT->FindObject("hEtaPhi"))){
-    h = new TH2F("hEtaPhi", Form("TPC (#eta,#varphi), |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 50, -1, 1, 157, 0, 6.28);
-  } else h->Reset();
-  fHistos->AddAt(h, kEtaPhi);
-  
-  // Nclusters vs eta distribution for TPC tracks
-  if(!(h = (TH2F*)gROOT->FindObject("hEtaNclsTPC"))){
-    h = new TH2F("hEtaNclsTPC", Form("TPC Nclusters vs. #eta, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz), 50, -1, 1, 160, 0, 160.);
-  } else h->Reset();
-  fHistos->AddAt(h, kEtaNclsTPC);
-  
-  // Nclusters vs phi distribution for TPC reference tracks
-  if(!(h = (TH2F*)gROOT->FindObject("hPhiNclsTPC"))){
-    h = new TH2F("hPhiNclsTPC", Form("TPC Nclusters vs. #varphi, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz), 157, 0, 6.28, 160, 0, 160.);
-  } else h->Reset();
-  fHistos->AddAt(h, kPhiNclsTPC);
-
-  // SPD multiplicity distribution
-  if(!(h = (TH1F*)gROOT->FindObject("hSPDMult"))){
-    h = new TH1F("hSPDMult", "SPD multiplicity", 10000, -0.5, 9999.5);
-  } else h->Reset();
-  fHistos->AddAt(h, kSPDMult);
-
-  // Ntracklets/track vs P for TRD reference tracks
-  Double_t binsP[19] = {0.0, 0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.4, 1.7, 2.0,
-                       2.5, 3.0, 3.5, 4.0, 5.0, 6.0, 7.0, 9.0, 12.0};
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH2F*)gROOT->FindObject(Form("hNTrackletsTRD_cent%d",iCent+1)))){
-      h = new TH2F(Form("hNTrackletsTRD_cent%d",iCent+1), Form("TRD Ntracklets/track vs. P, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                                                              iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 18, binsP, 7, -0.5, 6.5);
-    } else h->Reset();
-    fHistos->AddAt(h, kNTrackletsTRD+iCent);
-  }
-  
-  // Nclusters/track vs P for TRD reference tracks
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH2F*)gROOT->FindObject(Form("hNClsTrackTRD_cent%d",iCent+1)))){
-      h = new TH2F(Form("hNClsTrackTRD_cent%d",iCent+1), Form("TRD Nclusters/track vs. P, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                                                             iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 18, binsP, 300, 0., 300.);
-    } else h->Reset();
-    fHistos->AddAt(h, kNClsTrackTRD+iCent);
-  }  
-
-  // <PH> vs slice number for TRD reference tracklets
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH2F*)gROOT->FindObject(Form("hPHSlice_cent%d",iCent+1)))){
-      h = new TH2F(Form("hPHSlice_cent%d",iCent+1), Form("<PH> vs sliceNo, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                                   iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 8, -0.5, 7.5, 200, 0., 2000.);
-    } else h->Reset();
-    fHistos->AddAt(h, kPHSlice+iCent);
-  }
-
-  // <PH> vs slice number for TRD reference tracklets, from TPC pions
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH2F*)gROOT->FindObject(Form("hPHSliceTPCpions_cent%d",iCent+1)))){
-      h = new TH2F(Form("hPHSliceTPCpions_cent%d",iCent+1), Form("<PH> vs sliceNo, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, TPC pions",
-                                                                iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 8, -0.5, 7.5, 100, 0., 2000.);
-    } else h->Reset();
-    fHistos->AddAt(h, kPHSliceTPCpions+iCent);
-  }
-
-  // TPC dE/dx vs P for TRD reference tracks, pions
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH2F*)gROOT->FindObject(Form("hTPCdedxPions_cent%d",iCent+1)))){
-      h = new TH2F(Form("hTPCdedxPions_cent%d",iCent+1), Form("TPC dE/dx vs P, TPC pions, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                                        iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, 0.1,10.1, 100, 0,100.);
-    } else h->Reset();
-    fHistos->AddAt(h, kTPCdedxPions+iCent);
-  }
-
-  // <PH> vs slice number for TRD reference tracklets, from TPC electrons
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH2F*)gROOT->FindObject(Form("hPHSliceTPCelectrons_cent%d",iCent+1)))){
-      h = new TH2F(Form("hPHSliceTPCelectrons_cent%d",iCent+1), Form("<PH> vs sliceNo, centrality %d,|#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, TPC electrons",
-                                               iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 8, -0.5, 7.5, 100, 0., 2000.);
-    } else h->Reset();
-    fHistos->AddAt(h, kPHSliceTPCelectrons+iCent);
-  }
-
-  // TPC dE/dx vs P for TRD reference tracks, electrons
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH2F*)gROOT->FindObject(Form("hTPCdedxElectrons_cent%d",iCent+1)))){
-      h = new TH2F(Form("hTPCdedxElectrons_cent%d",iCent+1), Form("TPC dE/dx vs P, TPC electrons, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                                            iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, 0.1,10.1, 100, 0,100.);
-    } else h->Reset();
-    fHistos->AddAt(h, kTPCdedxElectrons+iCent);
-  }
-
-  // Qtot vs P for TRD reference tracklets
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH2F*)gROOT->FindObject(Form("hQtotP_cent%d",iCent+1)))){
-      h = new TH2F(Form("hQtotP_cent%d",iCent+1), Form("Qtot(from slices) vs P, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                                 iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 18, binsP, 400, 0., 20);
-    } else h->Reset();
-    fHistos->AddAt(h, kQtotP+iCent);
-  }
-  
-  // (X,Y,momentum) distribution after AliESDtrack::PropagateTo(r=300.)
-  if(!(h = (TH3F*)gROOT->FindObject("hPropagXYvsP"))){
-    h = new TH3F("hPropagXYvsP", Form("(x,y) vs P after AliESDtrack::PropagateTo(r=300.), |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100,-500,500, 100,-500,500, 10, 0.,10.);
-  } else h->Reset();
-  fHistos->AddAt(h, kPropagXYvsP);
-  
-  // (R,Z,momentum) distribution after AliESDtrack::PropagateTo(r=300.)
-  if(!(h = (TH3F*)gROOT->FindObject("hPropagRZvsP"))){
-    h = new TH3F("hPropagRZvsP", Form("(r,z) vs P after AliESDtrack::PropagateTo(r=300.), |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100,-350., 350., 100,0.,500., 10, 0.,10.);
-  } else h->Reset();
-  fHistos->AddAt(h, kPropagRZvsP);
-  
-  Double_t etaBinLimits[101];  
-  for(Int_t i=0; i<101; i++) etaBinLimits[i] = -1.0 + i*2.0/100.;
-  Double_t phiBinLimits[151];
-  for(Int_t i=0; i<151; i++) phiBinLimits[i] = -1.1*TMath::Pi() + i*2.2*TMath::Pi()/150.;
-  // (eta,detector phi,P) distribution of reference TPC positive tracks
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH3F*)gROOT->FindObject(Form("hTPCRefTracksPos_cent%d",iCent+1)))){
-      h = new TH3F(Form("hTPCRefTracksPos_cent%d",iCent+1), Form("(#eta,detector #varphi,p) for TPC positive reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                                           iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, etaBinLimits, 150, phiBinLimits, 32, binPtLimits);
-    } else h->Reset();
-    fHistos->AddAt(h, kTPCRefTracksPos+iCent);
-  }
-  
-  // (eta,detector phi,P) distribution of reference TPC negative tracks
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH3F*)gROOT->FindObject(Form("hTPCRefTracksNeg_cent%d",iCent+1)))){
-      h = new TH3F(Form("hTPCRefTracksNeg_cent%d",iCent+1), Form("(#eta,detector #varphi,p) for TPC negative reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d",
-                                           iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, etaBinLimits, 150, phiBinLimits, 32, binPtLimits);
-    } else h->Reset();
-    fHistos->AddAt(h, kTPCRefTracksNeg+iCent);
-  }
-  
-  // (eta,detector phi,P) distribution of reference TRD positive tracks
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH3F*)gROOT->FindObject(Form("hTRDRefTracksPos_cent%d",iCent+1)))){
-      h = new TH3F(Form("hTRDRefTracksPos_cent%d",iCent+1), Form("(#eta,detector #varphi,p) for TRD positive reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq1",
-                                           iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, etaBinLimits, 150, phiBinLimits, 32, binPtLimits);
-    } else h->Reset();
-    fHistos->AddAt(h, kTRDRefTracksPos+iCent);
-  }
-  
-  // (eta,detector phi,P) distribution of reference TRD negative tracks
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH3F*)gROOT->FindObject(Form("hTRDRefTracksNeg_cent%d",iCent+1)))){
-      h = new TH3F(Form("hTRDRefTracksNeg_cent%d",iCent+1), Form("(#eta,detector #varphi,p) for TRD negative reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq1",
-                                           iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, etaBinLimits, 150, phiBinLimits, 32, binPtLimits);
-    } else h->Reset();
-    fHistos->AddAt(h, kTRDRefTracksNeg+iCent);
-  }
-
-  // (eta,detector phi,P) distribution of reference TRD positive tracks with 4 tracklets
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH3F*)gROOT->FindObject(Form("hTRDRefTracksPos4_cent%d",iCent+1)))){
-      h = new TH3F(Form("hTRDRefTracksPos4_cent%d",iCent+1), Form("(#eta,detector #varphi,p) for TRD positive reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq1",
-                                                                iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, etaBinLimits, 150, phiBinLimits, 32, binPtLimits);
-    } else h->Reset();
-    fHistos->AddAt(h, kTRDRefTracksPos4+iCent);
-  }
-
-  // (eta,detector phi,P) distribution of reference TRD positive tracks with 5 tracklets
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH3F*)gROOT->FindObject(Form("hTRDRefTracksPos5_cent%d",iCent+1)))){
-      h = new TH3F(Form("hTRDRefTracksPos5_cent%d",iCent+1), Form("(#eta,detector #varphi,p) for TRD positive reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq1",
-                                                                 iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, etaBinLimits, 150, phiBinLimits, 32, binPtLimits);
-    } else h->Reset();
-    fHistos->AddAt(h, kTRDRefTracksPos5+iCent);
-  }
-
-  // (eta,detector phi,P) distribution of reference TRD positive tracks with 6 tracklets
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH3F*)gROOT->FindObject(Form("hTRDRefTracksPos6_cent%d",iCent+1)))){
-      h = new TH3F(Form("hTRDRefTracksPos6_cent%d",iCent+1), Form("(#eta,detector #varphi,p) for TRD positive reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq1",
-                                                                  iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, etaBinLimits, 150, phiBinLimits, 32, binPtLimits);
-    } else h->Reset();
-    fHistos->AddAt(h, kTRDRefTracksPos6+iCent);
-  }
-  
-  // (eta,detector phi,P) distribution of reference TRD negative tracks with 4 tracklets
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH3F*)gROOT->FindObject(Form("hTRDRefTracksNeg4_cent%d",iCent+1)))){
-      h = new TH3F(Form("hTRDRefTracksNeg4_cent%d",iCent+1), Form("(#eta,detector #varphi,p) for TRD negative reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq1",
-                                                                iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, etaBinLimits, 150, phiBinLimits, 32, binPtLimits);
-    } else h->Reset();
-    fHistos->AddAt(h, kTRDRefTracksNeg4+iCent);
-  }
-
-  // (eta,detector phi,P) distribution of reference TRD negative tracks with 5 tracklets
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH3F*)gROOT->FindObject(Form("hTRDRefTracksNeg5_cent%d",iCent+1)))){
-      h = new TH3F(Form("hTRDRefTracksNeg5_cent%d",iCent+1), Form("(#eta,detector #varphi,p) for TRD negative reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq1",
-                                                                 iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, etaBinLimits, 150, phiBinLimits, 32, binPtLimits);
-    } else h->Reset();
-    fHistos->AddAt(h, kTRDRefTracksNeg5+iCent);
-  }
-
-  // (eta,detector phi,P) distribution of reference TRD negative tracks with 6 tracklets
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TH3F*)gROOT->FindObject(Form("hTRDRefTracksNeg6_cent%d",iCent+1)))){
-      h = new TH3F(Form("hTRDRefTracksNeg6_cent%d",iCent+1), Form("(#eta,detector #varphi,p) for TRD negative reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq1",
-                                                                  iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, etaBinLimits, 150, phiBinLimits, 32, binPtLimits);
-    } else h->Reset();
-    fHistos->AddAt(h, kTRDRefTracksNeg6+iCent);
-  }
-
-
-  // (eta,detector phi) profile of average number of TRD tracklets/track
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TProfile2D*)gROOT->FindObject(Form("hTRDEtaPhiAvNtrkl_cent%d",iCent+1)))){
-      h = new TProfile2D(Form("hTRDEtaPhiAvNtrkl_cent%d",iCent+1), Form("<Ntracklets/track> vs (#eta,detector #varphi) for TRD reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq1",
-                                                  iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, -1.0, 1.0, 150, -1.1*TMath::Pi(), 1.1*TMath::Pi());
-    } else h->Reset();
-    fHistos->AddAt(h, kTRDEtaPhiAvNtrkl+iCent);
-  }
-
-  // (eta,delta phi) profile of average number of TRD tracklets/track
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    if(!(h = (TProfile2D*)gROOT->FindObject(Form("hTRDEtaDeltaPhiAvNtrkl_cent%d",iCent+1)))){
-      h = new TProfile2D(Form("hTRDEtaDeltaPhiAvNtrkl_cent%d",iCent+1), Form("<Ntracklets/track> vs (#eta, #Delta#varphi) for TRD reference tracks, centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq1",
-                                                       iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, -1.0, 1.0, 50, -0.4*TMath::Pi(), 0.4*TMath::Pi());
-    } else h->Reset();
-    fHistos->AddAt(h, kTRDEtaDeltaPhiAvNtrkl+iCent);
-  }  
-
-  // (eta, detector phi) profile of average tracklet Qtot from slices
-  for(Int_t iCent=0; iCent<=5; ++iCent) {
-    for(Int_t iLayer=0;iLayer<6;iLayer++) {
-      if(!(h = (TProfile2D*)gROOT->FindObject(Form("hTRDEtaPhiAvQtot_Layer%d_cent%d",iLayer,iCent+1)))) {
-       h = new TProfile2D(Form("hTRDEtaPhiAvQtot_Layer%d_cent%d",iLayer,iCent+1),
-                          Form("<Q_{tot}> vs (#eta, detector #varphi) for TRD reference tracks (layer %d), centrality %d, |#eta|<%.1f and pt>%.1f, |DCAxy|<%.1f, |DCAz|<%.1f, TPC nclusters>%d, nTRDtracklets#geq1",
-                               iLayer, iCent+1, fgkEta, fgkPt, fgkTrkDCAxy, fgkTrkDCAz, fgkNclTPC), 100, -1.0, 1.0, 150, -1.1*TMath::Pi(), 1.1*TMath::Pi());
-      } else h->Reset();
-      fHistos->AddAt(h, kTRDEtaPhiAvQtot+iCent*6+iLayer);
-    }
+  // Retrieve histograms array if already build or build it
+  if(!fHistos) {
+    fHistos = new TObjArray();
+    fHistos->SetOwner(kTRUE);
   }
   
+  TH1* h = 0x0;
   // Trigger definitions
   if(!(h=(TH1F*)gROOT->FindObject("hTriggerDefs"))) {
     h = new TH1F("hTriggerDefs", "Trigger definitions", kNMaxAssignedTriggers, 0.5, 0.5+Float_t(kNMaxAssignedTriggers));
   }
   else h->Reset();
-  fHistos->AddAt(h, kTriggerDefs);
-
-  // dummy histo
-  if(!(h=(TH1F*)gROOT->FindObject("hDummy"))) {
-    h = new TH1F("hDummy", "Dummy hist", 10, 0., 1.);
-  }
-  else h->Reset();
-  fHistos->AddAt(h, 0);
-  
-  fMatchingPhiEtaCF = CreateCFContainer("MatchingPhiEta", "CF container with TRD-TPC matching data");
-  fHistos->AddAt(fMatchingPhiEtaCF, kMatchingPhiEtaCF);
-  fMatchingPtCF = CreateCFContainer("MatchingPt", "CF container with TRD-TPC matching data");
-  fHistos->AddAt(fMatchingPtCF, kMatchingPtCF);
-  fBunchCrossingsCF = CreateCFContainer("BunchCrossingsCF", "CF container with bunch crossings dependent data");
-  fHistos->AddAt(fBunchCrossingsCF, kBunchCrossingsCF);
-  fCentralityCF = CreateCFContainer("CentralityCF", "CF container with TRD-TPC matching data");
-  fHistos->AddAt(fCentralityCF, kCentralityCF);
-  fQtotCF = CreateCFContainer("QtotCF", "CF container with TRD tracklet charge data");
-  fHistos->AddAt(fQtotCF, kQtotCF);
-  fPulseHeightCF = CreateCFContainer("PulseHeightCF", "CF container with TRD tracklet PH data");
-  fHistos->AddAt(fPulseHeightCF, kPulseHeightCF);
-  fExpertCF = CreateCFContainer("ExpertCF", "CF container with customized information");
-  if(fExpertCF) fHistos->AddAt(fExpertCF, kExpertCF);
-  
+  fHistos->Add(h);
+    
   return fHistos;
 }
 
@@ -1262,7 +527,10 @@ void AliTRDcheckESD::InitializeCFContainers() {
   AliAnalysisManager* man=AliAnalysisManager::GetAnalysisManager();
   AliInputEventHandler* inputHandler = (AliInputEventHandler*) (man->GetInputEventHandler());
   if(!inputHandler) return;
-  
+
+  GetTriggerIndex("All triggers", kTRUE);
+  GetTriggerIndex("Not specified triggers", kTRUE);
+
   AliPhysicsSelection* physSel = (AliPhysicsSelection*)inputHandler->GetEventSelection();
   const TList* trigList = (physSel ? physSel->GetCollisionTriggerClasses() : 0x0);
   const TList* bgTrigList = (physSel ? physSel->GetBGTriggerClasses() : 0x0);
@@ -1279,6 +547,7 @@ void AliTRDcheckESD::InitializeCFContainers() {
         // Assign an index into the trigger histogram and the CF container for this trigger
         GetTriggerIndex(arr2->At(jt)->GetName(), kTRUE);
       }
+      delete arr;
     }
   }
   // Add background triggers from PhysicsSelection
@@ -1293,213 +562,131 @@ void AliTRDcheckESD::InitializeCFContainers() {
         // Assign an index into the trigger histogram and the CF container for this trigger
         GetTriggerIndex(arr2->At(jt)->GetName(), kTRUE);
       }
+      delete arr;
     }
   }
-  if(!fNAssignedTriggers) {GetTriggerIndex("All triggers", kTRUE);}
-  
+    
   // Add user enabled triggers
   TObjArray* arr = fUserEnabledTriggers.Tokenize(";");
   for(Int_t it=0; it<arr->GetEntries(); ++it) {
     GetTriggerIndex(arr->At(it)->GetName(), kTRUE);
   }
+  delete arr;
 }
 
 
 //__________________________________________________________________________________________________________
-AliCFContainer* AliTRDcheckESD::CreateCFContainer(const Char_t* name, const Char_t* title) {
-  //
-  //  make a CF container
-  //
-  // create a CF container and add it to the list of histograms
-  Int_t nbinsCf[kNTrdCfVariables];
-  for(Int_t i=0;i<kNTrdCfVariables;++i) nbinsCf[i]=0;
-  nbinsCf[kEventVtxZ]         =    5;
-  nbinsCf[kEventMult]         =    5;
-  nbinsCf[kEventTrigger]      =    kNMaxAssignedTriggers;
-  nbinsCf[kEventBC]           = 3500;
-  nbinsCf[kTrackTOFBC]        =    2;
-  nbinsCf[kTrackDCAxy]        =    9;
-  nbinsCf[kTrackDCAz]         =    5;
-  nbinsCf[kTrackCharge]       =    2;
-  nbinsCf[kTrackPhi]          =  180;
-  nbinsCf[kTrackEta]          =   90;
-  nbinsCf[kTrackPt]           =   18;
-  nbinsCf[kTrackP]            =   17;
-  nbinsCf[kTrackTrdTracklets] =    7;
-  nbinsCf[kTrackTrdClusters]  =  200;
-  for(Int_t i=0;i<6;++i) nbinsCf[kTrackQtot+i] = 100;
-  for(Int_t i=0;i<8;++i) nbinsCf[kTrackPHslice+i] = 400;
-  //Double_t evVtxLims[2]      = {-10.,+10.};
-  Double_t evMultLims[6]     = {0.0, 700., 1400., 2100., 2800., 3500.};
-  //Double_t evTriggerLims[2]  = {0.5, 0.5+Float_t(kNMaxAssignedTriggers)};
-  Double_t evBCLims[2]       = {-0.5, +3499.5};
-  //Double_t trkTOFBClims[3]   = {-0.5, 0.5, 5.5};
-  //Double_t trkDCAxyLims[10]  = {-10.0,  -6.0, -3.0,  -2.0,  -1.0,   
-  //                               +1.0, +2.0,  +3.0,  +6.0, +10.0};    
-  //Double_t trkDCAzLims[2]    = {-15.0, +15.0};    
-  Double_t trkChargeLims[2]  = {-1.5, +1.5};
-  Double_t trkPhiLims[2]     = {-1.001*TMath::Pi(), +1.001*TMath::Pi()};
-  Double_t trkEtaLims[2]     = {-0.9, +0.9};
-  Double_t trkPtLims[19]     = {0.0, 0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0, 2.5, 3.0, 
-                                3.5, 4.0, 4.5,  5.0, 6.0,  7.0, 8.0,  9.0, 10.0};
-  Double_t trkPLims[18]      = {0.0, 0.4, 0.6, 0.8, 1.0, 1.2, 1.4, 1.7, 2.0, 2.5, 
-                                3.0, 3.5, 4.0, 5.0, 6.0, 7.0, 9.0, 12.0};
-  Double_t trkTrdNLims[2]    = {-0.5, 6.5};
-  Double_t trkTrdNclsLims[2] = {-0.5, 199.5};
-  Double_t trkQtotLims[2]    = {0.0, 20.};
-  /*Double_t trkQtotLims[20]   = {0.0, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0,
-                                5.5, 6.0, 6.5, 7.0, 8.0, 9.0,10.0,12.0,15.0,20.0};*/
-  const Char_t* varNames[kNTrdCfVariables] = {"vtxZ", "multiplicity", "trigger", "BC", "TOFBC", "DCAxy", "DCAz",
-    "charge", "phi", "eta", "pt", "P", "tracklets", "clusters", 
-    "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7",
-    "Qtot0", "Qtot1", "Qtot2", "Qtot3", "Qtot4", "Qtot5"};
-  
-  AliCFContainer* cf;
-  TString nameStr=name;
-  if(nameStr.Contains("MatchingPhiEta")) {
-    fMatchingPhiEtaCFVars[0] = kTrackCharge;       fMatchingPhiEtaCFVars[1] = kTrackPhi; fMatchingPhiEtaCFVars[2] = kTrackEta;
-    fMatchingPhiEtaCFVars[3] = kTrackTrdTracklets;
-    const Int_t nVars = 4;
-    Int_t nBins[nVars]; for(Int_t i=0; i<nVars; ++i) nBins[i] = nbinsCf[fMatchingPhiEtaCFVars[i]];
-    cf = new AliCFContainer(name, title, 3, nVars, nBins);
-    cf->SetBinLimits(0, trkChargeLims[0], trkChargeLims[1]);
-    cf->SetBinLimits(1, trkPhiLims[0], trkPhiLims[1]);
-    cf->SetBinLimits(2, trkEtaLims[0], trkEtaLims[1]);
-    cf->SetBinLimits(3, trkTrdNLims[0], trkTrdNLims[1]);
-    for(Int_t i=0; i<nVars; ++i) cf->SetVarTitle(i, varNames[fMatchingPhiEtaCFVars[i]]);
-    cf->SetStepTitle(0, "TPC");
-    cf->SetStepTitle(1, "TRD");
-    cf->SetStepTitle(2, "TOF");
-    return cf;
-  }
-  if(nameStr.Contains("MatchingPt")) {
-    fMatchingPtCFVars[0] = kEventMult; fMatchingPtCFVars[1] = kTrackCharge;        fMatchingPtCFVars[2] = kTrackPhi; 
-    fMatchingPtCFVars[3] = kTrackPt;   fMatchingPtCFVars[4] = kTrackTrdTracklets;
-    const Int_t nVars = 5;
-    Int_t nBins[nVars]; for(Int_t i=0; i<nVars; ++i) nBins[i] = nbinsCf[fMatchingPtCFVars[i]];
-    cf = new AliCFContainer(name, title, 3, nVars, nBins);
-    cf->SetBinLimits(0, evMultLims);
-    cf->SetBinLimits(1, trkChargeLims[0], trkChargeLims[1]);
-    cf->SetBinLimits(2, trkPhiLims[0], trkPhiLims[1]);
-    cf->SetBinLimits(3, trkPtLims);
-    cf->SetBinLimits(4, trkTrdNLims[0], trkTrdNLims[1]);
-    for(Int_t i=0; i<nVars; ++i) cf->SetVarTitle(i, varNames[fMatchingPtCFVars[i]]);
-    cf->SetStepTitle(0, "TPC");
-    cf->SetStepTitle(1, "TRD");
-    cf->SetStepTitle(2, "TOF");
-    return cf;
-  }
-  if(nameStr.Contains("BunchCrossings")) {
-    fBunchCrossingsCFVars[0] = kEventBC; fBunchCrossingsCFVars[1] = kTrackPhi;
-    const Int_t nVars = 2;
-    Int_t nBins[nVars]; for(Int_t i=0; i<nVars; ++i) nBins[i] = nbinsCf[fBunchCrossingsCFVars[i]];
-    cf = new AliCFContainer(name, title, 3, nVars, nBins);
-    cf->SetBinLimits(0, evBCLims[0], evBCLims[1]);
-    cf->SetBinLimits(1, trkPhiLims[0], trkPhiLims[1]);
-    for(Int_t i=0; i<nVars; ++i) cf->SetVarTitle(i, varNames[fBunchCrossingsCFVars[i]]);
-    cf->SetStepTitle(0, "TPC");
-    cf->SetStepTitle(1, "TRD");
-    cf->SetStepTitle(2, "TOF");
-    return cf;
-  }
-  if(nameStr.Contains("Centrality")) {
-    fCentralityCFVars[0] = kEventMult; fCentralityCFVars[1] = kTrackP; fCentralityCFVars[2] = kTrackTrdClusters; 
-    fCentralityCFVars[3] = kTrackQtot;
-    const Int_t nVars = 4;
-    Int_t nBins[nVars]; for(Int_t i=0; i<nVars; ++i) nBins[i] = nbinsCf[fCentralityCFVars[i]];
-    cf = new AliCFContainer(name, title, 1, nVars, nBins);
-    cf->SetBinLimits(0, evMultLims);
-    cf->SetBinLimits(1, trkPLims);
-    cf->SetBinLimits(2, trkTrdNclsLims[0], trkTrdNclsLims[1]);
-    cf->SetBinLimits(3, trkQtotLims[0], trkQtotLims[1]);
-    for(Int_t i=0; i<nVars; ++i) cf->SetVarTitle(i, varNames[fCentralityCFVars[i]]);
-    cf->SetStepTitle(0, "TRD");
-    return cf;
-  }
-  if(nameStr.Contains("Qtot")) {
-    fQtotCFVars[0] = kTrackPhi; fQtotCFVars[1] = kTrackEta; fQtotCFVars[2] = kTrackQtot; 
-    const Int_t nVars = 4;
-    Int_t nBins[nVars]; for(Int_t i=0; i<nVars-1; ++i) nBins[i] = nbinsCf[fQtotCFVars[i]];
-    nBins[2] = 50;
-    nBins[nVars-1] = 6;
-    cf = new AliCFContainer(name, title, 1, nVars, nBins);
-    cf->SetBinLimits(0, trkPhiLims[0], trkPhiLims[1]);
-    cf->SetBinLimits(1, trkEtaLims[0], trkEtaLims[1]);
-    cf->SetBinLimits(2, trkQtotLims[0], trkQtotLims[1]);
-    cf->SetBinLimits(3, -0.5, 5.5);
-    for(Int_t i=0; i<nVars-1; ++i) cf->SetVarTitle(i, varNames[fQtotCFVars[i]]);
-    cf->SetVarTitle(nVars-1, "layer");
-    cf->SetStepTitle(0, "TRD");
-    return cf;
-  }
-  if(nameStr.Contains("PulseHeight")) {
-    fPulseHeightCFVars[0] = kTrackP; fPulseHeightCFVars[1] = kTrackPHslice; 
-    const Int_t nVars = 3;
-    Int_t nBins[nVars]; for(Int_t i=0; i<nVars-1; ++i) nBins[i] = nbinsCf[fPulseHeightCFVars[i]];
-    nBins[nVars-1] = 8;
-    cf = new AliCFContainer(name, title, 1, nVars, nBins);
-    //cf->SetBinLimits(0, evTriggerLims[0], evTriggerLims[1]);
-    cf->SetBinLimits(0, trkPLims);
-    cf->SetBinLimits(1, trkQtotLims[0], trkQtotLims[1]);
-    cf->SetBinLimits(2, -0.5, 7.5);
-    for(Int_t i=0; i<nVars-1; ++i) cf->SetVarTitle(i, varNames[fPulseHeightCFVars[i]]);
-    cf->SetVarTitle(nVars-1, "slice");
-    cf->SetStepTitle(0, "TRD");
-    return cf;
-  }
-  if(nameStr.Contains("Expert")) {
-    Int_t nVars = 0;
-    Int_t nBins[kNTrdCfVariables];
-    for(Int_t ivar=0; ivar<kNTrdCfVariables; ++ivar) {
-      if(!fExpertCFVarsEnabled[ivar]) continue;
-      if(fExpertCFVarBins[ivar][0]=='\0') {
-       nBins[nVars] = fExpertCFVarNBins[ivar];
-       nVars++;
-      }
-      else {
-       TObjArray* arr = fExpertCFVarBins[ivar].Tokenize(";");
-       nBins[nVars] = arr->GetEntries()-1;
-       if(nBins[nVars]>0) nVars++;
-      }
-    }
-    if(nVars<1) return 0x0;
-    Int_t nSteps = 0; for(Int_t i=0; i<3; ++i) if(fExpertCFEnabledSteps[i]) nSteps++;
-    if(nSteps<1) return 0x0;
-    cf = new AliCFContainer(name, title, nSteps, nVars, nBins);
-    Int_t iUsedVar = 0;
-    for(Int_t ivar=0; ivar<kNTrdCfVariables; ++ivar) {
-      if(!fExpertCFVarsEnabled[ivar]) continue;
-      if(fExpertCFVarBins[ivar][0]=='\0')
-       cf->SetBinLimits(iUsedVar, fExpertCFVarRanges[ivar][0], fExpertCFVarRanges[ivar][1]);
-      else {
-       TObjArray* arr = fExpertCFVarBins[ivar].Tokenize(";");
-       if(arr->GetEntries()-1>0) {
-         Double_t* binLims = new Double_t[arr->GetEntries()];
-         for(Int_t ib=0;ib<arr->GetEntries();++ib) {
-           TString binStr = arr->At(ib)->GetName();
-           binLims[ib] = binStr.Atof();
-         }
-         cf->SetBinLimits(iUsedVar++, binLims);
-       }
-      }
-      cf->SetVarTitle(iUsedVar, varNames[ivar]);
-    }
-    const Char_t* stepNames[3] = {"TPC","TRD","TOF"};
-    Int_t iUsedStep = 0;
-    for(Int_t istep=0; istep<3; ++istep) {
-      if(fExpertCFEnabledSteps[istep]) cf->SetStepTitle(iUsedStep++, stepNames[istep]);
-    }
-    return cf;
-  }  
-  return 0x0;
+void AliTRDcheckESD::AddCFContainer(const Char_t* name, const Char_t* title,
+                                   Int_t nSteps, Int_t* steps, 
+                                   Int_t nVars, UInt_t* vars, TArrayD* binLimits) {
+  //
+  // Add a CF container
+  //
+  if(!fHistos) {
+    fHistos = new TObjArray();
+    fHistos->SetOwner(kTRUE);
+  }
+  // get number of bins for each variable
+  Int_t* nBins = new Int_t[nVars];
+  for(Int_t iv=0;iv<nVars;++iv)
+    nBins[iv] = binLimits[iv].GetSize()-1;  
+  // create the CF container
+  AliCFContainer* cf = new AliCFContainer(name, title, nSteps, nVars, nBins);
+  // set CF container variable binning and name
+  for(Int_t iv=0;iv<nVars;++iv) {
+    cf->SetBinLimits(iv, binLimits[iv].GetArray());
+    cf->SetVarTitle(iv, fgkVarNames[vars[iv]]);
+  }
+  // set the step names 
+  for(Int_t is=0; is<nSteps; ++is) {
+    cf->SetStepTitle(is, fgkStepNames[steps[is]]);
+    for(Int_t iv=0;iv<nVars;++iv) cf->GetAxis(iv, is)->SetUniqueID(vars[iv]);
+  }
+  fHistos->Add(cf);
+}
+
+//__________________________________________________________________________________________________
+void AliTRDcheckESD::FillTrdSliceContainers(Double_t* values, Bool_t* stepSelections, Int_t itrig) {
+  //
+  // fill TRD slice info
+  //
+  if(!fHistos) return;
+  for(Int_t i=0;i<fHistos->GetEntries();++i) {
+    TString objType = fHistos->At(i)->IsA()->GetName();
+    if(!objType.Contains("AliCFContainer")) continue;
+    AliCFContainer* cf = (AliCFContainer*)fHistos->At(i);
+    if(cf->GetVar(fgkVarNames[kTrackletSlice])<0 && cf->GetVar(fgkVarNames[kTrackletPHslice])<0) continue;
+    if((cf->GetVar(fgkVarNames[kEventTrigger])<0 && itrig==0) || (cf->GetVar(fgkVarNames[kEventTrigger])>=0))
+      FillCFContainer(cf, values, stepSelections);
+  }
+}
+
+//__________________________________________________________________________________________________
+void AliTRDcheckESD::FillTrdTrackletContainers(Double_t* values, Bool_t* stepSelections, Int_t itrig) {
+  //
+  // fill global track info
+  //
+  if(!fHistos) return;
+  for(Int_t i=0;i<fHistos->GetEntries();++i) {
+    TString objType = fHistos->At(i)->IsA()->GetName();
+    if(!objType.Contains("AliCFContainer")) continue;
+    AliCFContainer* cf = (AliCFContainer*)fHistos->At(i);
+    if(cf->GetVar(fgkVarNames[kTrackletSlice])>=0 || cf->GetVar(fgkVarNames[kTrackletPHslice])>=0) continue;
+    if(cf->GetVar(fgkVarNames[kTrackletLayer])<0 && cf->GetVar(fgkVarNames[kTrackletQtot])<0) continue;
+    if((cf->GetVar(fgkVarNames[kEventTrigger])<0 && itrig==0) || (cf->GetVar(fgkVarNames[kEventTrigger])>=0))
+      FillCFContainer(cf, values, stepSelections);
+  }
+}
+
+//__________________________________________________________________________________________________
+void AliTRDcheckESD::FillGlobalTrackContainers(Double_t* values, Bool_t* stepSelections, Int_t itrig) {
+  //
+  // fill global track info
+  //
+  if(!fHistos) return;
+  for(Int_t i=0;i<fHistos->GetEntries();++i) {
+    TString objType = fHistos->At(i)->IsA()->GetName();
+    if(!objType.Contains("AliCFContainer")) continue;
+    AliCFContainer* cf = (AliCFContainer*)fHistos->At(i);
+    if(cf->GetVar(fgkVarNames[kTrackletLayer])>=0 || 
+       cf->GetVar(fgkVarNames[kTrackletSlice])>=0 || 
+       cf->GetVar(fgkVarNames[kTrackletQtot])>=0 || 
+       cf->GetVar(fgkVarNames[kTrackletPHslice])>=0) continue;
+    if((cf->GetVar(fgkVarNames[kEventTrigger])<0 && itrig==0) || 
+       (cf->GetVar(fgkVarNames[kEventTrigger])>=0))
+      FillCFContainer(cf, values, stepSelections);
+  }
 }
 
+//__________________________________________________________________________________________________
+void AliTRDcheckESD::FillCFContainer(AliCFContainer* cf, Double_t* values, Bool_t* stepSelections) {
+  //
+  // Fill CF container
+  //
+  Double_t* cfValues=new Double_t[cf->GetNVar()];
+  for(Int_t iv=0;iv<cf->GetNVar();++iv)
+    cfValues[iv] = values[cf->GetAxis(iv,0)->GetUniqueID()];
+    
+  for(Int_t istep=0; istep<cf->GetNStep(); ++istep) {
+    TString stepTitle = cf->GetStepTitle(istep);
+    Int_t stepNo = -1;
+    for(Int_t is=0;is<kNSteps;++is) 
+      if(!stepTitle.CompareTo(fgkStepNames[is])) {
+       stepNo = is;
+       break;
+      }
+    if(stepSelections[stepNo]) cf->Fill(cfValues, istep);
+  }  // end loop over steps
+
+  delete [] cfValues;
+}
 
 //____________________________________________________________________
 Bool_t AliTRDcheckESD::Load(const Char_t *file, const Char_t *dir, const Char_t *name)
 {
-// Load data from performance file
-
+  //
+  // Load data from performance file
+  //
   if(!TFile::Open(file)){
     AliWarning(Form("Couldn't open file %s.", file));
     return kFALSE;
@@ -1517,25 +704,11 @@ Bool_t AliTRDcheckESD::Load(const Char_t *file, const Char_t *dir, const Char_t
     return kFALSE;
   }
   fHistos = (TObjArray*)o->Clone(GetName());
-  fMatchingPhiEtaCF = (AliCFContainer*)fHistos->At(kMatchingPhiEtaCF);
-  fMatchingPtCF = (AliCFContainer*)fHistos->At(kMatchingPtCF);
-  fBunchCrossingsCF = (AliCFContainer*)fHistos->At(kBunchCrossingsCF);
-  fCentralityCF = (AliCFContainer*)fHistos->At(kCentralityCF);
-  fQtotCF = (AliCFContainer*)fHistos->At(kQtotCF);
-  fPulseHeightCF = (AliCFContainer*)fHistos->At(kPulseHeightCF);
-  fExpertCF = (AliCFContainer*)fHistos->At(kExpertCF);
-  
-  /*
-  TObjArray *cfs(NULL);
-  if(!(cfs = (TObjArray*)gDirectory->Get(Form("%s_CF", tn)))){
-    AliWarning(Form("Missing CFs container %s_CF.", tn));
-    fCfList = NULL;
-    //return kFALSE;
-  } 
-  else
-    fCfList = (TObjArray*)cfs->Clone(Form("%s_CF_clone", GetName()));
-  */
-  
+    
+  TH1F* trigHist = (TH1F*)fHistos->FindObject("hTriggerDefs");
+  for(Int_t i=1;i<=trigHist->GetXaxis()->GetNbins();++i) {
+    if(trigHist->GetXaxis()->GetBinLabel(i)[0]!='\0') ++fNAssignedTriggers;
+  }
   gFile->Close();
   return kTRUE;
 }
@@ -1563,206 +736,6 @@ void AliTRDcheckESD::Terminate(Option_t *)
       return;
     }
   }
-
-  //  fNRefFigures = 15;
-  //  return;
-
-  const Char_t *name[kNrefs] = {
-    "Ncl", "Eff", "Eloss", "PtResDCA"
-  };
-
-  TObjArray *arr(NULL); TGraph *g(NULL);
-  if(!fResults){
-    fResults = new TObjArray(kNrefs);
-    fResults->SetOwner();
-    fResults->SetName("results");
-    for(Int_t iref(0); iref<kNrefs; iref++){
-      fResults->AddAt(arr = new TObjArray(fgkNgraph[iref]), iref);
-      arr->SetName(name[iref]);  arr->SetOwner();
-      switch(iref+1){
-      case kNCl:
-       for(Int_t ig(0); ig<fgkNgraph[iref]; ig++){
-          arr->AddAt(g = new TGraphErrors(), ig);
-          g->SetLineColor(ig+1); 
-          g->SetMarkerColor(ig+1); 
-          g->SetMarkerStyle(ig+20); 
-          g->SetName(Form("s%d", ig));
-          switch(ig){
-          case 0: g->SetTitle("ALL"); break;
-          case 1: g->SetTitle("NEG"); break;
-          case 2: g->SetTitle("POS"); break;
-          default: g->SetTitle(AliPID::ParticleLatexName(ig-3)); break;
-          };
-        }
-        break;
-      case kTRDmom:
-       for(Int_t ig(0); ig<fgkNgraph[iref]; ig++){
-          arr->AddAt(g = new TGraphAsymmErrors(), ig);
-          g->SetLineColor(ig+1); 
-          g->SetMarkerColor(ig+1); 
-          g->SetMarkerStyle(ig+20); 
-        }
-        break;
-      case kPtRes:
-       for(Int_t idx(0); idx<AliPID::kSPECIES; idx++){
-          Int_t ig(2*idx);
-          arr->AddAt(g = new TGraphErrors(), ig);
-          g->SetLineColor(kRed-idx); 
-          g->SetMarkerColor(kRed-idx); 
-          g->SetMarkerStyle(20+idx); 
-          g->SetNameTitle(Form("s%d", ig), Form("res %s", AliPID::ParticleLatexName(idx)));
-          arr->AddAt(g = new TGraphErrors(), ig+1);
-          g->SetLineColor(kBlue-idx); 
-          g->SetMarkerColor(kBlue-idx); 
-          g->SetMarkerStyle(20+idx); 
-          g->SetNameTitle(Form("m%d", ig+1), Form("sys %s", AliPID::ParticleLatexName(idx)));
-
-          ig+=10;
-          arr->AddAt(g = new TGraphErrors(), ig);
-          g->SetLineColor(kRed-idx); 
-          g->SetMarkerColor(kRed-idx); 
-          g->SetMarkerStyle(20+idx); 
-          g->SetNameTitle(Form("s%d", ig), Form("sigma %s", AliPID::ParticleLatexName(idx)));
-          arr->AddAt(g = new TGraphErrors(), ig+1);
-          g->SetLineColor(kBlue-idx); 
-          g->SetMarkerColor(kBlue-idx); 
-          g->SetMarkerStyle(20+idx); 
-          g->SetNameTitle(Form("m%d", ig+1), Form("mean %s", AliPID::ParticleLatexName(idx)));
-        }
-        break;
-      default:
-       for(Int_t ig(0); ig<fgkNgraph[iref]; ig++){
-          arr->AddAt(g = new TGraphErrors(), ig);
-          g->SetLineColor(ig+1); 
-          g->SetMarkerColor(ig+1); 
-          g->SetMarkerStyle(ig+20); 
-        }
-        break;
-      }
-    }
-  }
-  TH1 *h1[2] = {NULL, NULL};
-  TH2I *h2(NULL);
-  TAxis *ax(NULL);
-
-  // No of clusters
-  if(!(h2 = (TH2I*)fHistos->At(kNCl))) return;
-  ax = h2->GetXaxis();
-  arr = (TObjArray*)fResults->At(kNCl);
-  
-  // All tracks
-  h1[0] = h2->ProjectionX("Ncl_px");
-  TGraphErrors *ge=(TGraphErrors*)arr->At(0);
-  for(Int_t ib=2; ib<=ax->GetNbins(); ib++){
-    ge->SetPoint(ib-2, ax->GetBinCenter(ib), h1[0]->GetBinContent(ib));
-  }
-  
-  // All charged tracks
-  TH1 *hNclCh[2] = {(TH1D*)h1[0]->Clone("NEG"), (TH1D*)h1[0]->Clone("POS")};
-  hNclCh[0]->Reset();hNclCh[1]->Reset();
-  for(Int_t is(1); is<=AliPID::kSPECIES; is++){
-    hNclCh[0]->Add(h2->ProjectionX("Ncl_px", 2*is-1, 2*is-1)); // neg
-    hNclCh[1]->Add(h2->ProjectionX("Ncl_px", 2*is, 2*is));     // pos
-  }
-  if(Int_t(hNclCh[0]->GetEntries())){
-    ge=(TGraphErrors*)arr->At(1);
-    for(Int_t ib=2; ib<=ax->GetNbins(); ib++){
-      ge->SetPoint(ib-2, ax->GetBinCenter(ib), hNclCh[0]->GetBinContent(ib));
-    }
-  }
-  
-  if(Int_t(hNclCh[1]->GetEntries())){
-    ge=(TGraphErrors*)arr->At(2);
-    for(Int_t ib=2; ib<=ax->GetNbins(); ib++){
-      ge->SetPoint(ib-2, ax->GetBinCenter(ib), hNclCh[1]->GetBinContent(ib));
-    }
-  }
-  // Species wise
-  for(Int_t is(1); is<=AliPID::kSPECIES; is++){
-    h1[0] = h2->ProjectionX("Ncl_px", 2*is-1, 2*is);
-    if(!Int_t(h1[0]->GetEntries())) continue;
-    ge=(TGraphErrors*)arr->At(2+is);
-    for(Int_t ib=2; ib<=ax->GetNbins(); ib++){
-      ge->SetPoint(ib-2, ax->GetBinCenter(ib), h1[0]->GetBinContent(ib));
-    }
-  }
-  
-  fNRefFigures = 1;
-
-  // EFFICIENCY
-  // geometrical efficiency
-  if(!(h2 = (TH2I*)fHistos->At(kTRDstat))) return;
-  arr = (TObjArray*)fResults->At(kTRDstat-1);
-  h1[0] = h2->ProjectionX("checkESDx0", kTPCout, kTPCout);
-  h1[1] = h2->ProjectionX("checkESDx1", kTRDin, kTRDin);
-  Process(h1, (TGraphErrors*)arr->At(0));
-  delete h1[0];delete h1[1];
-  // tracking efficiency
-  h1[0] = h2->ProjectionX("checkESDx0", kTRDin, kTRDin);
-  h1[1] = h2->ProjectionX("checkESDx1", kTRDout, kTRDout);
-  Process(h1, (TGraphErrors*)arr->At(1));
-  delete h1[1];
-  // PID efficiency
-  h1[1] = h2->ProjectionX("checkESDx1", kTRDpid, kTRDpid);
-  Process(h1, (TGraphErrors*)arr->At(2));
-  delete h1[1];
-  // Refit efficiency
-  h1[1] = h2->ProjectionX("checkESDx1", kTRDref, kTRDref);
-  Process(h1, (TGraphErrors*)arr->At(3));
-  delete h1[1];
-  fNRefFigures++;
-
-  // ENERGY LOSS
-  if(!(h2 = dynamic_cast<TH2I*>(fHistos->At(kTRDmom)))) return;
-  arr = (TObjArray*)fResults->At(kTRDmom-1);
-  TGraphAsymmErrors *g06 = (TGraphAsymmErrors*)arr->At(0), *g09 = (TGraphAsymmErrors*)arr->At(1);
-  ax=h2->GetXaxis();
-  const Int_t nq(4);
-  const Double_t xq[nq] = {0.05, 0.2, 0.8, 0.95};
-  Double_t yq[nq];
-  for(Int_t ily=6; ily--;){
-    h1[0] = h2->ProjectionX("checkESDp0", ily+1, ily+1);
-    h1[0]->GetQuantiles(nq,yq,xq);
-    g06->SetPoint(ily, Float_t(ily), ax->GetBinCenter(h1[0]->GetMaximumBin()));
-    g06->SetPointError(ily, 0., 0., TMath::Abs(yq[0]), yq[3]);
-    g09->SetPoint(ily, Float_t(ily), h1[0]->GetMean());
-    g09->SetPointError(ily, 0., 0., TMath::Abs(yq[1]), yq[2]);
-
-    //printf(" max[%f] mean[%f] q[%f %f %f %f]\n", ax->GetBinCenter(h1[0]->GetMaximumBin()), h1[0]->GetMean(), yq[0], yq[1], yq[2], yq[3]);
-    delete h1[0];
-  }
-  fNRefFigures++;
-//  if(!HasMC()) return;
-
-  // Pt RESOLUTION @ DCA
-  TH3S* h3(NULL); TGraphErrors *gg[2] = {NULL,NULL};
-  if(!(h3 = dynamic_cast<TH3S*>(fHistos->At(kPtRes)))) return;
-  arr = (TObjArray*)fResults->At(kPtRes-1);
-  TAxis *az(h3->GetZaxis());
-  for(Int_t i(0); i<AliPID::kSPECIES; i++){
-    Int_t idx(2*i);
-    az->SetRange(idx+1, idx+2); 
-    gg[1] = (TGraphErrors*)arr->At(idx);
-    gg[0] = (TGraphErrors*)arr->At(idx+1);
-    Process2D((TH2*)h3->Project3D("yx"), gg);
-
-    idx+=10;
-    az->SetRange(idx+1, idx+2); 
-    gg[1] = (TGraphErrors*)arr->At(idx);
-    gg[0] = (TGraphErrors*)arr->At(idx+1);
-    Process2D((TH2*)h3->Project3D("yx"), gg);
-  }
-  fNRefFigures++;
-  
-  fNRefFigures++;
-  // 3x3 tracking summary canvases for every centrality class
-  fNRefFigures++;
-  // 3x3 PID summary canvases for every centrality class
-  fNRefFigures++;
-  // 3x3 for centrality dependent pictures
-  fNRefFigures++;
-  
-  //DoTrending();  
 }
 
 //____________________________________________________________________
@@ -1786,25 +759,7 @@ Int_t AliTRDcheckESD::Pdg2Idx(Int_t pdg) const
   return -1;
 }
 
-//____________________________________________________________________
-void AliTRDcheckESD::Process(TH1 **h1, TGraphErrors *g)
-{
-// Generic function to process one reference plot
-
-  Int_t n1 = 0, n2 = 0, ip=0;
-  Double_t eff = 0.;
-
-  TAxis *ax = h1[0]->GetXaxis();
-  for(Int_t ib=1; ib<=ax->GetNbins(); ib++){
-    if(!(n1 = (Int_t)h1[0]->GetBinContent(ib))) continue;
-    n2 = (Int_t)h1[1]->GetBinContent(ib);
-    eff = n2/Float_t(n1);
-
-    ip=g->GetN();
-    g->SetPoint(ip, ax->GetBinCenter(ib), eff);
-    g->SetPointError(ip, 0., n2 ? eff*TMath::Sqrt(1./n1+1./n2) : 0.);
-  }
-}  
+  
 //________________________________________________________
 void AliTRDcheckESD::Process2D(TH2 * const h2, TGraphErrors **g)
 {
@@ -1855,35 +810,42 @@ void AliTRDcheckESD::PrintStatus(ULong_t status)
 }
 
 //____________________________________________________________________
-TH1D* AliTRDcheckESD::Proj2D(TH2* hist, TH1* fitErr) {
+TH1D* AliTRDcheckESD::Proj2D(TH2* hist, TH1* mpvErr, TH1* widthErr, TH1* chi2) {
   //
-  // project the PH vs Slice 2D-histo into a 1D histo
+  // project the PH vs Slice 2D-histo into a 1D histo with Landau MPV and widths
   //
   
   TH1D* hProjection = (TH1D*)hist->ProjectionX(Form("hProjection_%f", gRandom->Rndm()));
   hProjection->Reset();
   
-  TF1* fitLandau = new TF1("landauFunc","landau",0.,2000.);
+  TF1* fitLandau = new TF1("landauFunc","landau",20.,3000.);
   TH1D *hD;
   for(Int_t iBin=1;iBin<=hist->GetXaxis()->GetNbins();iBin++) {
     if(gROOT->FindObject("projection"))
       delete gROOT->FindObject("projection");
     hD = (TH1D*)hist->ProjectionY("projection",iBin,iBin);
-    hD->Rebin(4);
+    //hD->Rebin(4);
     if(hD->Integral()>10) {
       fitLandau->SetParameter(1, hD->GetBinCenter(hD->GetMaximumBin()));
       fitLandau->SetParLimits(1, 0.2*hD->GetBinCenter(hD->GetMaximumBin()), 3.0*hD->GetBinCenter(hD->GetMaximumBin()));
       fitLandau->SetParameter(0, 1000.);
       fitLandau->SetParLimits(0, 1., 10000000.);
       fitLandau->SetParameter(2, 0.5*hD->GetBinCenter(hD->GetMaximumBin()));
-      fitLandau->SetParLimits(2, 0.01*hD->GetBinCenter(hD->GetMaximumBin()), 1.0*hD->GetBinCenter(hD->GetMaximumBin()));
+      fitLandau->SetParLimits(2, 0.01*hD->GetBinCenter(hD->GetMaximumBin()), 1.0*hD->GetRMS());
       hD->Fit(fitLandau, "Q0", "", hD->GetXaxis()->GetXmin(), hD->GetXaxis()->GetXmax());
       hD->Fit(fitLandau, "Q0", "", hD->GetXaxis()->GetXmin(), hD->GetXaxis()->GetXmax());
       hProjection->SetBinContent(iBin, fitLandau->GetParameter(1));
       hProjection->SetBinError(iBin, fitLandau->GetParameter(2));
-      if(fitErr) {
-       fitErr->SetBinContent(iBin, fitLandau->GetParameter(1));
-       fitErr->SetBinError(iBin, fitLandau->GetParError(1));
+      if(mpvErr) {
+       mpvErr->SetBinContent(iBin, fitLandau->GetParameter(1));
+       mpvErr->SetBinError(iBin, fitLandau->GetParError(1));
+      }
+      if(widthErr) {
+       widthErr->SetBinContent(iBin, fitLandau->GetParameter(2));
+       widthErr->SetBinError(iBin, fitLandau->GetParError(2));
+      }
+      if(chi2) {
+       chi2->SetBinContent(iBin, (fitLandau->GetNDF()>0 ? fitLandau->GetChisquare()/Double_t(fitLandau->GetNDF()) : 0.0));
       }
     }
     else{
@@ -1961,24 +923,35 @@ void AliTRDcheckESD::CheckActiveSM(TH1D* phiProj, Bool_t activeSM[18]) {
 
 
 //__________________________________________________________________________________________________
-TH1F* AliTRDcheckESD::EfficiencyFromPhiPt(AliCFContainer* cf, Int_t stepNom, Int_t stepDenom, const Char_t* varStr) {
+TH1F* AliTRDcheckESD::EfficiencyFromPhiPt(AliCFContainer* cf, Int_t minNtrkl, Int_t maxNtrkl, 
+                                         Int_t stepNom, Int_t stepDenom, Int_t var) {
   //
-  // Use the CF container to extract the efficiency vs pt
+  // Use the CF container to extract the efficiency vs pt (other variable beside pt also posible)
   //
-  Int_t varTrackPhi = cf->GetVar("phi");
-  Int_t var = cf->GetVar(varStr);
-    
-  TH1D* phiProj = (TH1D*)cf->Project(1, varTrackPhi);
+  Int_t varTrackPhi = cf->GetVar(fgkVarNames[kTrackPhiTRD]);
+  Int_t otherVar = cf->GetVar(fgkVarNames[var]);
+  
+  TH1D* phiProj = (TH1D*)cf->Project(kTRD, varTrackPhi);
   Bool_t activeSM[18] = {kFALSE};
   CheckActiveSM(phiProj, activeSM); delete phiProj;
   Double_t smPhiLimits[19];
   for(Int_t ism=0; ism<=18; ++ism) smPhiLimits[ism] = -TMath::Pi() + (2.0*TMath::Pi()/18.0)*ism;
   
-  TH2D* hNomPhiVar = (TH2D*)cf->Project(stepNom, var, varTrackPhi);
-  TH2D* hDenomPhiVar = (TH2D*)cf->Project(stepDenom, var, varTrackPhi);
+  if((stepNom==kTRD || stepDenom==kTRD) &&
+     (minNtrkl>-1 && minNtrkl<7 && maxNtrkl>-1 && maxNtrkl<7))
+    cf->SetRangeUser(cf->GetVar(fgkVarNames[kTrackTrdTracklets]), Double_t(minNtrkl), Double_t(maxNtrkl));
   
-  TH1F* hEff = new TH1F(Form("hEff%s_%d_%d_%f", varStr, stepNom, stepDenom, gRandom->Rndm()), "", 
+  TH2D* hNomPhiVar = (TH2D*)cf->Project(stepNom, otherVar, varTrackPhi);
+  TH2D* hDenomPhiVar = (TH2D*)cf->Project(stepDenom, otherVar, varTrackPhi);
+  if((stepNom==kTRD || stepDenom==kTRD) &&
+     (minNtrkl>-1 && minNtrkl<7 && maxNtrkl>-1 && maxNtrkl<7))
+    cf->SetRangeUser(cf->GetVar(fgkVarNames[kTrackTrdTracklets]), 0.0,6.0);
+  
+  TH1F* hEff = new TH1F(Form("hEff%s_%d_%d_%f", fgkVarNames[var], stepNom, stepDenom, gRandom->Rndm()), "", 
                        hNomPhiVar->GetXaxis()->GetNbins(), hNomPhiVar->GetXaxis()->GetXbins()->GetArray());
+  for(Int_t ib=1;ib<=hNomPhiVar->GetXaxis()->GetNbins();++ib)
+    hEff->GetXaxis()->SetBinLabel(ib, hNomPhiVar->GetXaxis()->GetBinLabel(ib));
+  
   for(Int_t ivar=1; ivar<=hEff->GetXaxis()->GetNbins(); ++ivar) {
     Double_t nom = 0.0; Double_t denom = 0.0;
     Double_t eff = 0.0; Double_t err = 0.0;
@@ -2028,7 +1001,7 @@ TH1F* AliTRDcheckESD::EfficiencyTRD(TH3* tpc3D, TH3* trd3D, Bool_t useAcceptance
       Bool_t isActive = kFALSE;
       for(Int_t ism=0; ism<18; ++ism) {
         if(phi>=smPhiLimits[ism] && phi<smPhiLimits[ism+1] && activeSM[ism]) {
-          isActive = kTRUE;
+         isActive = kTRUE;
         }
       }
       if(!isActive) continue;
@@ -2068,13 +1041,17 @@ TH1F* AliTRDcheckESD::EfficiencyTRD(TH3* tpc3D, TH3* trd3D, Bool_t useAcceptance
   return efficiency;
 }
 
+
 //__________________________________________________________________________________________________
 void AliTRDcheckESD::PlotCentSummaryFromCF(Double_t* /*trendValues*/, const Char_t* /*triggerName*/, Bool_t /*useIsolatedBC*/, Bool_t /*cutTOFbc*/) {
   //
   // Make the centrality summary figure from the CF container 
   // 
-  if(!fMatchingPtCF) return;
-  AliCFContainer* cf = 0x0;    
+  if(!fHistos) return;
+  AliCFContainer* matchPt=(AliCFContainer*)fHistos->FindObject("MatchingPt");
+  if(!matchPt) return;
+  AliCFContainer* centCF=(AliCFContainer*)fHistos->FindObject("CentralityCF");
+  if(!centCF) return;
   
   TLatex* lat=new TLatex();
   lat->SetTextSize(0.06);
@@ -2085,8 +1062,6 @@ void AliTRDcheckESD::PlotCentSummaryFromCF(Double_t* /*trendValues*/, const Char
   TList* l=gPad->GetListOfPrimitives();
   TVirtualPad* pad=0x0;
   
-  //if(cutTOFbc) cf->SetRangeUser(stepTOFBC, 0.0, 0.0);
-  
   if(gROOT->FindObject("rangeEffPt")) delete gROOT->FindObject("rangeEffPt");
   TH2F* rangeEffPt=new TH2F("rangeEffPt", "",10,0.,10.,10,0.,1.3);
   rangeEffPt->SetStats(kFALSE);
@@ -2105,29 +1080,21 @@ void AliTRDcheckESD::PlotCentSummaryFromCF(Double_t* /*trendValues*/, const Char
     line.DrawLine(rangeEffPt->GetXaxis()->GetXmin(), 0.7, rangeEffPt->GetXaxis()->GetXmax(), 0.7);
     line.DrawLine(rangeEffPt->GetXaxis()->GetXmin(), 0.9, rangeEffPt->GetXaxis()->GetXmax(), 0.9);
     
-    cf = fMatchingPtCF;
-    cf->SetRangeUser(cf->GetVar("multiplicity"), Double_t(iCent), Double_t(iCent), kTRUE);
+    matchPt->SetRangeUser(matchPt->GetVar(fgkVarNames[kEventMult]), Double_t(iCent), Double_t(iCent), kTRUE);
        
-    cf->SetRangeUser(cf->GetVar("charge"), +1.0, +1.0);  
-    TH1F* hEffPosAll = EfficiencyFromPhiPt(cf, 1, 0);
-    cf->SetRangeUser(cf->GetVar("tracklets"), 4.0, 4.0);  
-    TH1F* hEffPosTrk4 = EfficiencyFromPhiPt(cf, 1, 0);
-    cf->SetRangeUser(cf->GetVar("tracklets"), 5.0, 5.0);  
-    TH1F* hEffPosTrk5 = EfficiencyFromPhiPt(cf, 1, 0);
-    cf->SetRangeUser(cf->GetVar("tracklets"), 6.0, 6.0);
-    TH1F* hEffPosTrk6 = EfficiencyFromPhiPt(cf, 1, 0);
+    matchPt->SetRangeUser(matchPt->GetVar(fgkVarNames[kTrackCharge]), +1.0, +1.0);  
+    TH1F* hEffPosAll = EfficiencyFromPhiPt(matchPt,  0,  6, 1, 0);
+    TH1F* hEffPosTrk4 = EfficiencyFromPhiPt(matchPt, 4,  4, 1, 0);  
+    TH1F* hEffPosTrk5 = EfficiencyFromPhiPt(matchPt, 5,  5, 1, 0);
+    TH1F* hEffPosTrk6 = EfficiencyFromPhiPt(matchPt, 6,  6, 1, 0);
      
-    cf->SetRangeUser(cf->GetVar("charge"), -1.0, -1.0);  
-    cf->SetRangeUser(cf->GetVar("tracklets"), 0.0, 6.0);
-    TH1F* hEffNegAll = EfficiencyFromPhiPt(cf, 1, 0);
-    cf->SetRangeUser(cf->GetVar("tracklets"), 4.0, 4.0);  
-    TH1F* hEffNegTrk4 = EfficiencyFromPhiPt(cf, 1, 0);
-    cf->SetRangeUser(cf->GetVar("tracklets"), 5.0, 5.0);  
-    TH1F* hEffNegTrk5 = EfficiencyFromPhiPt(cf, 1, 0);
-    cf->SetRangeUser(cf->GetVar("tracklets"), 6.0, 6.0);  
-    TH1F* hEffNegTrk6 = EfficiencyFromPhiPt(cf, 1, 0);
-    cf->SetRangeUser(cf->GetVar("tracklets"), 0.0, 6.0);  
-    cf->SetRangeUser(cf->GetVar("charge"), -1.0, +1.0);  
+    matchPt->SetRangeUser(matchPt->GetVar(fgkVarNames[kTrackCharge]), -1.0, -1.0);  
+    TH1F* hEffNegAll = EfficiencyFromPhiPt(matchPt, 0, 6, 1, 0);  
+    TH1F* hEffNegTrk4 = EfficiencyFromPhiPt(matchPt, 4, 4, 1, 0);  
+    TH1F* hEffNegTrk5 = EfficiencyFromPhiPt(matchPt, 5, 5, 1, 0);  
+    TH1F* hEffNegTrk6 = EfficiencyFromPhiPt(matchPt, 6, 6, 1, 0);
+    matchPt->SetRangeUser(matchPt->GetVar(fgkVarNames[kTrackTrdTracklets]), 0.0, 6.0);  
+    matchPt->SetRangeUser(matchPt->GetVar(fgkVarNames[kTrackCharge]), -1.0, +1.0);  
     
     SetStyle(hEffPosAll,  1, kRed, 1, 24, kRed, 1);
     SetStyle(hEffPosTrk4, 1, kRed, 1, 25, kRed, 1);
@@ -2162,11 +1129,11 @@ void AliTRDcheckESD::PlotCentSummaryFromCF(Double_t* /*trendValues*/, const Char
       leg->AddEntry(hEffNegTrk6, "neg. (6 tracklets)", "p");
       leg->Draw();
     }
-    lat->DrawLatex(0.2, 1.32, Form("%.0f < SPD tracklets < %.0f", cf->GetAxis(cf->GetVar("multiplicity"),0)->GetBinLowEdge(iCent), cf->GetAxis(cf->GetVar("multiplicity"),0)->GetBinUpEdge(iCent)));
+    lat->DrawLatex(0.2, 1.32, Form("%.0f < SPD tracklets < %.0f", matchPt->GetAxis(matchPt->GetVar(fgkVarNames[kEventMult]),0)->GetBinLowEdge(iCent), matchPt->GetAxis(matchPt->GetVar(fgkVarNames[kEventMult]),0)->GetBinUpEdge(iCent)));
   }   // end for loop over multiplicity classes
   
   // Reset the modified user ranges of the CF container
-  cf->SetRangeUser(cf->GetVar("multiplicity"), 0., 3500.);
+  matchPt->SetRangeUser(matchPt->GetVar(fgkVarNames[kEventMult]), 0., 3500.);
      
   // Cluster distributions in all multiplicity classes
   pad = ((TVirtualPad*)l->At(2)); pad->cd();
@@ -2185,11 +1152,11 @@ void AliTRDcheckESD::PlotCentSummaryFromCF(Double_t* /*trendValues*/, const Char
   legCls->SetBorderSize(0);
   legCls->SetFillColor(0);
   legCls->SetMargin(0.15);
-  cf = fCentralityCF;
+  
   for(Int_t iCent=0; iCent<6; ++iCent) {
     if(iCent>0)
-      cf->SetRangeUser(cf->GetVar("multiplicity"), Double_t(iCent), Double_t(iCent), kTRUE);
-    hNcls[iCent] = (TH1D*)cf->Project(0, cf->GetVar("clusters"));
+      centCF->SetRangeUser(centCF->GetVar(fgkVarNames[kEventMult]), Double_t(iCent), Double_t(iCent), kTRUE);
+    hNcls[iCent] = (TH1D*)centCF->Project(0, centCF->GetVar(fgkVarNames[kTrackTrdClusters]));
     if(!hNcls[iCent]) continue;
     
     hNcls[iCent]->SetLineColor(iCent<4 ? iCent+1 : iCent+2);
@@ -2202,12 +1169,12 @@ void AliTRDcheckESD::PlotCentSummaryFromCF(Double_t* /*trendValues*/, const Char
     
     if(hNcls[iCent]->Integral()>0.01) {
       hNcls[iCent]->Draw("same");
-      legCls->AddEntry(hNcls[iCent], (iCent==0 ? "all centralities" : Form("%.0f < SPD tracklets < %.0f", cf->GetAxis(cf->GetVar("multiplicity"),0)->GetBinLowEdge(iCent), 
-                                                                          cf->GetAxis(cf->GetVar("multiplicity"),0)->GetBinUpEdge(iCent))), "l");
+      legCls->AddEntry(hNcls[iCent], (iCent==0 ? "all centralities" : Form("%.0f < SPD tracklets < %.0f", centCF->GetAxis(centCF->GetVar(fgkVarNames[kEventMult]),0)->GetBinLowEdge(iCent), 
+                                                                          centCF->GetAxis(centCF->GetVar(fgkVarNames[kEventMult]),0)->GetBinUpEdge(iCent))), "l");
     }
   }
   legCls->Draw();
-  cf->SetRangeUser(cf->GetVar("multiplicity"), 0.0, 6.0, kTRUE);
+  centCF->SetRangeUser(centCF->GetVar(fgkVarNames[kEventMult]), 0.0, 6.0, kTRUE);
   
   // Qtot vs P
   pad = ((TVirtualPad*)l->At(5)); pad->cd();
@@ -2228,9 +1195,9 @@ void AliTRDcheckESD::PlotCentSummaryFromCF(Double_t* /*trendValues*/, const Char
   
   for(Int_t iCent=0; iCent<6; ++iCent) {
     if(iCent>0)
-      cf->SetRangeUser(cf->GetVar("multiplicity"), Double_t(iCent), Double_t(iCent), kTRUE);
+      centCF->SetRangeUser(centCF->GetVar(fgkVarNames[kEventMult]), Double_t(iCent), Double_t(iCent), kTRUE);
     
-    hQtot[iCent] = (TH1D*)cf->Project(0, cf->GetVar("Qtot0"));
+    hQtot[iCent] = (TH1D*)centCF->Project(0, centCF->GetVar(fgkVarNames[kTrackletQtot]));
     if(!hQtot[iCent]) continue;
     hQtot[iCent]->SetBinContent(1, 0);
     
@@ -2243,27 +1210,35 @@ void AliTRDcheckESD::PlotCentSummaryFromCF(Double_t* /*trendValues*/, const Char
     hQtot[iCent]->SetLineWidth(2);
     if(hQtot[iCent]->Integral()>0.01) {
       hQtot[iCent]->Draw(iCent==0 ? "" : "same");
-      leg2->AddEntry(hQtot[iCent], (iCent==0 ? "all centralities" : Form("%.0f < SPD tracklets < %.0f", cf->GetAxis(cf->GetVar("multiplicity"),0)->GetBinLowEdge(iCent), 
-                                                                          cf->GetAxis(cf->GetVar("multiplicity"),0)->GetBinUpEdge(iCent))), "l");
+      leg2->AddEntry(hQtot[iCent], (iCent==0 ? "all centralities" : Form("%.0f < SPD tracklets < %.0f", centCF->GetAxis(centCF->GetVar(fgkVarNames[kEventMult]),0)->GetBinLowEdge(iCent), 
+                                                                          centCF->GetAxis(centCF->GetVar(fgkVarNames[kEventMult]),0)->GetBinUpEdge(iCent))), "l");
     }
   }
   leg2->Draw();
-  cf->SetRangeUser(cf->GetVar("multiplicity"), 0.0, 5.0, kTRUE);
-  //if(cutTOFbc) cf->SetRangeUser(stepTOFBC, -1000.0, +1000.0);  // reset the cut on TOFbc
+  centCF->SetRangeUser(centCF->GetVar(fgkVarNames[kEventMult]), 0.0, 5.0, kTRUE);
 }
 
 
+
 //_________________________________________________________________
 void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char_t* /*triggerName*/, Bool_t /*useIsolatedBC*/, Bool_t /*cutTOFbc*/) {
   //
   //  Plot tracking summary
   //
-  if(!fMatchingPhiEtaCF || !fMatchingPtCF || !fCentralityCF || !fBunchCrossingsCF) return;
-  AliCFContainer* cf = 0x0;  
+  if(!fHistos) return;
+  AliCFContainer* matchPhiEta=(AliCFContainer*)fHistos->FindObject("MatchingPhiEta");
+  if(!matchPhiEta) return;
+  AliCFContainer* matchPt=(AliCFContainer*)fHistos->FindObject("MatchingPt");
+  if(!matchPt) return;
+  AliCFContainer* clustersCF=(AliCFContainer*)fHistos->FindObject("CentralityCF");
+  if(!clustersCF) return;
+  AliCFContainer* bcCF=(AliCFContainer*)fHistos->FindObject("BunchCrossingsCF");
+  if(!bcCF) return;
   
   TLatex *lat=new TLatex();
   lat->SetTextSize(0.06);
   lat->SetTextColor(2);
+  lat->SetTextFont(42);
   
   gPad->SetTopMargin(0.05); gPad->SetBottomMargin(0.001);
   gPad->SetLeftMargin(0.001); gPad->SetRightMargin(0.001);
@@ -2275,28 +1250,22 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
   pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
   pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
   pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  //cf->SetRangeUser(stepDCAxy, -0.999, +0.999);
-  //cf->SetRangeUser(stepDCAz, -3.0, +3.0);
-  //if(cutTOFbc) cf->SetRangeUser(stepTOFBC, 0.0, 0.0);
   
-  // find all the isolated bunch crossings with entries
   TH2D* hTPCrefPos = 0x0; TH2D* hTRDrefPos = 0x0; TH2D* hTOFrefPos = 0x0;
   TH2D* hTPCrefNeg = 0x0; TH2D* hTRDrefNeg = 0x0; TH2D* hTOFrefNeg = 0x0;
-  cf = fMatchingPhiEtaCF;
-  cf->SetRangeUser(cf->GetVar("tracklets"), 0.0, 6.0);
-  cf->SetRangeUser(cf->GetVar("charge"), +1.0, +1.0);      // positive charges
-  hTPCrefPos = (TH2D*)cf->Project(0, cf->GetVar("eta"), cf->GetVar("phi"));
-  hTRDrefPos = (TH2D*)cf->Project(1, cf->GetVar("eta"), cf->GetVar("phi"));
-  hTOFrefPos = (TH2D*)cf->Project(2, cf->GetVar("eta"), cf->GetVar("phi"));
-  cf->SetRangeUser(cf->GetVar("charge"), -1.0, -1.0);      // negative charges
-  hTPCrefNeg = (TH2D*)cf->Project(0, cf->GetVar("eta"), cf->GetVar("phi"));
-  hTRDrefNeg = (TH2D*)cf->Project(1, cf->GetVar("eta"), cf->GetVar("phi"));
-  hTOFrefNeg = (TH2D*)cf->Project(2, cf->GetVar("eta"), cf->GetVar("phi"));
-  cf->SetRangeUser(cf->GetVar("charge"), -1.0, +1.0);      // reset charge cut
+  matchPhiEta->SetRangeUser(matchPhiEta->GetVar(fgkVarNames[kTrackTrdTracklets]), 0.0, 6.0);
+  matchPhiEta->SetRangeUser(matchPhiEta->GetVar(fgkVarNames[kTrackCharge]), +1.0, +1.0);      // positive charges
+  hTPCrefPos = (TH2D*)matchPhiEta->Project(0, matchPhiEta->GetVar(fgkVarNames[kTrackEtaTRD]), matchPhiEta->GetVar(fgkVarNames[kTrackPhiTRD]));
+  hTRDrefPos = (TH2D*)matchPhiEta->Project(1, matchPhiEta->GetVar(fgkVarNames[kTrackEtaTRD]), matchPhiEta->GetVar(fgkVarNames[kTrackPhiTRD]));
+  hTOFrefPos = (TH2D*)matchPhiEta->Project(2, matchPhiEta->GetVar(fgkVarNames[kTrackEtaTRD]), matchPhiEta->GetVar(fgkVarNames[kTrackPhiTRD]));
+  matchPhiEta->SetRangeUser(matchPhiEta->GetVar(fgkVarNames[kTrackCharge]), -1.0, -1.0);      // negative charges
+  hTPCrefNeg = (TH2D*)matchPhiEta->Project(0, matchPhiEta->GetVar(fgkVarNames[kTrackEtaTRD]), matchPhiEta->GetVar(fgkVarNames[kTrackPhiTRD]));
+  hTRDrefNeg = (TH2D*)matchPhiEta->Project(1, matchPhiEta->GetVar(fgkVarNames[kTrackEtaTRD]), matchPhiEta->GetVar(fgkVarNames[kTrackPhiTRD]));
+  hTOFrefNeg = (TH2D*)matchPhiEta->Project(2, matchPhiEta->GetVar(fgkVarNames[kTrackEtaTRD]), matchPhiEta->GetVar(fgkVarNames[kTrackPhiTRD]));
+  matchPhiEta->SetRangeUser(matchPhiEta->GetVar(fgkVarNames[kTrackCharge]), -1.0, +1.0);      // reset charge cut
     
   if(gROOT->FindObject("rangeEtaPhi")) delete gROOT->FindObject("rangeEtaPhi");
-  TH2F* rangeEtaPhi = new TH2F("rangeEtaPhi", "", 10, -0.99, +0.99, 10, -3.4, +3.4);
+  TH2F* rangeEtaPhi = new TH2F("rangeEtaPhi", "", 10, -0.99, +0.99, 10, -3.15, 3.15);
   SetStyle(rangeEtaPhi->GetXaxis(), "#eta", 0.07, 0.8, kTRUE, 0.05);
   SetStyle(rangeEtaPhi->GetYaxis(), "detector #varphi", 0.07, 0.8, kTRUE, 0.05);
   rangeEtaPhi->SetStats(kFALSE);  
@@ -2316,7 +1285,7 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
     hTRDeffPos->Divide(hTRDrefPos, hTPCrefPos);
     hTRDeffPos->SetMaximum(1.0);
     hTRDeffPos->Draw("samecolz");
-    lat->DrawLatex(-0.9, 3.6, "TPC-TRD matching for positive tracks");
+    lat->DrawLatex(-0.9, 3.3, "TPC-TRD matching for positive tracks");
     DrawTRDGrid();
   }
   
@@ -2335,7 +1304,7 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
     hTRDeffNeg->Divide(hTRDrefNeg, hTPCrefNeg);
     hTRDeffNeg->SetMaximum(1.0);
     hTRDeffNeg->Draw("samecolz");
-    lat->DrawLatex(-0.9, 3.6, "TPC-TRD matching for negative tracks");
+    lat->DrawLatex(-0.9, 3.3, "TPC-TRD matching for negative tracks");
     DrawTRDGrid();  
   }
   
@@ -2354,7 +1323,7 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
     hTOFeffPos->Divide(hTOFrefPos, hTRDrefPos);
     hTOFeffPos->SetMaximum(1.0);
     hTOFeffPos->Draw("samecolz");
-    lat->DrawLatex(-0.9, 3.6, "TRD-TOF matching for positive tracks");
+    lat->DrawLatex(-0.9, 3.3, "TRD-TOF matching for positive tracks");
     DrawTRDGrid();
   }
   
@@ -2373,7 +1342,7 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
     hTOFeffNeg->Divide(hTOFrefNeg, hTRDrefNeg);
     hTOFeffNeg->SetMaximum(1.0);
     hTOFeffNeg->Draw("samecolz");
-    lat->DrawLatex(-0.9, 3.6, "TRD-TOF matching for negative tracks");
+    lat->DrawLatex(-0.9, 3.3, "TRD-TOF matching for negative tracks");
     DrawTRDGrid();
   }
   
@@ -2381,35 +1350,26 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
   if(hTRDrefNeg) delete hTRDrefNeg; if(hTPCrefNeg) delete hTPCrefNeg; if(hTOFrefNeg) delete hTOFrefNeg;
   
   // switch to the Pt cf container
-  cf = fMatchingPtCF;
-  cf->SetRangeUser(cf->GetVar("charge"), +1.0, +1.0);  
-  TH1F* hTRDEffPtPosAll = EfficiencyFromPhiPt(cf, 1, 0);
-  TH1F* hTOFEffPtPosAll = EfficiencyFromPhiPt(cf, 2, 1);
-  cf->SetRangeUser(cf->GetVar("tracklets"), 4.0, 4.0);  
-  TH1F* hTRDEffPtPosTrk4 = EfficiencyFromPhiPt(cf, 1, 0);
-  TH1F* hTOFEffPtPosTrk4 = EfficiencyFromPhiPt(cf, 2, 1);
-  cf->SetRangeUser(cf->GetVar("tracklets"), 5.0, 5.0);  
-  TH1F* hTRDEffPtPosTrk5 = EfficiencyFromPhiPt(cf, 1, 0);
-  TH1F* hTOFEffPtPosTrk5 = EfficiencyFromPhiPt(cf, 2, 1);
-  cf->SetRangeUser(cf->GetVar("tracklets"), 6.0, 6.0);
-  TH1F* hTRDEffPtPosTrk6 = EfficiencyFromPhiPt(cf, 1, 0);
-  TH1F* hTOFEffPtPosTrk6 = EfficiencyFromPhiPt(cf, 2, 1);
-  
-  cf->SetRangeUser(cf->GetVar("charge"), -1.0, -1.0);  
-  cf->SetRangeUser(cf->GetVar("tracklets"), 0.0, 6.0);
-  TH1F* hTRDEffPtNegAll = EfficiencyFromPhiPt(cf, 1, 0);
-  TH1F* hTOFEffPtNegAll = EfficiencyFromPhiPt(cf, 2, 1);
-  cf->SetRangeUser(cf->GetVar("tracklets"), 4.0, 4.0);  
-  TH1F* hTRDEffPtNegTrk4 = EfficiencyFromPhiPt(cf, 1, 0);
-  TH1F* hTOFEffPtNegTrk4 = EfficiencyFromPhiPt(cf, 2, 1);
-  cf->SetRangeUser(cf->GetVar("tracklets"), 5.0, 5.0);  
-  TH1F* hTRDEffPtNegTrk5 = EfficiencyFromPhiPt(cf, 1, 0);
-  TH1F* hTOFEffPtNegTrk5 = EfficiencyFromPhiPt(cf, 2, 1);
-  cf->SetRangeUser(cf->GetVar("tracklets"), 6.0, 6.0);  
-  TH1F* hTRDEffPtNegTrk6 = EfficiencyFromPhiPt(cf, 1, 0);
-  TH1F* hTOFEffPtNegTrk6 = EfficiencyFromPhiPt(cf, 2, 1);
-  cf->SetRangeUser(cf->GetVar("tracklets"), 0.0, 6.0);  
-  cf->SetRangeUser(cf->GetVar("charge"), -1.0, +1.0);  
+  matchPt->SetRangeUser(matchPt->GetVar(fgkVarNames[kTrackCharge]), +1.0, +1.0);  
+  TH1F* hTRDEffPtPosAll = EfficiencyFromPhiPt(matchPt, 0, 6, 1, 0);
+  TH1F* hTOFEffPtPosAll = EfficiencyFromPhiPt(matchPt, 0, 6, 2, 1);
+  TH1F* hTRDEffPtPosTrk4 = EfficiencyFromPhiPt(matchPt, 4, 4, 1, 0);
+  TH1F* hTOFEffPtPosTrk4 = EfficiencyFromPhiPt(matchPt, 4, 4, 2, 1);
+  TH1F* hTRDEffPtPosTrk5 = EfficiencyFromPhiPt(matchPt, 5, 5, 1, 0);
+  TH1F* hTOFEffPtPosTrk5 = EfficiencyFromPhiPt(matchPt, 5, 5, 2, 1);
+  TH1F* hTRDEffPtPosTrk6 = EfficiencyFromPhiPt(matchPt, 6, 6, 1, 0);
+  TH1F* hTOFEffPtPosTrk6 = EfficiencyFromPhiPt(matchPt, 6, 6, 2, 1);
+  
+  matchPt->SetRangeUser(matchPt->GetVar(fgkVarNames[kTrackCharge]), -1.0, -1.0);  
+  TH1F* hTRDEffPtNegAll = EfficiencyFromPhiPt(matchPt, 0, 6, 1, 0);
+  TH1F* hTOFEffPtNegAll = EfficiencyFromPhiPt(matchPt, 0, 6, 2, 1);
+  TH1F* hTRDEffPtNegTrk4 = EfficiencyFromPhiPt(matchPt, 4, 4, 1, 0);
+  TH1F* hTOFEffPtNegTrk4 = EfficiencyFromPhiPt(matchPt, 4, 4, 2, 1);
+  TH1F* hTRDEffPtNegTrk5 = EfficiencyFromPhiPt(matchPt, 5, 5, 1, 0);
+  TH1F* hTOFEffPtNegTrk5 = EfficiencyFromPhiPt(matchPt, 5, 5, 2, 1);
+  TH1F* hTRDEffPtNegTrk6 = EfficiencyFromPhiPt(matchPt, 6, 6, 1, 0);
+  TH1F* hTOFEffPtNegTrk6 = EfficiencyFromPhiPt(matchPt, 6, 6, 2, 1);
+  matchPt->SetRangeUser(matchPt->GetVar(fgkVarNames[kTrackCharge]), -1.0, +1.0);  
   
   TF1* funcConst = new TF1("constFunc", "[0]", 1.0, 3.0);
   if(trendValues) {
@@ -2454,7 +1414,7 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
   SetStyle(rangeEffPt->GetXaxis(), "p_{T} [GeV/c]", 0.07, 0.8, kTRUE, 0.05);
   SetStyle(rangeEffPt->GetYaxis(), "efficiency", 0.07, 0.8, kTRUE, 0.05);
   rangeEffPt->Draw();
-  lat->DrawLatex(0.2, 1.42, "TPC-TRD matching efficiency");
+  lat->DrawLatex(0.2, 1.44, "TPC-TRD matching efficiency");
   //++++++++++++++++++
   TLine line;
   line.SetLineStyle(2);
@@ -2466,7 +1426,7 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
   leg->SetMargin(0.15);
   leg->SetBorderSize(0);
   leg->SetFillColor(0);
-  
+
   SetStyle(hTRDEffPtPosAll, 1, kRed, 1, 24, kRed, 1);
   SetStyle(hTRDEffPtNegAll, 1, kBlue, 1, 24, kBlue, 1);
   SetStyle(hTRDEffPtPosTrk4, 1, kRed, 1, 25, kRed, 1);
@@ -2494,8 +1454,7 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
   pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
   
   rangeEffPt->Draw();
-  lat->DrawLatex(0.2, 1.42, "TRD-TOF matching efficiency");
-  
+  lat->DrawLatex(0.2, 1.44, "TRD-TOF matching efficiency");
   SetStyle(hTOFEffPtPosAll, 1, kRed, 1, 24, kRed, 1);
   SetStyle(hTOFEffPtPosTrk4, 1, kRed, 1, 25, kRed, 1);
   SetStyle(hTOFEffPtPosTrk5, 1, kRed, 1, 26, kRed, 1);
@@ -2521,10 +1480,9 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
   pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
   
   rangeEtaPhi->Draw();
-  lat->DrawLatex(-0.9, 3.6, "TRD <N_{tracklets}>");
+  lat->DrawLatex(-0.9, 3.3, "TRD <N_{tracklets}>");
   
-  cf = fMatchingPhiEtaCF;
-  TH3D* hNtracklets = (TH3D*)cf->Project(1, cf->GetVar("phi"), cf->GetVar("eta"), cf->GetVar("tracklets"));
+  TH3D* hNtracklets = (TH3D*)matchPhiEta->Project(kTRD, matchPhiEta->GetVar(fgkVarNames[kTrackPhiTRD]), matchPhiEta->GetVar(fgkVarNames[kTrackEtaTRD]), matchPhiEta->GetVar(fgkVarNames[kTrackTrdTracklets]));
   
   TProfile2D* hNtrackletsProf = hNtracklets->Project3DProfile();
   delete hNtracklets;
@@ -2537,8 +1495,7 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
   }
   
   // calculate the trend value for tracklets/track
-  cf = fMatchingPtCF;
-  TH2D* hNtrackletsVsP = (TH2D*)cf->Project(1, cf->GetVar("pt"), cf->GetVar("tracklets"));
+  TH2D* hNtrackletsVsP = (TH2D*)matchPt->Project(kTRD, matchPt->GetVar(fgkVarNames[kTrackPt]), matchPt->GetVar(fgkVarNames[kTrackTrdTracklets]));
   if(trendValues &&  hNtrackletsVsP && hNtrackletsVsP->GetEntries()>0.1) {
     TProfile* hNtrackletsVsPprof = hNtrackletsVsP->ProfileX("hNtrackletsVsPprof");
     hNtrackletsVsPprof->Fit(funcConst, "QME0", "goff", 1.0, 3.0);
@@ -2546,7 +1503,7 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
     trendValues[9] = funcConst->GetParError(0);
     delete hNtrackletsVsP;
   }
-      
+    
   //--------------------------------------------------------------
   // Nclusters per TRD track vs momentum
   pad = ((TVirtualPad*)l->At(5)); pad->cd();
@@ -2563,12 +1520,11 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
   rangeNclsP->Draw();
   lat->DrawLatex(1.0, 205., "TRD Clusters / track");
   
-  cf = fCentralityCF;
-  TH2D* hNclsVsP = (TH2D*)cf->Project(0, cf->GetVar("P"), cf->GetVar("clusters"));
+  TH2D* hNclsVsP = (TH2D*)clustersCF->Project(0, clustersCF->GetVar(fgkVarNames[kTrackP]), clustersCF->GetVar(fgkVarNames[kTrackTrdClusters]));
   if(hNclsVsP) {
     hNclsVsP->SetStats(kFALSE);
     hNclsVsP->Draw("samecolz");
-  }    
+  }
   
   if(trendValues && hNclsVsP && hNclsVsP->GetEntries()>10) {
     TProfile* hNclsVsPprof = hNclsVsP->ProfileX("hNclsVsPprof");
@@ -2576,7 +1532,7 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
     trendValues[10] = funcConst->GetParameter(0);
     trendValues[11] = funcConst->GetParError(0);
   }
-    
+  
   //--------------------------------------------------------------
   // TRD-TPC and TOF-TRD matching efficiency vs bunch crossing
   pad = ((TVirtualPad*)l->At(8)); pad->cd();
@@ -2584,10 +1540,9 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
   pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
   pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
 
-  cf = fBunchCrossingsCF;
-  TH1F* hTRDEffBC = EfficiencyFromPhiPt(cf, 1, 0, "BC");
-  TH1F* hTOFEffBC = EfficiencyFromPhiPt(cf, 2, 1, "BC");
-  
+  TH1F* hTRDEffBC = EfficiencyFromPhiPt(bcCF, -1, -1, 1, 0, kEventBC);
+  TH1F* hTOFEffBC = EfficiencyFromPhiPt(bcCF, -1, -1, 2, 1, kEventBC);
+   
   if(gROOT->FindObject("rangeBC")) delete gROOT->FindObject("rangeBC");
   TH2F* rangeBC = new TH2F("rangeBC", "", 10, -0.5, 3499.5, 10, 0.0, 1.4);
   rangeBC->SetStats(kFALSE);
@@ -2606,39 +1561,38 @@ void AliTRDcheckESD::PlotTrackingSummaryFromCF(Double_t* trendValues, const Char
     hTRDEffBC->Draw("same");
     hTOFEffBC->Draw("same");
     legBC->Draw();
-    lat->DrawLatex(200., 1.42, "Matching efficiency at 1<p_{T}<3 GeV/c");
+    lat->DrawLatex(200., 1.44, "Matching efficiency at 1<p_{T}<3 GeV/c");
   }
-    
-  // reset the user range on the event multiplicity
-  //if(cutTOFbc) cf->SetRangeUser(stepTOFBC, -1000.0, +1000.0);  // reset the cut on TOFbc
   
   delete funcConst;
 }
 
 
+
 //_________________________________________________________________
 void AliTRDcheckESD::PlotPidSummaryFromCF(Double_t* trendValues, const Char_t* /*triggerName*/, Bool_t /*useIsolatedBC*/, Bool_t /*cutTOFbc*/) {
   //
-  // Centrality summary
+  // PID summary
   //
-  if(!fQtotCF || !fPulseHeightCF || !fCentralityCF) return;
-  
-  AliCFContainer* cf = 0x0;
+  if(!fHistos) return;
+  AliCFContainer* qtotCF = (AliCFContainer*)fHistos->FindObject("QtotCF");
+  if(!qtotCF) return;
+  AliCFContainer* phCF = (AliCFContainer*)fHistos->FindObject("PulseHeightCF");
+  if(!phCF) return;
+  AliCFContainer* centCF = (AliCFContainer*)fHistos->FindObject("CentralityCF");
+  if(!centCF) return;   
   
   TLatex *lat=new TLatex();
   lat->SetTextSize(0.07);
   lat->SetTextColor(2);
+  lat->SetTextFont(42);
   gPad->SetTopMargin(0.05); gPad->SetBottomMargin(0.001);
   gPad->SetLeftMargin(0.001); gPad->SetRightMargin(0.001);
   gPad->Divide(3,3,0.,0.);
   TList* l=gPad->GetListOfPrimitives();
-  
-  //cf->SetRangeUser(stepDCAxy, -0.999, +0.999);
-  //cf->SetRangeUser(stepDCAz, -3.0, +3.0);
-  //if(cutTOFbc) cf->SetRangeUser(stepTOFBC, 0.0, 0.0);
-  
+    
   if(gROOT->FindObject("rangeEtaPhi2")) delete gROOT->FindObject("rangeEtaPhi2");
-  TH2F* rangeEtaPhi = new TH2F("rangeEtaPhi2", "", 10, -0.99, +0.99, 10, -3.4, +3.4);
+  TH2F* rangeEtaPhi = new TH2F("rangeEtaPhi2", "", 10, -0.99, +0.99, 10, -3.15, 3.15);
   SetStyle(rangeEtaPhi->GetXaxis(), "#eta", 0.07, 0.8, kTRUE, 0.05);
   SetStyle(rangeEtaPhi->GetYaxis(), "detector #varphi", 0.07, 0.8, kTRUE, 0.05);
   rangeEtaPhi->SetStats(kFALSE);  
@@ -2646,30 +1600,29 @@ void AliTRDcheckESD::PlotPidSummaryFromCF(Double_t* trendValues, const Char_t* /
   // eta-phi distr. for <Qtot> in layer 0
   TVirtualPad* pad;
   TProfile2D* hProf2D;
-  cf = fQtotCF;
+  TH1D* hqtot = (TH1D*)qtotCF->Project(0, qtotCF->GetVar(fgkVarNames[kTrackletQtot]));
   for(Int_t iLayer=0; iLayer<6; ++iLayer) {
     pad = ((TVirtualPad*)l->At((iLayer<3 ? iLayer*3 : (iLayer-3)*3+1))); pad->cd();
     pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
     pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
     pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
     rangeEtaPhi->Draw();
-    
-    cf->SetRangeUser(cf->GetVar("layer"), Double_t(iLayer), Double_t(iLayer));
-    TH3D* hQtotEtaPhi = (TH3D*)cf->Project(0, cf->GetVar("phi"), cf->GetVar("eta"), cf->GetVar("Qtot0"));
+    qtotCF->SetRangeUser(qtotCF->GetVar(fgkVarNames[kTrackletLayer]), Double_t(iLayer), Double_t(iLayer));
+    TH3D* hQtotEtaPhi = (TH3D*)qtotCF->Project(0, qtotCF->GetVar(fgkVarNames[kTrackPhiTRD]), qtotCF->GetVar(fgkVarNames[kTrackEtaTRD]), qtotCF->GetVar(fgkVarNames[kTrackletQtot]));  
     hProf2D = (hQtotEtaPhi ? hQtotEtaPhi->Project3DProfile() : 0x0);
     if(hQtotEtaPhi) delete hQtotEtaPhi;
     
     if(hProf2D) {
+      hProf2D->SetName(Form("Qtot_layer%d",iLayer));
       hProf2D->SetStats(kFALSE);
       hProf2D->SetMinimum(0.);
-      hProf2D->SetMaximum(4.);
+      hProf2D->SetMaximum((hqtot->GetMean()<10 ? 4.0 : 2000.));
       hProf2D->Draw("samecolz");
     }
-    lat->DrawLatex(-0.9, 3.6, Form("TRD <Q_{tot}> Layer %d", iLayer));
+    lat->DrawLatex(-0.9, 3.3, Form("TRD <Q_{tot}> Layer %d", iLayer));
     DrawTRDGrid();
   }
-  cf->SetRangeUser(cf->GetVar("layer"), 0.0, 5.0);
-    
+  qtotCF->SetRangeUser(qtotCF->GetVar(fgkVarNames[kTrackletLayer]), 0.0, 5.0);
   // PH versus slice number
   pad = ((TVirtualPad*)l->At(2)); pad->cd();
   pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
@@ -2677,7 +1630,7 @@ void AliTRDcheckESD::PlotPidSummaryFromCF(Double_t* trendValues, const Char_t* /
   pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
   
   if(gROOT->FindObject("rangePHslice")) delete gROOT->FindObject("rangePHslice");
-  TH2F* rangePHslice=new TH2F("rangePHslice", "", 8, -0.5, 7.5, 10, 0.0, 6.);
+  TH2F* rangePHslice=new TH2F("rangePHslice", "", 8, -0.5, 7.5, 10, 0.0, (hqtot->GetMean()<10.0 ? 6.0 : 3000.));
   rangePHslice->SetStats(kFALSE);
   SetStyle(rangePHslice->GetXaxis(), "slice", 0.07, 0.8, kTRUE, 0.05);
   SetStyle(rangePHslice->GetYaxis(), "PH", 0.07, 0.8, kTRUE, 0.05);
@@ -2685,25 +1638,24 @@ void AliTRDcheckESD::PlotPidSummaryFromCF(Double_t* trendValues, const Char_t* /
   
   TF1* funcPol1 = new TF1("funcPol1", "[0]+[1]*x", 2.9, 6.4);
   
-  cf = fPulseHeightCF;
-  TH2D* hPH = (TH2D*)cf->Project(0, cf->GetVar("slice"), cf->GetVar("PH0"));
+  TH2D* hPH = (TH2D*)phCF->Project(0, phCF->GetVar(fgkVarNames[kTrackletSlice]), phCF->GetVar(fgkVarNames[kTrackletPHslice]));
   TH1D* hSliceErr = new TH1D(Form("hSliceErr%f", gRandom->Rndm()), "", hPH->GetXaxis()->GetNbins(), hPH->GetXaxis()->GetXbins()->GetArray());
   TH1D* hLandauFit = Proj2D(hPH, hSliceErr);
   hPH->SetStats(kFALSE);
   hPH->Draw("samecolz");
+  const Double_t kQx = 0.002;
   if(trendValues) {
     hSliceErr->Fit(funcPol1, "QME0", "goff", 2.9, 6.4);
-    trendValues[12] = funcPol1->GetParameter(0);  // PH plateau
-    trendValues[13] = funcPol1->GetParError(0);   // PH plateau
-    trendValues[14] = funcPol1->GetParameter(1);  // PH slope
-    trendValues[15] = funcPol1->GetParError(1);   // PH slope
+    trendValues[12] = kQx*funcPol1->GetParameter(0);  // PH plateau
+    trendValues[13] = kQx*funcPol1->GetParError(0);   // PH plateau
+    trendValues[14] = kQx*funcPol1->GetParameter(1);  // PH slope
+    trendValues[15] = kQx*funcPol1->GetParError(1);   // PH slope
   }
   hLandauFit->SetLineWidth(2);
   hLandauFit->SetLineStyle(2);
   hLandauFit->Draw("same");
   
   delete funcPol1; delete hSliceErr;
-  
   // Qtot vs P
   pad = ((TVirtualPad*)l->At(5)); pad->cd();
   pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
@@ -2712,635 +1664,423 @@ void AliTRDcheckESD::PlotPidSummaryFromCF(Double_t* trendValues, const Char_t* /
   pad->SetLogz();
   
   if(gROOT->FindObject("rangeQtotP")) delete gROOT->FindObject("rangeQtotP");
-  TH2F* rangeQtotP = new TH2F("rangeQtotP", "", 10, 0.0, 11.99, 10, 0.0, 11.99);
+  TH2F* rangeQtotP = new TH2F("rangeQtotP", "", 10, 0.0, 11.99, 10, 0.0, (hqtot->GetMean()<10.0 ? 11.99 : 5999.));
   SetStyle(rangeQtotP->GetXaxis(), "P [GeV/c]", 0.07, 0.8, kTRUE, 0.05);
   SetStyle(rangeQtotP->GetYaxis(), "Q_{tot}", 0.07, 0.8, kTRUE, 0.05);
   rangeQtotP->SetStats(kFALSE);
   rangeQtotP->Draw();
   
-  cf = fCentralityCF;
-  TH2D* hQtotP = (TH2D*)cf->Project(0, cf->GetVar("P"), cf->GetVar("Qtot0"));
-    
+  Int_t pVar = centCF->GetVar(fgkVarNames[kTrackP]);
+  if(pVar<0) pVar = centCF->GetVar(fgkVarNames[kTrackletP]);
+  TH2D* hQtotP = (TH2D*)centCF->Project(0, pVar, centCF->GetVar(fgkVarNames[kTrackletQtot]));
+  TH1D* mpvErr=new TH1D("mpvErr", "Landau MPV error vs. P", hQtotP->GetXaxis()->GetNbins(), hQtotP->GetXaxis()->GetXbins()->GetArray());  
+  TH1D* widthErr=new TH1D("widthErr", "Landau width error vs. P", hQtotP->GetXaxis()->GetNbins(), hQtotP->GetXaxis()->GetXbins()->GetArray());
+  TH1D* landauChi2=new TH1D("landauChi2", "Landau fit #chi^{2} vs. P", hQtotP->GetXaxis()->GetNbins(), hQtotP->GetXaxis()->GetXbins()->GetArray());  
   if(hQtotP)
     for(Int_t i=1; i<=hQtotP->GetXaxis()->GetNbins(); ++i) 
       hQtotP->SetBinContent(i, 1, 0.0);  
-  TH1D* hQtotProj = (hQtotP ? Proj2D(hQtotP) : 0x0);
+  TH1D* hQtotProj = (hQtotP ? Proj2D(hQtotP, mpvErr, widthErr, landauChi2) : 0x0);
+  //landauChi2->Scale(0.001);
   if(hQtotProj) SetStyle(hQtotProj, 2, kBlue, 2, 1, kBlue, 1);
   if(trendValues && hQtotProj && hQtotProj->GetEntries()>2) {
-    trendValues[16] = hQtotProj->GetBinContent(hQtotProj->FindBin(1.0));   // Landau MPV at 1GeV/c
-    trendValues[17] = hQtotProj->GetBinError(hQtotProj->FindBin(1.0));     // Landau width at 1 GeV/c
+    trendValues[16] = kQx*hQtotProj->GetBinContent(hQtotProj->FindBin(1.0));   // Landau MPV at 1GeV/c
+    trendValues[17] = kQx*hQtotProj->GetBinError(hQtotProj->FindBin(1.0));     // Landau width at 1 GeV/c
   }
   if(hQtotP) {
     hQtotP->SetStats(kFALSE);
     hQtotP->Draw("samecolz");
     hQtotProj->Draw("same");
   }
-  //if(cutTOFbc) cf->SetRangeUser(stepTOFBC, -1000.0, +1000.0);  // reset the cut on TOFbc
-}
-
-
-//_________________________________________________________________
-Bool_t AliTRDcheckESD::PlotCentSummary(Double_t* /*trendValues*/) {
-
-  Bool_t isGoodForSaving=kFALSE;
   
-  TLatex* lat=new TLatex();
-  lat->SetTextSize(0.06);
-  lat->SetTextColor(2);
-
-  gPad->SetTopMargin(0.05); gPad->SetBottomMargin(0.001);
-  gPad->SetLeftMargin(0.001); gPad->SetRightMargin(0.001);
-  gPad->Divide(3,3,0.,0.);
-  TList* l=gPad->GetListOfPrimitives();
-  
-  TPad* pad=0x0;  
-
-  if(gROOT->FindObject("rangeEffPt")) delete gROOT->FindObject("rangeEffPt");
-  TH2F* rangeEffPt=new TH2F("rangeEffPt", "",10,0.,10.,10,0.,1.4);
-  rangeEffPt->SetStats(kFALSE);
-  SetStyle(rangeEffPt->GetXaxis(), "p_{T} [GeV/c]", 0.07, 0.8, kTRUE, 0.05);
-  SetStyle(rangeEffPt->GetYaxis(), "efficiency", 0.07, 0.8, kTRUE, 0.05);
-  
-  TH3F *h3(NULL), *h3p(NULL), *h3n(NULL);
-  Int_t padsForEffs[5] = {0,3,6,1,4};
-  for(Int_t iCent=1; iCent<6; ++iCent) {
-    // TPC-TRD matching efficiencies
-    pad = ((TPad*)l->At(padsForEffs[iCent-1])); pad->cd();
-    pad->SetLeftMargin(0.15); pad->SetRightMargin(0.02); pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-    pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-    
-    if(!(h3p = dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksPos+iCent)))) continue;
-    if(!(h3n = dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksNeg+iCent)))) continue;
-    // =============================================
-    if(!(h3 = dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksPos+iCent)))) continue;
-    TH1F* hFeffP = EfficiencyTRD(h3p, h3, kTRUE);
-    //
-    if(!(h3 = dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksNeg+iCent)))) continue;
-    TH1F* hFeffN = EfficiencyTRD(h3n, h3, kTRUE);
-    // =============================================
-    if(!(h3 = dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksPos4+iCent)))) continue;
-    TH1F* hFeffP4 = EfficiencyTRD(h3p, h3, kTRUE);
-    //
-    if(!(h3 = dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksNeg4+iCent)))) continue;
-    TH1F* hFeffN4 = EfficiencyTRD(h3n, h3, kTRUE);
-    // =============================================
-    if(!(h3 = dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksPos5+iCent)))) continue;
-    TH1F* hFeffP5 = EfficiencyTRD(h3p, h3, kTRUE);
-    //
-    if(!(h3 = dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksNeg5+iCent)))) continue;
-    TH1F* hFeffN5 = EfficiencyTRD(h3n, h3, kTRUE);
-    // =============================================
-    if(!(h3 = dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksPos6+iCent)))) continue;
-    TH1F* hFeffP6 = EfficiencyTRD(h3p, h3, kTRUE);
-    //
-    if(!(h3 = dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksNeg6+iCent)))) continue;
-    TH1F* hFeffN6 = EfficiencyTRD(h3n, h3, kTRUE);
-  
-    rangeEffPt->Draw();
-    
-    TLine line;
-    line.SetLineStyle(2);
-    line.SetLineWidth(2);
-    line.DrawLine(rangeEffPt->GetXaxis()->GetXmin(), 0.7, rangeEffPt->GetXaxis()->GetXmax(), 0.7);
-    line.DrawLine(rangeEffPt->GetXaxis()->GetXmin(), 0.9, rangeEffPt->GetXaxis()->GetXmax(), 0.9);
-    line.SetLineStyle(1);
-    line.SetLineWidth(1);
-    line.DrawLine(rangeEffPt->GetXaxis()->GetXmin(), 1.0, rangeEffPt->GetXaxis()->GetXmax(), 1.0);
-    if(hFeffP) SetStyle(hFeffP, 1, kRed, 1, 24, kRed, 1);
-    if(hFeffP4) SetStyle(hFeffP4, 1, kRed, 1, 25, kRed, 1);
-    if(hFeffP5) SetStyle(hFeffP5, 1, kRed, 1, 26, kRed, 1);
-    if(hFeffP6) SetStyle(hFeffP6, 1, kRed, 1, 27, kRed, 1);
-    if(hFeffN) SetStyle(hFeffN, 1, kBlue, 1, 24, kBlue, 1);
-    if(hFeffN4) SetStyle(hFeffN4, 1, kBlue, 1, 25, kBlue, 1);
-    if(hFeffN5) SetStyle(hFeffN5, 1, kBlue, 1, 26, kBlue, 1);
-    if(hFeffN6) SetStyle(hFeffN6, 1, kBlue, 1, 27, kBlue, 1);
-    
-    TLegend* leg=new TLegend(0.16, 0.7, 0.61, 0.89);
-    leg->SetFillColor(0);
-    leg->SetNColumns(2);
-    leg->SetTextSize(0.039);
-    leg->SetMargin(0.1);
-    if(hFeffP && hFeffP->Integral()>0.001) {
-      isGoodForSaving = kTRUE;
-      hFeffP->Draw("same");
-      leg->AddEntry(hFeffP, "pos. (#geq 1 trcklt)", "p");
-    }
-    if(hFeffN && hFeffN->Integral()>0.001) {
-      isGoodForSaving = kTRUE;
-      hFeffN->Draw("same");
-      leg->AddEntry(hFeffN, "neg. (#geq 1 trcklt)", "p");
-    }
-    if(hFeffP4 && hFeffP4->Integral()>0.001) {
-      isGoodForSaving = kTRUE;
-      hFeffP4->Draw("same");
-      leg->AddEntry(hFeffP4, "pos. (4 trcklts)", "p");
-    }
-    if(hFeffN4 && hFeffN4->Integral()>0.001) {
-      isGoodForSaving = kTRUE;
-      hFeffN4->Draw("same");
-      leg->AddEntry(hFeffN4, "neg. (4 trcklts)", "p");
-    }
-    if(hFeffP5 && hFeffP5->Integral()>0.001) {
-      isGoodForSaving = kTRUE;
-      hFeffP5->Draw("same");
-      leg->AddEntry(hFeffP5, "pos. (5 trcklts)", "p");
-    }
-    if(hFeffN5 && hFeffN5->Integral()>0.001) {
-      isGoodForSaving = kTRUE;
-      hFeffN5->Draw("same");
-      leg->AddEntry(hFeffN5, "neg. (5 trcklts)", "p");
-    }
-    if(hFeffP6 && hFeffP6->Integral()>0.001) {
-      isGoodForSaving = kTRUE;
-      hFeffP6->Draw("same");
-      leg->AddEntry(hFeffP6, "pos. (6 trcklts)", "p");
-    }
-    if(hFeffN6 && hFeffN6->Integral()>0.001) {
-      isGoodForSaving = kTRUE;
-      hFeffN6->Draw("same");
-      leg->AddEntry(hFeffN6, "neg. (6 trklts)", "p");
-    }
-    
-    if(isGoodForSaving) {
-      if(iCent==1) leg->Draw();
-      lat->DrawLatex(5.6, 1.3, Form("Centrality class %d", iCent));
-      lat->DrawLatex(0.5, 1.42, "TPC-TRD matching efficiency");
-    }
-  }   // end loop over multiplicity intervals
-
-  // Number of clusters per TRD track
-  pad = ((TPad*)l->At(2)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.02);
-  pad->SetTopMargin(0.02); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  if(gROOT->FindObject("rangeNcls")) delete gROOT->FindObject("rangeNcls");
-  TH2F* rangeNcls = new TH2F("rangeNcls", "", 10, 0.0, 199.9, 10, 0.0, 1.199);
-  SetStyle(rangeNcls->GetXaxis(), "# TRD clusters", 0.07, 0.8, kTRUE, 0.05);
-  SetStyle(rangeNcls->GetYaxis(), "entries (a.u.)", 0.07, 0.8, kTRUE, 0.05);
-  rangeNcls->SetStats(kFALSE);
-  rangeNcls->Draw();
-  
-  TH2F* h2F[6]; TH1D* proj[6];
-  TLegend* leg=new TLegend(0.2, 0.7, 0.5, 0.95);
-  leg->SetFillColor(0);
-  Bool_t isGood=kFALSE;
-  for(Int_t iCent=0; iCent<6; ++iCent) {
-    h2F[iCent] = dynamic_cast<TH2F*>(fHistos->At(kNClsTrackTRD+iCent));
-    proj[iCent] = (h2F[iCent] && h2F[iCent]->GetEntries()>10 ? h2F[iCent]->ProjectionY(Form("projCent%d",iCent)) : 0x0);
-    if(proj[iCent]) {
-      proj[iCent]->SetLineColor(iCent<4 ? iCent+1 : iCent+2);
-      Double_t maximum = proj[iCent]->GetMaximum();
-      if(maximum>1.0)
-        proj[iCent]->Scale(1.0/maximum);
-      proj[iCent]->SetStats(kFALSE);
-      proj[iCent]->Draw("same");
-      leg->AddEntry(proj[iCent], (iCent==0 ? "all centralities" : Form("centrality class %d", iCent)), "l");
-      isGood = kTRUE;
-    }
-  }
-  if(isGood) leg->Draw();
-  isGoodForSaving = isGoodForSaving || isGood;
-  
-  // Qtot vs P
-  pad = ((TPad*)l->At(5)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.02);
-  pad->SetTopMargin(0.02); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  if(gROOT->FindObject("rangeQtot")) delete gROOT->FindObject("rangeQtot");
-  TH2F* rangeQtot = new TH2F("rangeQtot", "", 10, 0.0, 9.999, 10, 0.0, 1.199);
-  SetStyle(rangeQtot->GetXaxis(), "Q_{tot} (a.u.)", 0.07, 0.8, kTRUE, 0.05);
-  SetStyle(rangeQtot->GetYaxis(), "entries (a.u.)", 0.07, 0.8, kTRUE, 0.05);
-  rangeQtot->SetStats(kFALSE);
-  rangeQtot->Draw();
-  
-  TH1D* projQ[6];
-  TLegend* leg2=new TLegend(0.6, 0.7, 0.9, 0.95);
-  leg2->SetFillColor(0);
-  isGood = kFALSE;
-  for(Int_t iCent=0; iCent<6; ++iCent) {  
-    h2F[iCent] = dynamic_cast<TH2F*>(fHistos->At(kQtotP+iCent));
-    projQ[iCent] = (h2F[iCent] && h2F[iCent]->GetEntries()>10 ? h2F[iCent]->ProjectionY(Form("projQCent%d",iCent)) : 0x0);
-    if(projQ[iCent]) {
-      projQ[iCent]->SetLineColor(iCent<4 ? iCent+1 : iCent+2);
-      Double_t maximum = projQ[iCent]->GetMaximum();
-      if(maximum>1.0)
-        projQ[iCent]->Scale(1.0/maximum);
-      projQ[iCent]->SetStats(kFALSE);
-      projQ[iCent]->Draw("same");
-      leg2->AddEntry(projQ[iCent], (iCent==0 ? "all centralities" : Form("centrality class %d", iCent)), "l");
-      isGood = kTRUE;
-    }
-  }
-  if(isGood) leg2->Draw();
-  isGoodForSaving = isGoodForSaving || isGood;
-  return isGoodForSaving;
-}
-
-
-//_________________________________________________________________
-Bool_t AliTRDcheckESD::PlotTrackingSummary(Int_t centralityClass, Double_t* trendValues) {
-
-  Bool_t isGoodForSaving=kFALSE;
-  
-  TLatex *lat=new TLatex();
-  lat->SetTextSize(0.07);
-  lat->SetTextColor(2);
-  gPad->SetTopMargin(0.05); gPad->SetBottomMargin(0.001);
-  gPad->SetLeftMargin(0.001); gPad->SetRightMargin(0.001);
-  gPad->Divide(3,3,0.,0.);
-  TList* l=gPad->GetListOfPrimitives();
-  // eta-phi distr. for positive TPC tracks
-  TVirtualPad* pad = ((TVirtualPad*)l->At(0)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
-  pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  if(gROOT->FindObject("rangeEtaPhi")) delete gROOT->FindObject("rangeEtaPhi");
-  TH2F* rangeEtaPhi = new TH2F("rangeEtaPhi", "", 10, -0.99, +0.99, 10, -3.4, +3.4);
-  SetStyle(rangeEtaPhi->GetXaxis(), "#eta", 0.07, 0.8, kTRUE, 0.05);
-  SetStyle(rangeEtaPhi->GetYaxis(), "detector #varphi", 0.07, 0.8, kTRUE, 0.05);
-  rangeEtaPhi->SetStats(kFALSE);
-  rangeEtaPhi->Draw();
-  lat->DrawLatex(-0.9, 3.6, "TPC positive ref. tracks");
-  
-  TH3F* h3F = dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksPos+centralityClass));
-  TH2F* h2FtpcP = 0x0;
-  Float_t nada=0.0;
-  if(h3F && h3F->GetEntries()>10) {
-    h2FtpcP = (TH2F*)Proj3D((TH3F*)h3F, 0x0, 1, h3F->GetZaxis()->GetNbins(), nada)->Clone();
-    h2FtpcP->SetStats(kFALSE);
-    h2FtpcP->Draw("samecolz"); isGoodForSaving = kTRUE;
-    isGoodForSaving = kTRUE;
-  }
-  //-----------------
-  // eta-phi distr. for negative TPC tracks
-  pad = ((TVirtualPad*)l->At(1)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
-  pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  rangeEtaPhi->Draw();
-  lat->DrawLatex(-0.9, 3.6, "TPC negative ref. tracks");
-  
-  h3F = dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksNeg+centralityClass));
-  TH2F* h2FtpcN = 0x0;
-  if(h3F && h3F->GetEntries()>10) {
-    h2FtpcN = (TH2F*)Proj3D((TH3F*)h3F, 0x0, 1, h3F->GetZaxis()->GetNbins(), nada)->Clone();
-    h2FtpcN->SetStats(kFALSE);
-    h2FtpcN->Draw("samecolz"); 
-    isGoodForSaving = kTRUE;
-  }
-  //----------------------------------------------
-  // eta-phi distr. for positive TRD tracks
-  pad = ((TVirtualPad*)l->At(3)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
-  pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  rangeEtaPhi->Draw();
-  lat->DrawLatex(-0.9, 3.6, "TRD positive ref. tracks");
-  
-  h3F = dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksPos+centralityClass));
-  TH2F* h2FtrdP = 0x0;
-  if(h3F && h3F->GetEntries()>10) {
-    h2FtrdP = (TH2F*)Proj3D((TH3F*)h3F, 0x0, 1, h3F->GetZaxis()->GetNbins(), nada)->Clone();
-    h2FtrdP->SetStats(kFALSE);
-    h2FtrdP->SetMaximum((h2FtpcP ? h2FtpcP->GetMaximum() : h2FtrdP->GetMaximum()));
-    h2FtrdP->Draw("samecolz"); 
-    isGoodForSaving=kTRUE;
-  }
-  //--------------------------------------------
-  // eta-phi distr. for negative TRD tracks
-  pad = ((TVirtualPad*)l->At(4)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
-  pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  rangeEtaPhi->Draw();
-  lat->DrawLatex(-0.9, 3.6, "TRD negative ref. tracks");
-  
-  h3F = dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksNeg+centralityClass));
-  TH2F* h2FtrdN = 0x0;
-  if(h3F && h3F->GetEntries()>10) {
-    h2FtrdN = (TH2F*)Proj3D((TH3F*)h3F, 0x0, 1, h3F->GetZaxis()->GetNbins(), nada)->Clone();
-    h2FtrdN->SetStats(kFALSE);
-    h2FtrdN->SetMaximum(h2FtpcN ? h2FtpcN->GetMaximum() : h2FtrdN->GetMaximum());
-    h2FtrdN->Draw("samecolz"); 
-    isGoodForSaving=kTRUE;
-  }
-  //----------------------------------------------
-  // eta-phi efficiency for positive TRD tracks
-  pad = ((TVirtualPad*)l->At(6)); pad->cd();
+  // Qtot vs P (fit results)
+  pad = ((TVirtualPad*)l->At(8)); pad->cd();
   pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
-  pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
+  pad->SetTopMargin(0.03); pad->SetBottomMargin(0.15);
   pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  rangeEtaPhi->Draw();
-  lat->DrawLatex(-0.9, 3.6, "Efficiency positive tracks");
+  pad->SetLogz();
   
-  TH2F* h2Feff = (h2FtrdP ? (TH2F*)h2FtrdP->Clone("h2FeffPos") : 0x0);
-  if(h2Feff) {
-    h2Feff->Reset();
-    h2Feff->SetStats(kFALSE);
-    h2Feff->Divide(h2FtrdP, h2FtpcP);
-    h2Feff->SetMaximum(1.0);
-    if(h2Feff->GetEntries()>1) { h2Feff->Draw("samecolz"); isGoodForSaving=kTRUE; }
-  }
-  //-------------------------------------------------
-  // eta-phi efficiency for negative TRD tracks
-  pad = ((TVirtualPad*)l->At(7)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
-  pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  rangeEtaPhi->Draw();
-  lat->DrawLatex(-0.9, 3.6, "Efficiency negative tracks");
+  if(gROOT->FindObject("rangeQtotPfit")) delete gROOT->FindObject("rangeQtotPfit");
+  TH2F* rangeQtotPfit = new TH2F("rangeQtotPfit", "", 100, 0.0, 11.99, 100, 0.0, (hqtot->GetMean()<10.0 ? 6.0 : 3999.));
+  SetStyle(rangeQtotPfit->GetXaxis(), "P [GeV/c]", 0.07, 0.8, kTRUE, 0.05);
+  SetStyle(rangeQtotPfit->GetYaxis(), "Q_{tot}", 0.07, 0.8, kTRUE, 0.05);
+  rangeQtotPfit->SetStats(kFALSE);
+  rangeQtotPfit->Draw();
   
-  h2Feff = (h2FtrdN ? (TH2F*)h2FtrdN->Clone("h2FeffNeg") : 0x0);
-  if(h2Feff) {
-    h2Feff->Reset();
-    h2Feff->SetStats(kFALSE);
-    h2Feff->Divide(h2FtrdN, h2FtpcN);
-    h2Feff->SetMaximum(1.0);
-    if(h2Feff->GetEntries()>0.1) { h2Feff->Draw("samecolz"); isGoodForSaving=kTRUE; }
+  if(mpvErr) SetStyle(mpvErr, 1, kBlue, 2, 1, kBlue, 1);
+  if(widthErr) SetStyle(widthErr, 2, kRed, 2, 1, kRed, 1);
+  if(mpvErr) {
+    mpvErr->SetStats(kFALSE);
+    mpvErr->Draw("same");
   }
-  //-----------------------------------------------------
-  // <ntracklets> vs (phi,eta)
-  pad = ((TVirtualPad*)l->At(2)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
-  pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  rangeEtaPhi->Draw();
-  lat->DrawLatex(-0.9, 3.6, "TRD <N_{tracklets}>");
-  
-  TProfile2D* hProf2D;
-  if((hProf2D = dynamic_cast<TProfile2D*>(fHistos->At(kTRDEtaPhiAvNtrkl+centralityClass)))) {
-    if(hProf2D->GetEntries()>10) {
-      hProf2D->SetStats(kFALSE);
-      hProf2D->SetMinimum(0.);
-      hProf2D->SetMaximum(6.);
-      if(hProf2D->GetEntries()>1) { hProf2D->Draw("samecolz"); isGoodForSaving = kTRUE; }
-    }
+  if(widthErr) {
+    widthErr->SetStats(kFALSE);
+    widthErr->Draw("same");
   }
-  //---------------------------------------------------------
-  // TPC-TRD matching efficiency vs pt
-  pad = ((TVirtualPad*)l->At(5)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.02);
-  pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  TH1F* hFeffP = EfficiencyTRD(dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksPos+centralityClass)),
-              dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksPos+centralityClass)), kTRUE);
-  TH1F* hFeffN = EfficiencyTRD(dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksNeg+centralityClass)),
-              dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksNeg+centralityClass)), kTRUE);
-  TH1F* hFeffP4 = EfficiencyTRD(dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksPos+centralityClass)),
-        dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksPos4+centralityClass)), kTRUE);
-  TH1F* hFeffN4 = EfficiencyTRD(dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksNeg+centralityClass)),
-        dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksNeg4+centralityClass)), kTRUE);
-  TH1F* hFeffP5 = EfficiencyTRD(dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksPos+centralityClass)),
-        dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksPos5+centralityClass)), kTRUE);
-  TH1F* hFeffN5 = EfficiencyTRD(dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksNeg+centralityClass)),
-        dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksNeg5+centralityClass)), kTRUE);
-  TH1F* hFeffP6 = EfficiencyTRD(dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksPos+centralityClass)),
-        dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksPos6+centralityClass)), kTRUE);
-  TH1F* hFeffN6 = EfficiencyTRD(dynamic_cast<TH3F*>(fHistos->At(kTPCRefTracksNeg+centralityClass)),
-        dynamic_cast<TH3F*>(fHistos->At(kTRDRefTracksNeg6+centralityClass)), kTRUE);
-  
-  TF1* funcConst = new TF1("funcConst", "[0]", 1.0, 3.0);
-  
-  if(gROOT->FindObject("rangeEffPt2")) delete gROOT->FindObject("rangeEffPt2");
-  TH2F* rangeEffPt2=new TH2F("rangeEffPt2", "",10,0.,10.,10,0.,1.4);
-  rangeEffPt2->SetStats(kFALSE);
-  SetStyle(rangeEffPt2->GetXaxis(), "p_{T} [GeV/c]", 0.07, 0.8, kTRUE, 0.05);
-  SetStyle(rangeEffPt2->GetYaxis(), "efficiency", 0.07, 0.8, kTRUE, 0.05);
-  rangeEffPt2->Draw();
-  lat->DrawLatex(0.5, 1.42, "TRD-TPC matching efficiency");
-  //++++++++++++++++++
-  TLine line;
-  line.SetLineStyle(2);
-  line.SetLineWidth(2);
-  line.DrawLine(rangeEffPt2->GetXaxis()->GetXmin(), 0.7, rangeEffPt2->GetXaxis()->GetXmax(), 0.7);
-  line.DrawLine(rangeEffPt2->GetXaxis()->GetXmin(), 0.9, rangeEffPt2->GetXaxis()->GetXmax(), 0.9);
-  line.SetLineStyle(1);
-  line.SetLineWidth(1);
-  line.DrawLine(rangeEffPt2->GetXaxis()->GetXmin(), 1.0, rangeEffPt2->GetXaxis()->GetXmax(), 1.0);
-  TLegend* leg=new TLegend(0.2, 0.7, 0.6, 0.89);
-  leg->SetNColumns(2);
+  TLegend* leg=new TLegend(0.2,0.6,0.5,0.9);
   leg->SetFillColor(0);
-  if(hFeffP){
-    hFeffP->SetMarkerStyle(24);
-    hFeffP->SetMarkerColor(2);
-    hFeffP->SetLineColor(2);
-    if(trendValues && hFeffP->GetEntries()>1) {
-      hFeffP->Fit(funcConst, "QME0", "goff", 1.0, 3.0);
-      trendValues[0] = funcConst->GetParameter(0);
-      trendValues[1] = funcConst->GetParError(0);
-    }
-    if(hFeffP->Integral()>0.001) {
-      hFeffP->Draw("same"); 
-      leg->AddEntry(hFeffP, "positives (#geq 1 tracklet)", "p");
-    }
-  }
-  if(hFeffN){
-    hFeffN->SetMarkerStyle(24);
-    hFeffN->SetMarkerColor(4);
-    hFeffN->SetLineColor(4);
-    if(trendValues && hFeffN->GetEntries()>1) {
-      hFeffN->Fit(funcConst, "QME0", "goff", 1.0, 3.0);
-      trendValues[2] = funcConst->GetParameter(0);
-      trendValues[3] = funcConst->GetParError(0);
-    }
-    if(hFeffN->Integral()>0.001) {
-      hFeffN->Draw("same"); 
-      leg->AddEntry(hFeffN, "negatives (#geq 1 tracklet)", "p");
-    }
-  }
-  if(hFeffP4){
-    hFeffP4->SetMarkerStyle(25);
-    hFeffP4->SetMarkerColor(2);
-    hFeffP4->SetLineColor(2);
-    if(hFeffP4->Integral()>0.001) {
-      hFeffP4->Draw("same"); 
-      leg->AddEntry(hFeffP4, "positives (4 tracklets)", "p");
-    }
-  }
-  if(hFeffN4){
-    hFeffN4->SetMarkerStyle(25);
-    hFeffN4->SetMarkerColor(4);
-    hFeffN4->SetLineColor(4);
-    if(hFeffN4->Integral()>0.001) {
-      hFeffN4->Draw("same"); 
-      leg->AddEntry(hFeffN4, "negatives (4 tracklets)", "p");
-    }
-  }
-  if(hFeffP5){
-    hFeffP5->SetMarkerStyle(26);
-    hFeffP5->SetMarkerColor(2);
-    hFeffP5->SetLineColor(2);
-    if(hFeffP5->Integral()>0.001) {
-      hFeffP5->Draw("same"); 
-      leg->AddEntry(hFeffP5, "positives (5 tracklets)", "p");
-    }
-  }
-  if(hFeffN5){
-    hFeffN5->SetMarkerStyle(26);
-    hFeffN5->SetMarkerColor(4);
-    hFeffN5->SetLineColor(4);
-    if(hFeffN5->Integral()>0.001) {
-      hFeffN5->Draw("same"); 
-      leg->AddEntry(hFeffN5, "negatives (5 tracklets)", "p");
-    }
-  }
-  if(hFeffP6){
-    hFeffP6->SetMarkerStyle(27);
-    hFeffP6->SetMarkerColor(2);
-    hFeffP6->SetLineColor(2);
-    if(hFeffP6->Integral()>0.001) {
-      hFeffP6->Draw("same"); 
-      leg->AddEntry(hFeffP6, "positives (6 tracklets)", "p");
-    }
-  }
-  if(hFeffN6){
-    hFeffN6->SetMarkerStyle(27);
-    hFeffN6->SetMarkerColor(4);
-    hFeffN6->SetLineColor(4);
-    if(hFeffN6->Integral()>0.001) {
-      hFeffN6->Draw("same"); 
-      leg->AddEntry(hFeffN6, "negatives (6 tracklets)", "p");
-    }
-  }
+  leg->SetBorderSize(0);
+  leg->AddEntry("mpvErr","Landau MPV","l");
+  leg->AddEntry("widthErr","Landau width","l");
   leg->Draw();
-  
-  //--------------------------------------------------------------
-  // Nclusters per TRD track
-  pad = ((TVirtualPad*)l->At(8)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.12);
-  pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  pad->SetLogz();
-  if(gROOT->FindObject("rangeNclsP")) delete gROOT->FindObject("rangeNclsP");
-  TH2F* rangeNclsP = new TH2F("rangeNclsP", "", 10, 0.0, 11.99, 10, 0.0, 199.0);
-  SetStyle(rangeNclsP->GetXaxis(), "p [GeV/c]", 0.07, 0.8, kTRUE, 0.05);
-  SetStyle(rangeNclsP->GetYaxis(), "#clusters", 0.07, 0.8, kTRUE, 0.05);
-  rangeNclsP->SetStats(kFALSE);
-  rangeNclsP->Draw();
-  lat->DrawLatex(1.0, 205., "TRD Clusters / track");
-  
-  TH2F* hNclsVsP=0x0;
-  if((hNclsVsP = dynamic_cast<TH2F*>(fHistos->At(kNClsTrackTRD+centralityClass)))) {
-    hNclsVsP->SetStats(kFALSE);
-    if(hNclsVsP->GetEntries()>10) {
-      hNclsVsP->Draw("samecolz"); isGoodForSaving=kTRUE;
-      if(trendValues) {
-        TProfile* h2FProf = hNclsVsP->ProfileX("nclsVsPprof");
-        h2FProf->Fit(funcConst, "QME0", "goff", 1.0, 3.0);
-        trendValues[4] = funcConst->GetParameter(0);
-        trendValues[5] = funcConst->GetParError(0);
-      }
-    }
-  }
-  
-  delete funcConst;
-  return isGoodForSaving;
 }
 
 
-//_________________________________________________________________
-Bool_t AliTRDcheckESD::PlotPidSummary(Int_t centralityClass, Double_t* trendValues) {
-
-  Bool_t isGoodForSaving=kFALSE;
+//__________________________________________________________________________________________________
+void AliTRDcheckESD::PlotOtherSummaryFromCF(Double_t* /*trendValues*/) {
+  //
+  //
+  //
+  if(!fHistos) return;
+  AliCFContainer* matchPhiEta = (AliCFContainer*)fHistos->FindObject("MatchingPhiEta");
+  AliCFContainer* trdQuality = (AliCFContainer*)fHistos->FindObject("trdQuality");
+  AliCFContainer* trdChi2 = (AliCFContainer*)fHistos->FindObject("trdChi2");
+  AliCFContainer* trdBudget = (AliCFContainer*)fHistos->FindObject("trdBudget");
+  AliCFContainer* ploss = (AliCFContainer*)fHistos->FindObject("Ploss");
+  AliCFContainer* clusters = (AliCFContainer*)fHistos->FindObject("clustersPerTracklet");  
+  AliCFContainer* clsRows = (AliCFContainer*)fHistos->FindObject("clustersVsRows");
+  AliCFContainer* tpcTofMatch = (AliCFContainer*)fHistos->FindObject("MatchingPhiEta_TPCTOF");
   
   TLatex *lat=new TLatex();
-  lat->SetTextSize(0.07);
+  lat->SetTextSize(0.06);
   lat->SetTextColor(2);
+  lat->SetNDC();
+  lat->SetTextFont(42);
+  TCanvas* c1 = new TCanvas("ESDsummary", "ESD summary 1", 1600, 1200);
   gPad->SetTopMargin(0.05); gPad->SetBottomMargin(0.001);
   gPad->SetLeftMargin(0.001); gPad->SetRightMargin(0.001);
   gPad->Divide(3,3,0.,0.);
   TList* l=gPad->GetListOfPrimitives();
-  // eta-phi distr. for <Qtot> in layer 0
-  TVirtualPad* pad;
-  TProfile2D* hProf2D;
-  if(gROOT->FindObject("rangeEtaPhi2")) delete gROOT->FindObject("rangeEtaPhi2");
-  TH2F* rangeEtaPhi = new TH2F("rangeEtaPhi2", "", 10, -0.99, +0.99, 10, -3.4, +3.4);
-  SetStyle(rangeEtaPhi->GetXaxis(), "#eta", 0.07, 0.8, kTRUE, 0.05);
-  SetStyle(rangeEtaPhi->GetYaxis(), "detector #varphi", 0.07, 0.8, kTRUE, 0.05);
-  rangeEtaPhi->SetStats(kFALSE);
+  TVirtualPad* pad=0x0;
   
-  for(Int_t iLayer=0; iLayer<6; ++iLayer) {
-    pad = ((TVirtualPad*)l->At((iLayer<3 ? iLayer*3 : (iLayer-3)*3+1))); pad->cd();
+  // matching as a function of trigger class
+  if(matchPhiEta) {
+    matchPhiEta->SetRangeUser(matchPhiEta->GetVar(fgkVarNames[kTrackCharge]), -1.0, -1.0);
+    TH1F* hTRDEffTriggerNeg = EfficiencyFromPhiPt(matchPhiEta, -1, -1, 1, 0, kEventTrigger);
+    matchPhiEta->SetRangeUser(matchPhiEta->GetVar(fgkVarNames[kTrackCharge]), +1.0, +1.0);
+    TH1F* hTRDEffTriggerPos = EfficiencyFromPhiPt(matchPhiEta, -1, -1, 1, 0, kEventTrigger);
+      
+    pad = ((TVirtualPad*)l->At(0)); pad->cd();
+    pad->SetLeftMargin(0.15); pad->SetRightMargin(0.01);
+    pad->SetTopMargin(0.06); pad->SetBottomMargin(0.15);
+    hTRDEffTriggerNeg->SetStats(kFALSE);
+    SetStyle(hTRDEffTriggerNeg->GetYaxis(), "efficiency", 0.06, 1.0, kTRUE, 0.06);
+    hTRDEffTriggerNeg->GetXaxis()->SetRange(1,fNAssignedTriggers);
+    hTRDEffTriggerPos->GetXaxis()->SetRange(1,fNAssignedTriggers);
+    SetStyle(hTRDEffTriggerNeg, 1, 2, 2, 20, 2, 1);
+    SetStyle(hTRDEffTriggerPos, 1, 4, 2, 20, 4, 1);
+    hTRDEffTriggerNeg->Draw();
+    hTRDEffTriggerPos->Draw("same");
+    TLegend* legEff=new TLegend(0.5,0.5,0.7,0.7);
+    legEff->SetFillColor(0);
+    legEff->SetBorderSize(0);
+    legEff->AddEntry(hTRDEffTriggerNeg, "negatives", "l");
+    legEff->AddEntry(hTRDEffTriggerPos, "positives", "l");
+    legEff->Draw();
+    lat->DrawLatex(0.2, 0.95, "TPC-TRD matching efficiency");
+  }
+  
+  if(trdQuality) {
+  // Track TRD quality vs (eta,phi) and vs TRD n-clusters
+    TH3D* trdQuality3D = (TH3D*)trdQuality->Project(0, trdQuality->GetVar(fgkVarNames[kTrackEtaTRD]), 
+                                                      trdQuality->GetVar(fgkVarNames[kTrackPhiTRD]),
+                                                      trdQuality->GetVar(fgkVarNames[kTrackTrdQuality]));
+    trdQuality3D->GetZaxis()->SetRangeUser(0.1,100.0);
+    trdQuality3D->SetName("trdQuality3D");
+    TProfile2D* prof2DQuality = trdQuality3D->Project3DProfile("yx");
+    prof2DQuality->SetName("prof2DQuality");
+    trdQuality->SetRangeUser(trdQuality->GetVar(fgkVarNames[kTrackCharge]), -1.5,-0.5);
+    TH2D* trdQualityPneg = (TH2D*)trdQuality->Project(0, trdQuality->GetVar(fgkVarNames[kTrackP]), 
+                                                        trdQuality->GetVar(fgkVarNames[kTrackTrdQuality]));
+    trdQualityPneg->SetName("trdQualityPneg");
+    trdQuality->SetRangeUser(trdQuality->GetVar(fgkVarNames[kTrackCharge]), +0.5,1.5);
+    TH2D* trdQualityPpos = (TH2D*)trdQuality->Project(0, trdQuality->GetVar(fgkVarNames[kTrackP]), 
+                                                        trdQuality->GetVar(fgkVarNames[kTrackTrdQuality]));
+    trdQualityPpos->SetName("trdQualityPpos");
+    trdQualityPneg->GetYaxis()->SetRangeUser(0.1,100.0);
+    TProfile* trdQualityPnegprof = trdQualityPneg->ProfileX();
+    trdQualityPnegprof->SetName("trdQualityPnegprof");
+    trdQualityPpos->GetYaxis()->SetRangeUser(0.1,100.0);
+    TProfile* trdQualityPposprof = trdQualityPpos->ProfileX();
+    trdQualityPposprof->SetName("trdQualityPposprof");
+    pad = ((TVirtualPad*)l->At(3)); pad->cd();
     pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
-    pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-    pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-    rangeEtaPhi->Draw();
-    lat->DrawLatex(-0.9, 3.6, Form("TRD <Q_{tot}> Layer %d", iLayer));
+    pad->SetTopMargin(0.06); pad->SetBottomMargin(0.15);
+    prof2DQuality->SetStats(kFALSE);
+    prof2DQuality->SetTitle("");
+    SetStyle(prof2DQuality->GetXaxis(), "#eta", 0.06, 1.0, kTRUE, 0.06);
+    SetStyle(prof2DQuality->GetYaxis(), "#varphi (rad.)", 0.06, 1.0, kTRUE, 0.06);
+    prof2DQuality->SetMaximum(1.6); prof2DQuality->SetMinimum(0.4);
+    prof2DQuality->Draw("colz");
+    lat->DrawLatex(0.2, 0.95, "TRD quality");
+    pad = ((TVirtualPad*)l->At(6)); pad->cd();
+    pad->SetLeftMargin(0.15); pad->SetRightMargin(0.01);
+    pad->SetTopMargin(0.06); pad->SetBottomMargin(0.15);
+    trdQualityPnegprof->SetStats(kFALSE);
+    trdQualityPnegprof->SetTitle("");
+    SetStyle(trdQualityPnegprof->GetXaxis(), "P (GeV/c)", 0.06, 1.0, kTRUE, 0.06);
+    SetStyle(trdQualityPnegprof->GetYaxis(), "<TRD quality>", 0.06, 1.0, kTRUE, 0.06);
+    SetStyle(trdQualityPnegprof, 1, 2, 2, 20, 2, 1);
+    SetStyle(trdQualityPposprof, 1, 4, 2, 20, 4, 1);
+    trdQualityPnegprof->GetYaxis()->SetRangeUser(0.5, 1.39);
+    trdQualityPnegprof->Draw();
+    trdQualityPposprof->Draw("same");
+    lat->DrawLatex(0.2, 0.95, "TRD quality");
+  }
+  
+  if(trdChi2) {
+    // Track TRD chi2 vs (eta,phi)
+    TH3D* trdChi23D = (TH3D*)trdChi2->Project(0, trdChi2->GetVar(fgkVarNames[kTrackEtaTRD]), 
+                                              trdChi2->GetVar(fgkVarNames[kTrackPhiTRD]),
+                                              trdChi2->GetVar(fgkVarNames[kTrackTrdChi2]));
+    trdChi23D->SetName("trdChi23D");
+    TProfile2D* prof2DChi2 = trdChi23D->Project3DProfile("yx");
+    prof2DChi2->SetName("prof2DChi2");
+    pad = ((TVirtualPad*)l->At(1)); pad->cd();
+    pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
+    pad->SetTopMargin(0.06); pad->SetBottomMargin(0.15);
+    prof2DChi2->SetStats(kFALSE);
+    prof2DChi2->SetTitle("");
+    SetStyle(prof2DChi2->GetXaxis(), "#eta", 0.06, 1.0, kTRUE, 0.06);
+    SetStyle(prof2DChi2->GetYaxis(), "#varphi (rad.)", 0.06, 1.0, kTRUE, 0.06);
+    prof2DChi2->SetMaximum(2.9);
+    prof2DChi2->Draw("colz");
+    lat->DrawLatex(0.2, 0.95, "TRD #chi^{2}");
+  
+    // Track TRD chi2 vs pt and charge
+    trdChi2->SetRangeUser(trdChi2->GetVar(fgkVarNames[kTrackCharge]), -1.0, -1.0);
+    TH2D* trdChi2VsPtNeg = (TH2D*)trdChi2->Project(0, trdChi2->GetVar(fgkVarNames[kTrackPt]),
+                                                    trdChi2->GetVar(fgkVarNames[kTrackTrdChi2]));
+    trdChi2VsPtNeg->SetName("trdChi2VsPtNeg");
+    TProfile* trdChi2VsPtNegProf = trdChi2VsPtNeg->ProfileX();
+    trdChi2VsPtNegProf->SetName("trdChi2VsPtNegProf");
+    trdChi2->SetRangeUser(trdChi2->GetVar(fgkVarNames[kTrackCharge]), 1.0, 1.0);
+    TH2D* trdChi2VsPtPos = (TH2D*)trdChi2->Project(0, trdChi2->GetVar(fgkVarNames[kTrackPt]),
+                                                    trdChi2->GetVar(fgkVarNames[kTrackTrdChi2]));
+    trdChi2VsPtPos->SetName("trdChi2VsPtPos");
+    TProfile* trdChi2VsPtPosProf = trdChi2VsPtPos->ProfileX();
+    trdChi2VsPtPosProf->SetName("trdChi2VsPtPosProf");
+    pad = ((TVirtualPad*)l->At(4)); pad->cd();
+    pad->SetLeftMargin(0.15); pad->SetRightMargin(0.01);
+    pad->SetTopMargin(0.06); pad->SetBottomMargin(0.15);
+    trdChi2VsPtNegProf->SetStats(kFALSE);
+    trdChi2VsPtNegProf->SetTitle("");
+    SetStyle(trdChi2VsPtNegProf->GetXaxis(), "p_{T} (GeV/c)", 0.06, 1.0, kTRUE, 0.06);
+    SetStyle(trdChi2VsPtNegProf->GetYaxis(), "<TRD #chi^{2}>", 0.06, 1.0, kTRUE, 0.06);
+    SetStyle(trdChi2VsPtNegProf, 1, 2, 2, 20, 2, 1);
+    SetStyle(trdChi2VsPtPosProf, 1, 4, 2, 20, 4, 1);
+    trdChi2VsPtNegProf->Draw();
+    trdChi2VsPtPosProf->Draw("same");
+    lat->DrawLatex(0.2, 0.95, "TRD #chi^{2}");
+  }
+  
+  if(trdBudget) {
+    // Track TRD budget vs (eta,phi)
+    TH3D* trdBudget3D = (TH3D*)trdBudget->Project(0, trdBudget->GetVar(fgkVarNames[kTrackEtaTRD]), 
+                                                  trdBudget->GetVar(fgkVarNames[kTrackPhiTRD]),
+                                                  trdBudget->GetVar(fgkVarNames[kTrackTRDBudget]));
+    trdBudget3D->SetName("trdBudget3D");
+    TProfile2D* prof2DBudget = trdBudget3D->Project3DProfile("yx");
+    prof2DBudget->SetName("prof2DBudget");
+    pad = ((TVirtualPad*)l->At(7)); pad->cd();
+    pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
+    pad->SetTopMargin(0.06); pad->SetBottomMargin(0.15);
+    prof2DBudget->SetStats(kFALSE);
+    prof2DBudget->SetTitle("");
+    SetStyle(prof2DBudget->GetXaxis(), "#eta", 0.06, 1.0, kTRUE, 0.06);
+    SetStyle(prof2DBudget->GetYaxis(), "#varphi (rad.)", 0.06, 1.0, kTRUE, 0.06);
+    prof2DBudget->Draw("colz");
+    lat->DrawLatex(0.2, 0.95, "TRD budget");
+  }
+  
+  if(ploss) {
+    // momentum loss
+    ploss->SetRangeUser(ploss->GetVar(fgkVarNames[kTrackCharge]), -1.0, -1.0);
+    TH2D* plossLayerNeg = (TH2D*)ploss->Project(0, ploss->GetVar(fgkVarNames[kTrackletLayer]), 
+                                                  ploss->GetVar(fgkVarNames[kTrackPlossTRDlayer]));
+    plossLayerNeg->SetName("plossLayerNeg");
+    TProfile* plossLayerNegProf = plossLayerNeg->ProfileX();
+    plossLayerNegProf->SetName("plossLayerNegProf");
+    ploss->SetRangeUser(ploss->GetVar(fgkVarNames[kTrackCharge]), +1.0, +1.0);
+    TH2D* plossLayerPos = (TH2D*)ploss->Project(0, ploss->GetVar(fgkVarNames[kTrackletLayer]), 
+                                                  ploss->GetVar(fgkVarNames[kTrackPlossTRDlayer]));
+    plossLayerPos->SetName("plossLayerPos");
+    TProfile* plossLayerPosProf = plossLayerPos->ProfileX();
+    plossLayerPosProf->SetName("plossLayerPosProf");
+    ploss->SetRangeUser(ploss->GetVar(fgkVarNames[kTrackCharge]), -1.5, +1.5);
     
-    if(!(hProf2D = dynamic_cast<TProfile2D*>(fHistos->At(kTRDEtaPhiAvQtot+6*centralityClass+iLayer)))) continue;
-    if(hProf2D && hProf2D->GetEntries()>10) {
-      hProf2D->SetStats(kFALSE);
-      hProf2D->SetMinimum(0.);
-      hProf2D->SetMaximum(4.);
-      if(hProf2D->GetEntries()>10) { hProf2D->Draw("samecolz"); isGoodForSaving=kTRUE; }
+    ploss->SetRangeUser(ploss->GetVar(fgkVarNames[kTrackletLayer]), 0.0, 0.0);
+    TH3D* ploss3Dl0 = (TH3D*)ploss->Project(0, ploss->GetVar(fgkVarNames[kTrackEtaTRD]), 
+                                            ploss->GetVar(fgkVarNames[kTrackPhiTRD]), 
+                                            ploss->GetVar(fgkVarNames[kTrackPlossTRDlayer]));
+    ploss3Dl0->SetName("ploss3Dl0");
+    TProfile2D* plossEtaPhiL0Prof = ploss3Dl0->Project3DProfile("yx");
+    plossEtaPhiL0Prof->SetName("plossEtaPhiL0Prof");
+    ploss->SetRangeUser(ploss->GetVar(fgkVarNames[kTrackletLayer]), 5.0, 5.0);
+    TH3D* ploss3Dl5 = (TH3D*)ploss->Project(0, ploss->GetVar(fgkVarNames[kTrackEtaTRD]), 
+                                            ploss->GetVar(fgkVarNames[kTrackPhiTRD]), 
+                                            ploss->GetVar(fgkVarNames[kTrackPlossTRDlayer]));
+    ploss3Dl5->SetName("ploss3Dl5");
+    TProfile2D* plossEtaPhiL5Prof = ploss3Dl5->Project3DProfile("yx");
+    plossEtaPhiL5Prof->SetName("plossEtaPhiL5Prof");
+    pad = ((TVirtualPad*)l->At(2)); pad->cd();
+    pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
+    pad->SetTopMargin(0.06); pad->SetBottomMargin(0.15);
+    plossEtaPhiL0Prof->SetStats(kFALSE);
+    plossEtaPhiL0Prof->SetTitle("");
+    SetStyle(plossEtaPhiL0Prof->GetXaxis(), "#eta", 0.06, 1.0, kTRUE, 0.06);
+    SetStyle(plossEtaPhiL0Prof->GetYaxis(), "#varphi (rad.)", 0.06, 1.0, kTRUE, 0.06);
+    plossEtaPhiL0Prof->SetMaximum(0.08);
+    plossEtaPhiL0Prof->SetMinimum(-0.02);
+    plossEtaPhiL0Prof->Draw("colz");
+    lat->DrawLatex(0.2, 0.95, "P_{loss} at layer 0");
+    pad = ((TVirtualPad*)l->At(5)); pad->cd();
+    pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
+    pad->SetTopMargin(0.06); pad->SetBottomMargin(0.15);
+    plossEtaPhiL5Prof->SetStats(kFALSE);
+    plossEtaPhiL5Prof->SetTitle("");
+    SetStyle(plossEtaPhiL5Prof->GetXaxis(), "#eta", 0.06, 1.0, kTRUE, 0.06);
+    SetStyle(plossEtaPhiL5Prof->GetYaxis(), "#varphi (rad.)", 0.06, 1.0, kTRUE, 0.06);
+    plossEtaPhiL5Prof->SetMaximum(0.08);
+    plossEtaPhiL5Prof->SetMinimum(-0.02);
+    plossEtaPhiL5Prof->Draw("colz");
+    lat->DrawLatex(0.2, 0.95, "P_{loss} at layer 5");
+    pad = ((TVirtualPad*)l->At(8)); pad->cd();
+    pad->SetLeftMargin(0.15); pad->SetRightMargin(0.01);
+    pad->SetTopMargin(0.06); pad->SetBottomMargin(0.15);
+    plossLayerNegProf->SetStats(kFALSE);
+    plossLayerNegProf->SetTitle("");
+    SetStyle(plossLayerNegProf->GetYaxis(), "#Delta P (GeV/c)", 0.06, 1.0, kTRUE, 0.06);
+    SetStyle(plossLayerNegProf->GetXaxis(), "TRD layer", 0.06, 1.0, kTRUE, 0.06);
+    SetStyle(plossLayerNegProf, 1, 2, 2, 20, 2, 1);
+    SetStyle(plossLayerPosProf, 1, 4, 2, 20, 4, 1);
+    plossLayerNegProf->GetYaxis()->SetRangeUser(TMath::Min(plossLayerNegProf->GetMinimum(),plossLayerPosProf->GetMinimum()-0.01),
+                                                TMath::Max(plossLayerNegProf->GetMaximum(),plossLayerPosProf->GetMaximum())+0.01);
+    plossLayerNegProf->Draw();  
+    plossLayerPosProf->Draw("same");
+    lat->DrawLatex(0.2, 0.95, "P_{loss} vs layer");
+  }
+  
+  // clusters/tracklet and clusters/crossed rows
+  TH3D* clustersEtaPhi[6]={0x0};
+  TH3D* clsRowsEtaPhi[6]={0x0};
+  for(Int_t il=0;il<6;++il) {
+    if(clusters) {
+      clusters->SetRangeUser(clusters->GetVar(fgkVarNames[kTrackletLayer]), Double_t(il), Double_t(il));
+      clustersEtaPhi[il]=(TH3D*)clusters->Project(0, clusters->GetVar(fgkVarNames[kTrackEtaTRD]),
+                                                   clusters->GetVar(fgkVarNames[kTrackPhiTRD]),
+                                                   clusters->GetVar(fgkVarNames[kTrackletClusters]));
+      clustersEtaPhi[il]->SetName(Form("clustersEtaPhi%d",il));
+    }
+    if(clsRows) {
+      clsRows->SetRangeUser(clsRows->GetVar(fgkVarNames[kTrackletLayer]), Double_t(il), Double_t(il));
+      clsRowsEtaPhi[il]=(TH3D*)clsRows->Project(0, clsRows->GetVar(fgkVarNames[kTrackEtaTRD]),
+                                                 clsRows->GetVar(fgkVarNames[kTrackPhiTRD]),
+                                                 clsRows->GetVar(fgkVarNames[kTrackletClustersVsRows]));
+      clsRowsEtaPhi[il]->SetName(Form("clsRowsEtaPhi%d",il));
     }
   }
     
-  // PH versus slice number
-  pad = ((TVirtualPad*)l->At(2)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
-  pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  if(gROOT->FindObject("rangePHslice")) delete gROOT->FindObject("rangePHslice");
-  TH2F* rangePHslice = new TH2F("rangePHslice", "", 10, -0.5, 7.5, 10, 0.0, 2000.0);
-  SetStyle(rangePHslice->GetXaxis(), "slice", 0.07, 0.8, kTRUE, 0.05);
-  SetStyle(rangePHslice->GetYaxis(), "PH", 0.07, 0.8, kTRUE, 0.05);
-  rangePHslice->SetStats(kFALSE);
-  rangePHslice->Draw();
-  
-  TF1* funcPol1 = new TF1("funcPol1", "[0]+[1]*x", 2.9, 6.4);
-  
-  TH2F* h2F;
-  TH1D* hF;
-  if((h2F = dynamic_cast<TH2F*>(fHistos->At(kPHSlice+centralityClass)))) {
-    if(h2F && h2F->GetEntries()>10) {
-      hF = Proj2D(h2F);
-      h2F->SetStats(kFALSE);
-      h2F->Draw("samecolz");
-      isGoodForSaving=kTRUE;
-      if(trendValues) {
-        hF->Fit(funcPol1, "QME0", "goff", 2.9, 6.4);
-        trendValues[6] = funcPol1->GetParameter(0);
-        trendValues[7] = funcPol1->GetParError(0);
-        trendValues[8] = funcPol1->GetParameter(1);
-        trendValues[9] = funcPol1->GetParError(1);
-      }
-      hF->SetLineWidth(2);
-      hF->Draw("same");
-    }
-  }
-  delete funcPol1;
-
-  // Qtot vs P
-  pad = ((TVirtualPad*)l->At(5)); pad->cd();
-  pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
-  pad->SetTopMargin(0.1); pad->SetBottomMargin(0.15);
-  pad->SetGridx(kFALSE); pad->SetGridy(kFALSE);
-  pad->SetLogz();
-  if(gROOT->FindObject("rangeQtotP")) delete gROOT->FindObject("rangeQtotP");
-  TH2F* rangeQtotP = new TH2F("rangeQtotP", "", 10, 0.0, 11.99, 10, 0.0, 11.99);
-  SetStyle(rangeQtotP->GetXaxis(), "P [GeV/c]", 0.07, 0.8, kTRUE, 0.05);
-  SetStyle(rangeQtotP->GetYaxis(), "Q_{tot}", 0.07, 0.8, kTRUE, 0.05);
-  rangeQtotP->SetStats(kFALSE);
-  rangeQtotP->Draw();
-  
-  if((h2F = dynamic_cast<TH2F*>(fHistos->At(kQtotP+centralityClass)))) {
-    if(h2F && h2F->GetEntries()>10) {
-      h2F->SetStats(kFALSE);
-      h2F->Draw("samecolz");
-      isGoodForSaving=kTRUE;
-      hF = Proj2D(h2F);
-      hF->SetLineWidth(2);
-      hF->Draw("same");
-      if(trendValues) {
-        trendValues[10] = hF->GetBinContent(hF->FindBin(1.0));
-        trendValues[11] = hF->GetBinError(hF->FindBin(1.0));
-      }
-    }
-  }
-  return isGoodForSaving;
+  lat->SetTextSize(0.05);
+  Int_t layerPads[6] = {0, 2, 4, 1, 3, 5};
+  
+  TCanvas* c2=0x0;
+  if(clusters) {
+    c2 = new TCanvas("ESDsummary2", "ESD summary 2", 1600, 1200);
+    gPad->SetTopMargin(0.05); gPad->SetBottomMargin(0.001);
+    gPad->SetLeftMargin(0.001); gPad->SetRightMargin(0.001);
+    gPad->Divide(3,2,0.,0.);
+    l=gPad->GetListOfPrimitives();
+    for(Int_t il=0;il<6;++il) {
+      TProfile2D* clustersEtaPhiProf = clustersEtaPhi[il]->Project3DProfile("yx");
+      pad = ((TVirtualPad*)l->At(layerPads[il])); pad->cd();
+      pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
+      pad->SetTopMargin(0.06); pad->SetBottomMargin(0.15);
+      clustersEtaPhiProf->SetStats(kFALSE);
+      clustersEtaPhiProf->SetTitle("");
+      SetStyle(clustersEtaPhiProf->GetXaxis(), "#eta", 0.06, 1.0, kTRUE, 0.06);
+      SetStyle(clustersEtaPhiProf->GetYaxis(), "#varphi (rad.)", 0.06, 1.0, kTRUE, 0.06);
+      clustersEtaPhiProf->Draw("colz");
+      lat->DrawLatex(0.2, 0.95, Form("Clusters / tracklet, layer %d", il));
+    }
+  }
+  
+  TCanvas* c3=0x0;
+  if(clsRows) {
+    c3 = new TCanvas("ESDsummary3", "ESD summary 3", 1600, 1200);
+    gPad->SetTopMargin(0.05); gPad->SetBottomMargin(0.001);
+    gPad->SetLeftMargin(0.001); gPad->SetRightMargin(0.001);
+    gPad->Divide(3,2,0.,0.);
+    l=gPad->GetListOfPrimitives();
+    for(Int_t il=0;il<6;++il) {
+      TProfile2D* clsRowsEtaPhiProf = clsRowsEtaPhi[il]->Project3DProfile("yx");
+      pad = ((TVirtualPad*)l->At(layerPads[il])); pad->cd();
+      pad->SetLeftMargin(0.15); pad->SetRightMargin(0.1);
+      pad->SetTopMargin(0.06); pad->SetBottomMargin(0.15);
+      clsRowsEtaPhiProf->SetStats(kFALSE);
+      clsRowsEtaPhiProf->SetTitle("");
+      SetStyle(clsRowsEtaPhiProf->GetXaxis(), "#eta", 0.06, 1.0, kTRUE, 0.06);
+      SetStyle(clsRowsEtaPhiProf->GetYaxis(), "#varphi (rad.)", 0.06, 1.0, kTRUE, 0.06);
+      clsRowsEtaPhiProf->Draw("colz");
+      lat->DrawLatex(0.2, 0.95, Form("Clusters / crossed rows, layer %d", il));
+    }
+  }
+  
+  TCanvas* c4=0x0;
+  if(tpcTofMatch) {
+    TH2D* tpcRef = (TH2D*)tpcTofMatch->Project(0, tpcTofMatch->GetVar(fgkVarNames[kTrackEtaTRD]),
+                                                  tpcTofMatch->GetVar(fgkVarNames[kTrackPhiTRD]));
+    TH2D* tpcPhiPt = (TH2D*)tpcTofMatch->Project(0, tpcTofMatch->GetVar(fgkVarNames[kTrackPt]),
+                                                    tpcTofMatch->GetVar(fgkVarNames[kTrackPhiTRD]));
+    TH2D* tofin  = (TH2D*)tpcTofMatch->Project(1, tpcTofMatch->GetVar(fgkVarNames[kTrackEtaTRD]),
+                                                  tpcTofMatch->GetVar(fgkVarNames[kTrackPhiTRD]));
+    TH2D* tofinPhiPt = (TH2D*)tpcTofMatch->Project(1, tpcTofMatch->GetVar(fgkVarNames[kTrackPt]),
+                                                      tpcTofMatch->GetVar(fgkVarNames[kTrackPhiTRD]));
+    TH2D* tofout = (TH2D*)tpcTofMatch->Project(2, tpcTofMatch->GetVar(fgkVarNames[kTrackEtaTRD]),
+                                                  tpcTofMatch->GetVar(fgkVarNames[kTrackPhiTRD]));
+    TH2D* tofoutPhiPt = (TH2D*)tpcTofMatch->Project(2, tpcTofMatch->GetVar(fgkVarNames[kTrackPt]),
+                                                       tpcTofMatch->GetVar(fgkVarNames[kTrackPhiTRD]));
+    tofin->Divide(tpcRef);
+    tofout->Divide(tpcRef);
+    tofinPhiPt->Divide(tpcPhiPt);
+    tofoutPhiPt->Divide(tpcPhiPt);
+    
+    c4=new TCanvas("ESDsummary4", "TPC - TOF matching", 1600., 1200.);
+    c4->SetLeftMargin(0.01); c4->SetRightMargin(0.01);
+    c4->SetTopMargin(0.01); c4->SetBottomMargin(0.01);
+    c4->Divide(2,2,0.,0.);
+    pad=c4->cd(1);
+    pad->SetLeftMargin(0.12); pad->SetRightMargin(0.12);
+    pad->SetTopMargin(0.07); pad->SetBottomMargin(0.12);
+    tofin->SetTitle(""); tofin->SetStats(kFALSE);
+    tofin->Draw("colz");
+    lat->DrawLatex(0.1, 0.94, "TPC - TOFin matching");
+    pad=c4->cd(2);
+    pad->SetLeftMargin(0.12); pad->SetRightMargin(0.12);
+    pad->SetTopMargin(0.07); pad->SetBottomMargin(0.12);
+    tofout->SetTitle(""); tofout->SetStats(kFALSE);
+    tofout->Draw("colz");
+    lat->DrawLatex(0.1, 0.94, "TPC - TOFout matching");
+    pad=c4->cd(3);
+    pad->SetLeftMargin(0.12); pad->SetRightMargin(0.12);
+    pad->SetTopMargin(0.07); pad->SetBottomMargin(0.12);
+    tofinPhiPt->SetTitle(""); tofinPhiPt->SetStats(kFALSE);
+    tofinPhiPt->Draw("colz");
+    lat->DrawLatex(0.1, 0.94, "TPC - TOFin matching");
+    pad=c4->cd(4);
+    pad->SetLeftMargin(0.12); pad->SetRightMargin(0.12);
+    pad->SetTopMargin(0.07); pad->SetBottomMargin(0.12);
+    tofoutPhiPt->SetTitle(""); tofoutPhiPt->SetStats(kFALSE);
+    tofoutPhiPt->Draw("colz");
+    lat->DrawLatex(0.1, 0.94, "TPC - TOFout matching");
+  }
+
+  if(matchPhiEta || trdQuality || trdChi2 || trdBudget || ploss) c1->SaveAs("esdSummary1.gif");
+  if(clusters) c2->SaveAs("esdSummary2.gif");
+  if(clsRows) c3->SaveAs("esdSummary3.gif");
+  if(tpcTofMatch) c4->SaveAs("esdSummary4.gif");
 }
 
+
 //__________________________________________________________________________________________________
 void AliTRDcheckESD::DrawTRDGrid() {
   //
@@ -3351,16 +2091,15 @@ void AliTRDcheckESD::DrawTRDGrid() {
   line.SetLineColor(2);
   line.SetLineWidth(1);
   line.SetLineStyle(2);
-  for(Int_t i=0; i<=9; ++i) {
+  for(Int_t i=-9; i<=9; ++i) {
     line.DrawLine(-1.0, 2.0*TMath::Pi()/18.0*i, +1.0, 2.0*TMath::Pi()/18.0*i);
-    line.DrawLine(-1.0, -2.0*TMath::Pi()/18.0*i, +1.0, -2.0*TMath::Pi()/18.0*i);
-  }
-  line.DrawLine(-0.85, -3.2, -0.85, +3.2);
-  line.DrawLine(-0.54, -3.2, -0.54, +3.2);
-  line.DrawLine(-0.16, -3.2, -0.16, +3.2);
-  line.DrawLine(+0.16, -3.2, +0.16, +3.2);
-  line.DrawLine(+0.54, -3.2, +0.54, +3.2);
-  line.DrawLine(+0.85, -3.2, +0.85, +3.2);
+  }
+  line.DrawLine(-0.85, -3.15, -0.85, 3.15);
+  line.DrawLine(-0.54, -3.15, -0.54, 3.15);
+  line.DrawLine(-0.16, -3.15, -0.16, 3.15);
+  line.DrawLine(+0.16, -3.15, +0.16, 3.15);
+  line.DrawLine(+0.54, -3.15, +0.54, 3.15);
+  line.DrawLine(+0.85, -3.15, +0.85, 3.15);
 }
 
 //_________________________________________________________________
@@ -3391,6 +2130,9 @@ void AliTRDcheckESD::SetStyle(TAxis* axis, const Char_t* title, Float_t titleSiz
   axis->SetTitleOffset(titleOffset); 
   axis->CenterTitle(centerTitle);
   axis->SetLabelSize(labelSize);
+  axis->SetTitleFont(42);
+  axis->SetLabelFont(42);
+  axis->SetNdivisions(507);
 }
 
 //____________________________________________________________________
@@ -3435,7 +2177,7 @@ Int_t AliTRDcheckESD::GetTriggerIndex(const Char_t* name, Bool_t createNew/*=kTR
   //  If the index for this trigger does not exist yet, then assign one if createNew is set to TRUE 
   //
   //cout << "GetTriggerIndex for " << name << endl;
-  TH1F* triggerHist = (TH1F*)fHistos->At(kTriggerDefs);
+  TH1F* triggerHist = (TH1F*)fHistos->FindObject("hTriggerDefs");
   TString nameStr=name;
   for(Int_t i=1; i<=triggerHist->GetXaxis()->GetNbins(); ++i) {
     if(!nameStr.CompareTo(triggerHist->GetXaxis()->GetBinLabel(i))) {
@@ -3445,33 +2187,16 @@ Int_t AliTRDcheckESD::GetTriggerIndex(const Char_t* name, Bool_t createNew/*=kTR
   }
   if(createNew) {
     triggerHist->GetXaxis()->SetBinLabel(fNAssignedTriggers+1, name);
-    if(fMatchingPhiEtaCF->GetVar("trigger")>=0) {
-      fMatchingPhiEtaCF->GetAxis(fMatchingPhiEtaCF->GetVar("trigger"), 0)->SetBinLabel(fNAssignedTriggers+1, name);
-      fMatchingPhiEtaCF->GetAxis(fMatchingPhiEtaCF->GetVar("trigger"), 1)->SetBinLabel(fNAssignedTriggers+1, name);
-      fMatchingPhiEtaCF->GetAxis(fMatchingPhiEtaCF->GetVar("trigger"), 2)->SetBinLabel(fNAssignedTriggers+1, name);
-    }
-    if(fMatchingPtCF->GetVar("trigger")>=0) {
-      fMatchingPtCF->GetAxis(fMatchingPtCF->GetVar("trigger"), 0)->SetBinLabel(fNAssignedTriggers+1, name);
-      fMatchingPtCF->GetAxis(fMatchingPtCF->GetVar("trigger"), 1)->SetBinLabel(fNAssignedTriggers+1, name);
-      fMatchingPtCF->GetAxis(fMatchingPtCF->GetVar("trigger"), 2)->SetBinLabel(fNAssignedTriggers+1, name);
-    }
-    if(fBunchCrossingsCF->GetVar("trigger")>=0) {
-      fBunchCrossingsCF->GetAxis(fBunchCrossingsCF->GetVar("trigger"), 0)->SetBinLabel(fNAssignedTriggers+1, name);
-      fBunchCrossingsCF->GetAxis(fBunchCrossingsCF->GetVar("trigger"), 1)->SetBinLabel(fNAssignedTriggers+1, name);
-      fBunchCrossingsCF->GetAxis(fBunchCrossingsCF->GetVar("trigger"), 2)->SetBinLabel(fNAssignedTriggers+1, name);
-    }
-    if(fCentralityCF->GetVar("trigger")>=0) 
-      fCentralityCF->GetAxis(fCentralityCF->GetVar("trigger"), 0)->SetBinLabel(fNAssignedTriggers+1, name);
-    if(fQtotCF->GetVar("trigger")>=0) 
-      fQtotCF->GetAxis(fQtotCF->GetVar("trigger"), 0)->SetBinLabel(fNAssignedTriggers+1, name);
-    if(fPulseHeightCF->GetVar("trigger")>=0)
-      fPulseHeightCF->GetAxis(fPulseHeightCF->GetVar("trigger"), 0)->SetBinLabel(fNAssignedTriggers+1, name);
-    if(fExpertCF) {
-      if(fExpertCF->GetVar("trigger")>=0)
-        for(Int_t istep=0; istep<fExpertCF->GetNStep(); ++istep) 
-         fExpertCF->GetAxis(fExpertCF->GetVar("trigger"), istep)->SetBinLabel(fNAssignedTriggers+1, name);
-    }
-    
+    for(Int_t i=1;i<fHistos->GetEntries();++i) {
+      TString objType = fHistos->At(i)->IsA()->GetName();
+      if(!objType.Contains("AliCFContainer")) continue;
+      AliCFContainer* cf=(AliCFContainer*)fHistos->At(i);
+      Int_t trigVar = cf->GetVar(fgkVarNames[kEventTrigger]);
+      if(trigVar>=0)
+       for(Int_t istep=0;istep<cf->GetNStep();++istep) 
+         cf->GetAxis(trigVar, istep)->SetBinLabel(fNAssignedTriggers+1, name);
+    }  // end loop over histograms and CFs
+        
     ++fNAssignedTriggers;
     return fNAssignedTriggers+1;
   }
@@ -3489,7 +2214,7 @@ void AliTRDcheckESD::PrintTriggers() const {
     cout << "Warning in AliTRDcheckESD::PrintTriggers(): No file loaded!" << endl;
     return;
   }
-  TH1F* hTriggers = (TH1F*)fHistos->At(kTriggerDefs);
+  TH1F* hTriggers = (TH1F*)fHistos->FindObject("hTriggerDefs");
   cout << "Triggers found in this run" << endl;
   cout << "==========================" << endl;
   cout << "Name   Index   Entries    " << endl;
@@ -3510,7 +2235,7 @@ Int_t AliTRDcheckESD::GetTriggerCounter(const Char_t* triggerName) const {
     cout << "Warning in AliTRDcheckESD::PrintTriggers(): No file loaded!" << endl;
     return -1;
   }
-  TH1F* hTriggers = (TH1F*)fHistos->At(kTriggerDefs);
+  TH1F* hTriggers = (TH1F*)fHistos->FindObject("hTriggerDefs");
   Int_t counter = -1;
   for(Int_t it=1; it<hTriggers->GetXaxis()->GetNbins(); ++it) {
     TString trgString = hTriggers->GetXaxis()->GetBinLabel(it);