]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG3/hfe/AliAnalysisTaskHFE.cxx
Major update of the HFE package (comments inside the code
[u/mrichter/AliRoot.git] / PWG3 / hfe / AliAnalysisTaskHFE.cxx
index 0009825ae2dd3cdbdf9f7c7e5de72377ef8c33c1..508485043a6e170c6dd8728bbcce264949016443 100644 (file)
 * about the suitability of this software for any purpose. It is          *
 * provided "as is" without express or implied warranty.                  *
 **************************************************************************/
-/*
- * The analysis task:
- * Filling an AliCFContainer with the quantities pt, eta and phi
- * for tracks which survivied the particle cuts (MC resp. ESD tracks)
- * Track selection is done using the AliHFE package
- * 
- * Author:
- *  Raphaelle Bailhache <R.Bailhache@gsi.de>
- *  Markus Fasel <M.Fasel@gsi.de>
- *  Matus Kalisky <matus.kalisky@cern.ch>
- *  MinJung Kweon <minjung@physi.uni-heidelberg.de>
- */
+//
+// The analysis task:
+// Filling an AliCFContainer with the quantities pt, eta and phi
+// for tracks which survivied the particle cuts (MC resp. ESD tracks)
+// Track selection is done using the AliHFE package
+// 
+// Author:
+//  Raphaelle Bailhache <R.Bailhache@gsi.de>
+//  Markus Fasel <M.Fasel@gsi.de>
+//  Matus Kalisky <matus.kalisky@cern.ch>
+//  MinJung Kweon <minjung@physi.uni-heidelberg.de>
+//
 #include <TAxis.h>
 #include <TCanvas.h>
 #include <TChain.h>
 #include <TDirectory.h>
 #include <TFile.h>
-#include <TH1D.h>
-#include <TH1F.h>
-#include <TH1I.h>
-#include <TH2F.h>
+#include <TH3D.h>
 #include <TIterator.h>
 #include <TList.h>
 #include <TLegend.h>
 #include <TParticle.h>
 #include <TProfile.h>
 #include <TString.h>
+#include <TF1.h>
 #include <TTree.h>
 
+#include "AliAODInputHandler.h"
+#include "AliAODMCParticle.h"
+#include "AliAODTrack.h"
 #include "AliCFContainer.h"
 #include "AliCFManager.h"
 #include "AliESDEvent.h"
 #include "AliESDInputHandler.h"
+#include "AliESDpid.h"
 #include "AliESDtrack.h"
-#include "AliESDtrackCuts.h"
+#include "AliESDCentrality.h"
 #include "AliLog.h"
 #include "AliAnalysisManager.h"
 #include "AliMCEvent.h"
 #include "AliMCParticle.h"
 #include "AliPID.h"
 #include "AliStack.h"
+#include "AliTriggerAnalysis.h"
+#include "AliVVertex.h"
 
-#include "AliHFEpid.h"
+#include "AliHFEcollection.h"
+#include "AliHFEcontainer.h"
 #include "AliHFEcuts.h"
+#include "AliHFEelecbackground.h"
 #include "AliHFEmcQA.h"
+#include "AliHFEpairs.h"
+#include "AliHFEpid.h"
+#include "AliHFEpidQAmanager.h"
+#include "AliHFEpostAnalysis.h"
+#include "AliHFEsecVtxs.h"
 #include "AliHFEsecVtx.h"
+#include "AliHFEsignalCuts.h"
+#include "AliHFEtaggedTrackAnalysis.h"
+#include "AliHFEtools.h"
+#include "AliHFEvarManager.h"
 #include "AliAnalysisTaskHFE.h"
 
+ClassImp(AliAnalysisTaskHFE)
+
 //____________________________________________________________
 AliAnalysisTaskHFE::AliAnalysisTaskHFE():
-  AliAnalysisTask("PID efficiency Analysis", "")
+  AliAnalysisTaskSE("PID efficiency Analysis")
   , fQAlevel(0)
-  , fPIDdetectors("")
-  , fESD(0x0)
-  , fMC(0x0)
-  , fCFM(0x0)
-  , fCorrelation(0x0)
-  , fPIDperformance(0x0)
-  , fPID(0x0)
-  , fCuts(0x0)
-  , fSecVtx(0x0)
-  , fMCQA(0x0)
-  , fNEvents(0x0)
-  , fNElectronTracksEvent(0x0)
-  , fQA(0x0)
-  , fOutput(0x0)
-  , fHistMCQA(0x0)
-  , fHistSECVTX(0x0)
+  , fPlugins(0)
+  , fFillSignalOnly(kTRUE)
+  , fRemovePileUp(kFALSE)
+  , fIdentifiedAsPileUp(kFALSE)
+  , fIdentifiedAsOutInz(kFALSE)
+  , fPassTheEventCut(kFALSE)
+  , fCentralityF(99.0)
+  , fBackGroundFactorsFunction(NULL)
+  , fContainer(NULL)
+  , fVarManager(NULL)
+  , fSignalCuts(NULL)
+  , fCFM(NULL)
+  , fTriggerAnalysis(NULL)
+  , fPID(NULL)
+  , fPIDqa(NULL)
+  , fPIDpreselect(NULL)
+  , fCuts(NULL)
+  , fTaggedTrackCuts(NULL)
+  , fCutspreselect(NULL)
+  , fSecVtx(NULL)
+  , fElecBackGround(NULL)
+  , fMCQA(NULL)
+  , fTaggedTrackAnalysis(NULL)
+  , fQA(NULL)
+  , fOutput(NULL)
+  , fHistMCQA(NULL)
+  , fHistSECVTX(NULL)
+  , fHistELECBACKGROUND(NULL)
+  , fQACollection(NULL)
 {
   //
-  // Default constructor
+  // Dummy constructor
+  //
+}
+
+//____________________________________________________________
+AliAnalysisTaskHFE::AliAnalysisTaskHFE(const char * name):
+  AliAnalysisTaskSE(name)
+  , fQAlevel(0)
+  , fPlugins(0)
+  , fFillSignalOnly(kTRUE)
+  , fRemovePileUp(kFALSE)
+  , fIdentifiedAsPileUp(kFALSE)
+  , fIdentifiedAsOutInz(kFALSE)
+  , fPassTheEventCut(kFALSE)  
+  , fCentralityF(99.0)
+  , fBackGroundFactorsFunction(NULL)
+  , fContainer(NULL)
+  , fVarManager(NULL)
+  , fSignalCuts(NULL)
+  , fCFM(NULL)
+  , fTriggerAnalysis(NULL)
+  , fPID(NULL)
+  , fPIDqa(NULL)
+  , fPIDpreselect(NULL)
+  , fCuts(NULL)
+  , fTaggedTrackCuts(NULL)
+  , fCutspreselect(NULL)
+  , fSecVtx(NULL)
+  , fElecBackGround(NULL)
+  , fMCQA(NULL)
+  , fTaggedTrackAnalysis(NULL)
+  , fQA(NULL)
+  , fOutput(NULL)
+  , fHistMCQA(NULL)
+  , fHistSECVTX(NULL)
+  , fHistELECBACKGROUND(NULL)
+  , fQACollection(0x0)
+{
   //
-  DefineInput(0, TChain::Class());
-  DefineOutput(0, TH1I::Class());
+  // Default constructor
+  // 
   DefineOutput(1, TList::Class());
   DefineOutput(2, TList::Class());
 
-  // Initialize cuts
-  fCuts = new AliHFEcuts;
-  fPID = new AliHFEpid;
+  fPID = new AliHFEpid("hfePid");
+  fVarManager = new AliHFEvarManager("hfeVarManager");
 }
 
 //____________________________________________________________
 AliAnalysisTaskHFE::AliAnalysisTaskHFE(const AliAnalysisTaskHFE &ref):
-  AliAnalysisTask(ref)
-  , fQAlevel(ref.fQAlevel)
-  , fPIDdetectors(ref.fPIDdetectors)
-  , fESD(ref.fESD)
-  , fMC(ref.fMC)
-  , fCFM(ref.fCFM)
-  , fCorrelation(ref.fCorrelation)
-  , fPIDperformance(ref.fPIDperformance)
-  , fPID(ref.fPID)
-  , fCuts(ref.fCuts)
-  , fSecVtx(ref.fSecVtx)
-  , fMCQA(ref.fMCQA)
-  , fNEvents(ref.fNEvents)
-  , fNElectronTracksEvent(ref.fNElectronTracksEvent)
-  , fQA(ref.fQA)
-  , fOutput(ref.fOutput)
-  , fHistMCQA(ref.fHistMCQA)
-  , fHistSECVTX(ref.fHistSECVTX)
+  AliAnalysisTaskSE(ref)
+  , fQAlevel(0)
+  , fPlugins(0)
+  , fFillSignalOnly(ref.fFillSignalOnly)
+  , fRemovePileUp(ref.fRemovePileUp)
+  , fIdentifiedAsPileUp(ref.fIdentifiedAsPileUp)
+  , fIdentifiedAsOutInz(ref.fIdentifiedAsOutInz)
+  , fPassTheEventCut(ref.fPassTheEventCut)
+  , fCentralityF(ref.fCentralityF)
+  , fBackGroundFactorsFunction(NULL)
+  , fContainer(NULL)
+  , fVarManager(NULL)
+  , fSignalCuts(NULL)
+  , fCFM(NULL)
+  , fTriggerAnalysis(NULL)
+  , fPID(NULL)
+  , fPIDqa(NULL)
+  , fPIDpreselect(NULL)
+  , fCuts(NULL)
+  , fTaggedTrackCuts(NULL)
+  , fCutspreselect(NULL)
+  , fSecVtx(NULL)
+  , fElecBackGround(NULL)
+  , fMCQA(NULL)
+  , fTaggedTrackAnalysis(NULL)
+  , fQA(NULL)
+  , fOutput(NULL)
+  , fHistMCQA(NULL)
+  , fHistSECVTX(NULL)
+  , fHistELECBACKGROUND(NULL)
+  , fQACollection(NULL)
 {
   //
   // Copy Constructor
   //
+  ref.Copy(*this);
 }
 
 //____________________________________________________________
@@ -128,618 +208,940 @@ AliAnalysisTaskHFE &AliAnalysisTaskHFE::operator=(const AliAnalysisTaskHFE &ref)
   //
   // Assignment operator
   //
-  if(this == &ref) return *this;
-  AliAnalysisTask::operator=(ref);
-  fQAlevel = ref.fQAlevel;
-  fPIDdetectors = ref.fPIDdetectors;
-  fESD = ref.fESD;
-  fMC = ref.fMC;
-  fCFM = ref.fCFM;
-  fCorrelation = ref.fCorrelation;
-  fPIDperformance = ref.fPIDperformance;
-  fPID = ref.fPID;
-  fCuts = ref.fCuts;
-  fSecVtx = ref.fSecVtx;
-  fMCQA = ref.fMCQA;
-  fNEvents = ref.fNEvents;
-  fNElectronTracksEvent = ref.fNElectronTracksEvent;
-  fQA = ref.fQA;
-  fOutput = ref.fOutput;
-  fHistMCQA = ref.fHistMCQA;
-  fHistSECVTX = ref.fHistSECVTX;
+  if(this == &ref) 
+    ref.Copy(*this);
   return *this;
 }
 
+//____________________________________________________________
+void AliAnalysisTaskHFE::Copy(TObject &o) const {
+  // 
+  // Copy into object o
+  //
+  AliAnalysisTaskHFE &target = dynamic_cast<AliAnalysisTaskHFE &>(o);
+  target.fQAlevel = fQAlevel;
+  target.fPlugins = fPlugins;
+  target.fFillSignalOnly = fFillSignalOnly;
+  target.fRemovePileUp = fRemovePileUp;
+  target.fIdentifiedAsPileUp = fIdentifiedAsPileUp;
+  target.fIdentifiedAsOutInz = fIdentifiedAsOutInz;
+  target.fPassTheEventCut = fPassTheEventCut;
+  target.fCentralityF = fCentralityF;
+  target.fBackGroundFactorsFunction = fBackGroundFactorsFunction;
+  target.fContainer = fContainer;
+  target.fVarManager = fVarManager;
+  target.fSignalCuts = fSignalCuts;
+  target.fCFM = fCFM;
+  target.fTriggerAnalysis = fTriggerAnalysis;
+  target.fPID = fPID;
+  target.fPIDqa = fPIDqa;
+  target.fPIDpreselect = fPIDpreselect;
+  target.fCuts = fCuts;
+  target.fTaggedTrackCuts = fTaggedTrackCuts;
+  target.fCutspreselect = fCutspreselect;
+  target.fSecVtx = fSecVtx;
+  target.fElecBackGround = fElecBackGround;
+  target.fMCQA = fMCQA;
+  target.fTaggedTrackAnalysis = fTaggedTrackAnalysis;
+  target.fQA = fQA;
+  target.fOutput = fOutput;
+  target.fHistMCQA = fHistMCQA;
+  target.fHistSECVTX = fHistSECVTX;
+  target.fHistELECBACKGROUND = fHistELECBACKGROUND;
+  target.fQACollection = fQACollection;
+}
+
 //____________________________________________________________
 AliAnalysisTaskHFE::~AliAnalysisTaskHFE(){
   //
   // Destructor
   //
-  if(fESD) delete fESD;
-  if(fMC) delete fMC;
   if(fPID) delete fPID;
-  if(fQA){
-    fQA->Clear();
-    delete fQA;
-  }
-  if(fOutput){ 
-    fOutput->Clear();
-    delete fOutput;
-  }
-  if(fHistMCQA){
-    fHistMCQA->Clear();
-    delete fHistMCQA;
-  }
-  if(fHistSECVTX){
-    fHistSECVTX->Clear();
-    delete fHistSECVTX;
-  }
-  if(fCuts) delete fCuts;
+  if(fVarManager) delete fVarManager;
+  if(fPIDqa) delete fPIDqa;
+  if(fSignalCuts) delete fSignalCuts;
+  if(fCFM) delete fCFM;
   if(fSecVtx) delete fSecVtx;
   if(fMCQA) delete fMCQA;
-  if(fNEvents) delete fNEvents;
-  if(fCorrelation){
-    fCorrelation->Clear();
-    delete fCorrelation;
-  }
-  if(fPIDperformance) delete fPIDperformance;
+  if(fElecBackGround) delete fElecBackGround;
+  if(fTriggerAnalysis) delete fTriggerAnalysis;
+  if(fPIDpreselect) delete fPIDpreselect;
+  if(fQA) delete fQA;
+  if(fOutput) delete fOutput;
 }
 
 //____________________________________________________________
-void AliAnalysisTaskHFE::ConnectInputData(Option_t *){
-/*  TTree *esdchain = dynamic_cast<TChain *>(GetInputData(0));
-  if(!esdchain){
-    AliError("ESD chain empty");
-    return;
-  } else {
-    esdchain->SetBranchStatus("Tracks", 1);
-  }
-*/
-  AliESDInputHandler *esdH = dynamic_cast<AliESDInputHandler *>(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
-  if(!esdH){      
-    AliError("No ESD input handler");
-    return;
-  } else {
-    fESD = esdH->GetEvent();
-  }
-  AliMCEventHandler *mcH = dynamic_cast<AliMCEventHandler *>(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler());
-  if(!mcH){       
-    AliError("No MC truth handler");
-    return;
+void AliAnalysisTaskHFE::UserCreateOutputObjects(){
+  //
+  // Creating output container and output objects
+  // Here we also Initialize the correction framework container and 
+  // the objects for
+  // - PID
+  // - MC QA
+  // - SecVtx
+  // QA histograms are created if requested
+  // Called once per worker
+  //
+  AliDebug(3, "Creating Output Objects");
+  // Automatic determination of the analysis mode
+  AliVEventHandler *inputHandler = dynamic_cast<AliVEventHandler *>(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
+  if(!TString(inputHandler->IsA()->GetName()).CompareTo("AliAODInputHandler")){
+    SetAODAnalysis();
   } else {
-    fMC = mcH->MCEvent();
+    SetESDAnalysis();
+    if(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler())
+      SetHasMCData();
   }
-}
+  printf("Analysis Mode: %s Analysis\n", IsAODanalysis() ? "AOD" : "ESD");
+  printf("MC Data available %s\n", HasMCData() ? "Yes" : "No");
 
-//____________________________________________________________
-void AliAnalysisTaskHFE::CreateOutputObjects(){
-  fNEvents = new TH1I("nEvents", "Number of Events in the Analysis", 2, 0, 2); // Number of Events neccessary for the analysis and not a QA histogram
-  fNElectronTracksEvent = new TH1I("nElectronTracksEvent", "Number of Electron Candidates", 100, 0, 100);
-  // First Step: TRD alone
-  if(!fQA) fQA = new TList;
-  fQA->AddAt(new TProfile("conr", "Electron PID contamination", 20, 0, 20), 0);
-  fQA->AddAt(new TH1F("alpha_rec", "Alpha from reconstructed tracks with TRD hits", 36, -TMath::Pi(), TMath::Pi()), 1);
-  fQA->AddAt(new TH1F("alpha_sim", "Alpha from simulated electron tracks", 36, -TMath::Pi(), TMath::Pi()), 2);
-  fQA->AddAt(new TH1F("nElectron", "Number of electrons", 100, 0, 100), 3);
-  fQA->AddAt(new TProfile("pidquality", "TRD PID quality as function of momentum", 20, 0, 20), 4);
-  fQA->AddAt(new TProfile("ntrdclusters", "Number of TRD clusters as function of momentum", 20, 0, 20), 5);
-  fQA->AddAt(new TH1F("chi2TRD","#chi2 per TRD cluster", 20, 0, 20), 6);
+  // Enable Trigger Analysis
+  fTriggerAnalysis = new AliTriggerAnalysis;
+  fTriggerAnalysis->EnableHistograms();
+  fTriggerAnalysis->SetAnalyzeMC(HasMCData());
 
+
+  // Make lists for Output
+  if(!fQA) fQA = new TList;
+  fQA->SetOwner();
   if(!fOutput) fOutput = new TList;
-  // Initialize correction Framework and Cuts
-  fCFM = new AliCFManager;
-  MakeParticleContainer();
-  // Temporary fix: Initialize particle cuts with 0x0
-  for(Int_t istep = 0; istep < fCFM->GetParticleContainer()->GetNStep(); istep++)
-    fCFM->SetParticleCutsList(istep, 0x0);
-  if(IsQAOn(kCUTqa)){
-    AliInfo("QA on for Cuts");
-    fCuts->SetDebugMode();
-    fQA->Add(fCuts->GetQAhistograms());
-  }
-  fCuts->CreateStandardCuts();
-  //fCuts->SetDebugLevel(1);
-  fCuts->SetMinNTrackletsTRD(0);  // Minimal requirement to get a minimum biased electron sample (only TPC and ITS requirements allowed)
-  fCuts->SetCutITSpixel(AliHFEextraCuts::kAny);
-  fCuts->Initialize(fCFM);
-  // add output objects to the List
-  fOutput->AddAt(fCFM->GetParticleContainer(), 0);
-  fOutput->AddAt(fCorrelation, 1);
-  fOutput->AddAt(fPIDperformance, 2);
-  fOutput->AddAt(fNElectronTracksEvent, 3);
+  fOutput->SetOwner();
+
+  // First Part: Make QA histograms
+  fQACollection = new AliHFEcollection("TaskQA", "QA histos from the Electron Task");
+  fQACollection->CreateTH1F("nElectronTracksEvent", "Number of Electron Candidates", 100, 0, 100);
+  fQACollection->CreateProfile("conr", "Electron PID contamination", 20, 0, 20);
+  fQACollection->CreateTH1F("alpha_rec", "Alpha from reconstructed tracks with TRD hits", 36, -TMath::Pi(), TMath::Pi());
+  fQACollection->CreateTH1F("alpha_sim", "Alpha from simulated electron tracks", 36, -TMath::Pi(), TMath::Pi());
+  fQACollection->CreateTH1F("nElectron", "Number of electrons", 100, 0, 100);
+  fQACollection->CreateProfile("pidquality", "TRD PID quality as function of momentum", 20, 0, 20);
+  fQACollection->CreateProfile("ntrdclusters", "Number of TRD clusters as function of momentum", 20, 0, 20);
+  fQACollection->CreateTH1F("chi2TRD","#chi2 per TRD cluster", 20, 0, 20);
+  fQACollection->CreateTH1F("mccharge", "MC Charge", 200, -100, 100);
+  fQACollection->CreateTH2F("radius", "Production Vertex", 100, 0.0, 5.0, 100, 0.0, 5.0);
+  InitPIDperformanceQA();
+  fQA->Add(fQACollection->GetList());
 
   // Initialize PID
+  fPID->SetHasMCData(HasMCData());
+  if(!fPID->GetNumberOfPIDdetectors()) fPID->AddDetector("TPC", 0);
+  fPID->InitializePID();
   if(IsQAOn(kPIDqa)){
     AliInfo("PID QA switched on");
-    fPID->SetQAOn();
-    fQA->Add(fPID->GetQAhistograms());
+    fPIDqa = new AliHFEpidQAmanager;
+    fPIDqa->Initialize(fPID);
+    fQA->Add(fPIDqa->MakeList("HFEpidQA"));
   }
-  fPID->SetHasMCData(kTRUE);
-  if(!fPIDdetectors.Length()) AddPIDdetector("TPC");
-  fPID->InitializePID(fPIDdetectors.Data());     // Only restrictions to TPC allowed 
 
+  // Initialize correction Framework and Cuts
+  const Int_t kNcutSteps = AliHFEcuts::kNcutStepsMCTrack + AliHFEcuts::kNcutStepsRecTrack + AliHFEcuts::kNcutStepsDETrack;
+  fCFM = new AliCFManager;
+  fCFM->SetNStepParticle(kNcutSteps);
+  MakeParticleContainer();
+  MakeEventContainer();
+  // Temporary fix: Initialize particle cuts with NULL
+  for(Int_t istep = 0; istep < kNcutSteps; istep++)
+    fCFM->SetParticleCutsList(istep, NULL);
+  if(!fCuts){
+    AliWarning("Cuts not available. Default cuts will be used");
+    fCuts = new AliHFEcuts;
+    fCuts->CreateStandardCuts();
+  }
+  if(IsAODanalysis()) fCuts->SetAOD();
+  // Make clone for V0 tagging step
+  fCuts->Initialize(fCFM);
+  if(fCuts->IsQAOn()) fQA->Add(fCuts->GetQAhistograms());
+  fSignalCuts = new AliHFEsignalCuts("HFEsignalCuts", "HFE MC Signal definition");
+  fVarManager->SetSignalCuts(fSignalCuts);
+  // add output objects to the List
+  fOutput->AddAt(fContainer, 0);
+  fOutput->AddAt(fCFM->GetEventContainer(), 1);
+  
   // mcQA----------------------------------
-  if (IsQAOn(kMCqa)) {
+  if (HasMCData() && IsQAOn(kMCqa)) {
     AliInfo("MC QA on");
     if(!fMCQA) fMCQA = new AliHFEmcQA;
     if(!fHistMCQA) fHistMCQA = new TList();
-    fHistMCQA->SetName("MCqa");
-    fMCQA->CreateHistograms(AliHFEmcQA::kCharm,0,"mcqa_");               // create histograms for charm
-    fMCQA->CreateHistograms(AliHFEmcQA::kBeauty,0,"mcqa_");              // create histograms for beauty
-    fMCQA->CreateHistograms(AliHFEmcQA::kCharm,1,"mcqa_barrel_");        // create histograms for charm 
-    fMCQA->CreateHistograms(AliHFEmcQA::kBeauty,1,"mcqa_barrel_");       // create histograms for beauty
-    TIter next(gDirectory->GetList());
-    TObject *obj;
-    int counter = 0;
-    TString objname;
-    while ((obj = next.Next())) {
-      objname = obj->GetName();
-      TObjArray *toks = objname.Tokenize("_");
-      if (toks->GetEntriesFast()){
-        TObjString *fpart = (TObjString *)(toks->UncheckedAt(0));
-        if ((fpart->String()).CompareTo("mcqa") == 0) fHistMCQA->AddAt(obj, counter++);
-      }
-    }
+    fHistMCQA->SetOwner();
+    fMCQA->CreatDefaultHistograms(fHistMCQA);
     fQA->Add(fHistMCQA);
   } 
 
   // secvtx----------------------------------
-  if (IsSecVtxOn()) {
+  if (GetPlugin(kSecVtx)) {
     AliInfo("Secondary Vertex Analysis on");
-    fSecVtx = new AliHFEsecVtx;
+    if(!fSecVtx) fSecVtx = new AliHFEsecVtx;
+    fSecVtx->SetHasMCData(HasMCData());
 
     if(!fHistSECVTX) fHistSECVTX = new TList();
-    fHistSECVTX->SetName("SecVtx");
-    fSecVtx->CreateHistograms("secvtx_");
-    TIter next(gDirectory->GetList());
-    TObject *obj;
-    int counter = 0;
-    TString objname;
-    while ((obj = next.Next())) {
-      objname = obj->GetName();
-      TObjArray *toks = objname.Tokenize("_");
-      if (toks->GetEntriesFast()){
-        TObjString *fpart = (TObjString *)(toks->UncheckedAt(0));
-        if ((fpart->String()).CompareTo("secvtx") == 0) fHistSECVTX->AddAt(obj, counter++);
-      }
-    }
+    fHistSECVTX->SetOwner();
+    fSecVtx->CreateHistograms(fHistSECVTX);
     fOutput->Add(fHistSECVTX);
-  } 
+  }
+  
+  // background----------------------------------
+  if (GetPlugin(kIsElecBackGround)) {
+    AliInfo("Electron BackGround Analysis on");
+    if(!fElecBackGround){
+      AliWarning("ElecBackGround not available. Default elecbackground will be used");
+      fElecBackGround = new AliHFEelecbackground;
+    }
+    fElecBackGround->SetHasMCData(HasMCData());
+
+    if(!fHistELECBACKGROUND) fHistELECBACKGROUND = new TList();
+    fHistELECBACKGROUND->SetOwner();
+    fElecBackGround->CreateHistograms(fHistELECBACKGROUND);
+    fOutput->Add(fHistELECBACKGROUND);
+  }  
+
+  // tagged tracks
+  if(GetPlugin(kTaggedTrackAnalysis)){
+    AliInfo("Analysis on V0-tagged tracks enabled");
+    fTaggedTrackAnalysis = new AliHFEtaggedTrackAnalysis;
+    fTaggedTrackAnalysis->SetCuts(fTaggedTrackCuts);
+    fTaggedTrackAnalysis->SetPID(fPID);
+    fTaggedTrackAnalysis->InitContainer();
+    fOutput->Add(fTaggedTrackAnalysis->GetContainer());
+    fQA->Add(fTaggedTrackAnalysis->GetPIDQA());
+    fQA->Add(fTaggedTrackAnalysis->GetCutQA());
+  }
+  PrintStatus();
 }
 
 //____________________________________________________________
-void AliAnalysisTaskHFE::Exec(Option_t *){
+void AliAnalysisTaskHFE::UserExec(Option_t *){
   //
   // Run the analysis
   // 
-  if(!fESD){
-    AliError("No ESD Event");
+  AliDebug(3, "Starting Single Event Analysis");
+  if(!fInputEvent){
+    AliError("Reconstructed Event not available");
     return;
   }
-  if(!fMC){
-    AliError("No MC Event");
+  if(HasMCData()){
+    AliDebug(4, Form("MC Event: %p", fMCEvent));
+    if(!fMCEvent){
+      AliError("No MC Event, but MC Data required");
+      return;
+    }
+  }
+  if(!fCuts){
+    AliError("HFE cuts not available");
     return;
   }
-  fCFM->SetEventInfo(fMC);
-  fPID->SetMCEvent(fMC);
 
-  //fCFM->CheckEventCuts(AliCFManager::kEvtGenCuts, fMC);
-  Double_t container[6];
-  // container for the output THnSparse
-  Double_t dataE[5]; // [pT, eta, Phi, type, 'C' or 'B']
+  if(IsESDanalysis() && HasMCData()){
+    // Protect against missing MC trees
+    AliMCEventHandler *mcH = dynamic_cast<AliMCEventHandler *>(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler());
+    if(!mcH){ 
+      AliError("No MC Event Handler available");
+      return;
+    }
+    if(!mcH->InitOk()) return;
+    if(!mcH->TreeK()) return;
+    if(!mcH->TreeTR()) return;
+  }
 
-  // Loop over the Monte Carlo tracks to see whether we have overlooked any track
-  AliMCParticle *mctrack = 0x0;
-  Int_t nElectrons = 0;
+  // need the centrality for everything (MC also)
+  fCentralityF = 99.0;
+  ReadCentrality();
+  
+  // See if pile up and z in the range
+  RejectionPileUpVertexRangeEventCut();
 
-  if (IsSecVtxOn()) { 
-    fSecVtx->SetEvent(fESD);
-    fSecVtx->SetStack(fMC->Stack());
+  // Protect agains missing 
+  if(HasMCData()){
+    fSignalCuts->SetMCEvent(fMCEvent);
+    ProcessMC();  // Run the MC loop + MC QA in case MC Data are available
   }
 
-  // run mc QA ------------------------------------------------
-  if (IsQAOn(kMCqa)) {
-    AliDebug(2, "Running MC QA");
-
-    fMCQA->SetStack(fMC->Stack());
-    fMCQA->Init();
+  if(IsAODanalysis()){
+    AliAODpidUtil *aodworkingpid = AliHFEtools::GetDefaultAODPID(HasMCData());
+    fPID->SetAODpid(aodworkingpid); 
+    if(fPIDqa) fPIDqa->SetAODpid(aodworkingpid);
+    if(fTaggedTrackAnalysis) fTaggedTrackAnalysis->GetPIDqa()->SetAODpid(aodworkingpid);
+    ProcessAOD();
+  } else {
+    AliESDInputHandler *inH = dynamic_cast<AliESDInputHandler *>(fInputHandler);
+    if(!inH){
+      AliError("No ESD Input handler available");
+      return;
+    }
+    AliESDpid *workingPID = inH->GetESDpid();
+    if(!workingPID){
+      AliDebug(1, "Using default ESD PID");
+      workingPID = AliHFEtools::GetDefaultPID(HasMCData());
+    } else { 
+      AliDebug(1, "Using ESD PID from the input handler");
+    }
+    fPID->SetESDpid(workingPID);
+    if(fPIDqa) fPIDqa->SetESDpid(workingPID);
+    if(fTaggedTrackAnalysis) fTaggedTrackAnalysis->GetPIDqa()->SetESDpid(workingPID);
+    if(fPIDpreselect) fPIDpreselect->SetESDpid(workingPID);
 
-    Int_t nPrims = fMC->Stack()->GetNprimary();
-    Int_t nMCTracks = fMC->Stack()->GetNtrack();
+    ProcessESD();
+  }
+  // Done!!!
+  PostData(1, fOutput);
+  PostData(2, fQA);
+}
 
-    // loop over primary particles for quark and heavy hadrons
-    for (Int_t igen = 0; igen < nPrims; igen++){
-      fMCQA->GetQuarkKine(igen, AliHFEmcQA::kCharm);
-      fMCQA->GetQuarkKine(igen, AliHFEmcQA::kBeauty);
-      fMCQA->GetHadronKine(igen, AliHFEmcQA::kCharm);
-      fMCQA->GetHadronKine(igen, AliHFEmcQA::kBeauty);
+//____________________________________________________________
+void AliAnalysisTaskHFE::Terminate(Option_t *){
+  //
+  // Terminate not implemented at the moment
+  //
+  if(GetPlugin(kPostProcess)){
+    fOutput = dynamic_cast<TList *>(GetOutputData(1));
+    fQA = dynamic_cast<TList *>(GetOutputData(2));
+    if(!fOutput){
+      AliError("Results not available");
+      return;
     }
-    fMCQA->EndOfEventAna(AliHFEmcQA::kCharm);
-    fMCQA->EndOfEventAna(AliHFEmcQA::kBeauty);
-
-    // loop over all tracks for decayed electrons
-    for (Int_t igen = 0; igen < nMCTracks; igen++){
-      fMCQA->GetDecayedKine(igen, AliHFEmcQA::kCharm,  AliHFEmcQA::kElectronPDG, 0);
-      fMCQA->GetDecayedKine(igen, AliHFEmcQA::kBeauty, AliHFEmcQA::kElectronPDG, 0);
-      fMCQA->GetDecayedKine(igen, AliHFEmcQA::kCharm,  AliHFEmcQA::kElectronPDG, 1, kTRUE); // barrel
-      fMCQA->GetDecayedKine(igen, AliHFEmcQA::kBeauty, AliHFEmcQA::kElectronPDG, 1, kTRUE); // barrel
+    if(!fQA){
+      AliError("QA output not available");
+      return;
+    }
+    fContainer = dynamic_cast<AliHFEcontainer *>(fOutput->FindObject("trackContainer")); 
+    if(!fContainer){
+      AliError("Track container not found");
+      return;
+    }
+    AliHFEpostAnalysis postanalysis;
+    postanalysis.SetTaskResults(fContainer);
+    TList *qalist = dynamic_cast<TList *>(fQA->FindObject("list_TaskQA"));
+    if(!qalist){
+      AliError("QA List not found");
+      return;
     }
+    postanalysis.SetTaskQA(qalist);
+    printf("Running post analysis\n");
+    //if(HasMCData())
+    postanalysis.DrawMCSignal2Background();
+    postanalysis.DrawEfficiency();
+    postanalysis.DrawPIDperformance();
+    postanalysis.DrawCutEfficiency();
+
+    if (GetPlugin(kIsElecBackGround)) {
+      AliHFEelecbackground elecBackGround;
+      TList *oe = 0x0;
+      if(!(oe = (TList*)dynamic_cast<TList *>(fOutput->FindObject("HFEelecbackground")))){
+       return;
+      }
+      elecBackGround.Load(oe);
+      elecBackGround.Plot();
+      elecBackGround.PostProcess();      
+    }
+  }
+}
+//_______________________________________________________________
+Bool_t AliAnalysisTaskHFE::IsEventInBinZero() {
+  //
+  //
+  //
 
-  } // end of MC QA loop
-  // -----------------------------------------------------------------
+  //printf("test in IsEventInBinZero\n");
+  if(!fInputEvent){
+    AliError("Reconstructed Event not available");
+    return kFALSE;
+  }
 
+  // check vertex
+  const AliVVertex *vertex = fInputEvent->GetPrimaryVertex();
+  if(!vertex) return kTRUE;
+  //if(vertex) return kTRUE;
+
+  // check tracks
+  if(fInputEvent->GetNumberOfTracks()<=0) return kTRUE;
+  //if(fInputEvent->GetNumberOfTracks()>0) return kTRUE;
+  
+  
+  return kFALSE;
+  
+}
+//____________________________________________________________
+void AliAnalysisTaskHFE::ProcessMC(){
   //
-  // Loop MC
+  // Runs the MC Loop (filling the container for the MC Cut Steps with the observables pt, eta and phi)
+  // In case MC QA is on also MC QA loop is done
   //
-  for(Int_t imc = fMC->GetNumberOfTracks(); imc--;){
-    mctrack = dynamic_cast<AliMCParticle *>(fMC->GetTrack(imc));
-
-    container[0] = mctrack->Pt();
-    container[1] = mctrack->Eta();
-    container[2] = mctrack->Phi();
+  AliDebug(3, "Processing MC Information");
+  Double_t eventContainer [3];
+  eventContainer[0] = fMCEvent->GetPrimaryVertex()->GetZ();
+  eventContainer[2] = fCentralityF;
+  if(fCFM->CheckEventCuts(AliHFEcuts::kEventStepGenerated, fMCEvent)) 
+    fCFM->GetEventContainer()->Fill(eventContainer,AliHFEcuts::kEventStepGenerated);
+  Int_t nElectrons = 0;
+  if(IsESDanalysis()){
+    if (HasMCData() && IsQAOn(kMCqa)) {
+      AliDebug(2, "Running MC QA");
+
+      if(fMCEvent->Stack()){
+             fMCQA->SetMCEvent(fMCEvent);
+        fMCQA->SetGenEventHeader(fMCEvent->GenEventHeader());
+        fMCQA->Init();
+
+        Int_t nMCTracks = fMCEvent->Stack()->GetNtrack();
+
+        // loop over all tracks for decayed electrons
+        for (Int_t igen = 0; igen < nMCTracks; igen++){
+          TParticle* mcpart = fMCEvent->Stack()->Particle(igen);
+          fMCQA->GetQuarkKine(mcpart, igen, AliHFEmcQA::kCharm);
+          fMCQA->GetQuarkKine(mcpart, igen, AliHFEmcQA::kBeauty);
+          fMCQA->GetHadronKine(mcpart, AliHFEmcQA::kCharm);
+          fMCQA->GetHadronKine(mcpart, AliHFEmcQA::kBeauty);
+          fMCQA->GetDecayedKine(mcpart, AliHFEmcQA::kCharm,  AliHFEmcQA::kElectronPDG, 0); // no accept cut
+          fMCQA->GetDecayedKine(mcpart, AliHFEmcQA::kBeauty, AliHFEmcQA::kElectronPDG, 0); // no accept cut
+          fMCQA->GetDecayedKine(mcpart, AliHFEmcQA::kOthers, AliHFEmcQA::kElectronPDG, 0); // no accept cut
+          if (TMath::Abs(mcpart->Eta()) < 0.9) {
+            fMCQA->GetDecayedKine(mcpart, AliHFEmcQA::kCharm,  AliHFEmcQA::kElectronPDG, 1); // accept |eta|<0.9
+            fMCQA->GetDecayedKine(mcpart, AliHFEmcQA::kBeauty, AliHFEmcQA::kElectronPDG, 1); // accept |eta|<0.9
+            fMCQA->GetDecayedKine(mcpart, AliHFEmcQA::kOthers, AliHFEmcQA::kElectronPDG, 1); // accept |eta|<0.9
+          }
+          if (TMath::Abs(AliHFEtools::GetRapidity(mcpart)) < 0.5) {
+            fMCQA->GetDecayedKine(mcpart, AliHFEmcQA::kCharm,  AliHFEmcQA::kElectronPDG, 2); // accept |y|<0.5
+            fMCQA->GetDecayedKine(mcpart, AliHFEmcQA::kBeauty, AliHFEmcQA::kElectronPDG, 2); // accept |y|<0.5
+            fMCQA->GetDecayedKine(mcpart, AliHFEmcQA::kOthers, AliHFEmcQA::kElectronPDG, 2); // accept |y|<0.5
+          }
+        }
+        fMCQA->EndOfEventAna(AliHFEmcQA::kCharm);
+        fMCQA->EndOfEventAna(AliHFEmcQA::kBeauty);
+      }
 
-    if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepMCGenerated, mctrack)) continue;
-    fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepMCGenerated);
-    (dynamic_cast<TH1F *>(fQA->At(2)))->Fill(mctrack->Phi() - TMath::Pi());
-    if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepMCInAcceptance, mctrack)) continue;
-    // find the label in the vector
-    fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepMCInAcceptance);
-    nElectrons++;
+    } // end of MC QA loop
+    // -----------------------------------------------------------------
+    fCFM->SetMCEventInfo(fMCEvent);
+    // fCFM->CheckEventCuts(AliCFManager::kEvtRecCuts, fESD);
+  } else {
+    fCFM->SetMCEventInfo(fInputEvent);
+  }
+  // Run MC loop
+  AliVParticle *mctrack = NULL;
+  AliDebug(3, Form("Number of Tracks: %d", fMCEvent->GetNumberOfTracks()));
+  for(Int_t imc = 0; imc <fMCEvent->GetNumberOfTracks(); imc++){
+    if(!(mctrack = fMCEvent->GetTrack(imc))) continue;
+    AliDebug(4, "Next MC Track");
+    if(ProcessMCtrack(mctrack)) nElectrons++;
   }
-  (dynamic_cast<TH1F *>(fQA->At(3)))->Fill(nElectrons);
 
   // fCFM->CheckEventCuts(AliCFManager::kEvtRecCuts, fESD);
-        
+  fQACollection->Fill("nElectron", nElectrons);
+}
 
+//____________________________________________________________
+void AliAnalysisTaskHFE::ProcessESD(){
   //
-  // Loop ESD
+  // Run Analysis of reconstructed event in ESD Mode
+  // Loop over Tracks, filter according cut steps defined in AliHFEcuts
   //
+  AliDebug(3, "Processing ESD Event");
+  AliESDEvent *fESD = dynamic_cast<AliESDEvent *>(fInputEvent);
+  if(!fESD){
+    AliError("ESD Event required for ESD Analysis")
+    return;
+  }
+
+  // Do event Normalization
+  Double_t eventContainer[3];
+  eventContainer[0] = fInputEvent->GetPrimaryVertex()->GetZ();
+  eventContainer[1] = 0.;
+  eventContainer[2] = fCentralityF;
+  if(fTriggerAnalysis->IsOfflineTriggerFired(fESD, AliTriggerAnalysis::kV0AND))
+    eventContainer[1] = 1.;
+
+  //
+  fCFM->GetEventContainer()->Fill(eventContainer, AliHFEcuts::kEventStepRecNoCut);
+
+  //
+  if(fIdentifiedAsPileUp) return; 
+  fCFM->GetEventContainer()->Fill(eventContainer, AliHFEcuts::kEventStepRecNoPileUp);
+
+  //
+  if(fIdentifiedAsOutInz) return;
+  fCFM->GetEventContainer()->Fill(eventContainer, AliHFEcuts::kEventStepZRange);  
 
+  //
+  if(!fPassTheEventCut) return;
+  fCFM->GetEventContainer()->Fill(eventContainer, AliHFEcuts::kEventStepReconstructed);
+
+
+  fContainer->NewEvent();
+
+  if (GetPlugin(kIsElecBackGround)) { 
+    fElecBackGround->SetEvent(fESD);
+  }
+  if (GetPlugin(kSecVtx)) {
+    fSecVtx->SetEvent(fESD);
+    fSecVtx->GetPrimaryCondition();
+  }
+
+  if(HasMCData()){
+    if (GetPlugin(kSecVtx)) { 
+      fSecVtx->SetMCEvent(fMCEvent);
+      fSecVtx->SetMCQA(fMCQA); 
+    }
+    if (GetPlugin(kIsElecBackGround)) { 
+      fElecBackGround->SetMCEvent(fMCEvent);
+    }
+  }
+
+  Double_t container[10];
+  memset(container, 0, sizeof(Double_t) * 10);
+  // container for the output THnSparse
+  Double_t dataE[6]; // [pT, eta, Phi, type, 'C' or 'B']
   Int_t nElectronCandidates = 0;
-  AliESDtrack *track = 0x0, *htrack = 0x0;
+  AliESDtrack *track = NULL, *htrack = NULL;
+  AliMCParticle *mctrack = NULL;
+  TParticle* mctrack4QA = NULL;
   Int_t pid = 0;
-  // For double counted tracks
-  LabelContainer cont(fESD->GetNumberOfTracks());
-  Bool_t alreadyseen = kFALSE;
 
   Bool_t signal = kTRUE;
 
-  for(Int_t itrack = 0; itrack < fESD->GetNumberOfTracks(); itrack++){
+  fCFM->SetRecEventInfo(fESD);
+  // Electron background analysis 
+  if (GetPlugin(kIsElecBackGround)) {
     
+    AliDebug(2, "Running BackGround Analysis");
+    
+    fElecBackGround->Reset();
+    
+  } // end of electron background analysis
+  //
+  // Loop ESD
+  //
+  AliDebug(3, Form("Number of Tracks: %d", fESD->GetNumberOfTracks()));
+  for(Int_t itrack = 0; itrack < fESD->GetNumberOfTracks(); itrack++){
+    AliDebug(4, "New ESD track");
     track = fESD->GetTrack(itrack);
-          
-    container[0] = track->Pt();
-    container[1] = track->Eta();
-    container[2] = track->Phi();
 
-    dataE[0] = track->Pt();
-    dataE[1] = track->Eta();
-    dataE[2] = track->Phi();
-    dataE[3] = -1;
-    dataE[4] = -1;
+    // fill counts of v0-identified particles
+    Int_t v0pid = -1;
+    if(track->TestBit(BIT(14))) v0pid = AliPID::kElectron;
+    else if(track->TestBit(BIT(15))) v0pid = AliPID::kPion;
+    else if(track->TestBit(BIT(16))) v0pid = AliPID::kProton;
+    // here the tagged track analysis will run
+    if(fTaggedTrackAnalysis && v0pid > -1){ 
+      AliDebug(1, Form("Track identified as %s", AliPID::ParticleName(v0pid)));
+      fTaggedTrackAnalysis->ProcessTrack(track, v0pid);
+    }
+    AliDebug(3, Form("Doing track %d, %p", itrack, track));
+     
+    //////////////////////////////////////
+    // preselect
+    /////////////////////////////////////
+    if(fPIDpreselect && fCutspreselect) {
+      if(!PreSelectTrack(track)) continue;
+    }
 
     signal = kTRUE;
-          
-    // RecKine: TPC cuts  
-    if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepRecKineTPC, track)) continue;
-    fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepRecKineTPC);
     
+    // Fill step without any cut
+          
+    if(HasMCData()){
+      // Check if it is electrons near the vertex
+      if(!(mctrack = dynamic_cast<AliMCParticle *>(fMCEvent->GetTrack(TMath::Abs(track->GetLabel()))))) continue;
+      mctrack4QA = mctrack->Particle();
 
-    // Check if it is signal electrons
-    if(!(mctrack = dynamic_cast<AliMCParticle *>(fMC->GetTrack(TMath::Abs(track->GetLabel()))))) continue;
+      if(fFillSignalOnly && !fCFM->CheckParticleCuts(AliHFEcuts::kStepMCGenerated, mctrack)) signal = kFALSE;
+      else AliDebug(3, "Signal Electron");
+    } 
+    // Cache new Track information inside the var manager
+    fVarManager->NewTrack(track, mctrack, fCentralityF, -1, signal);
 
-    container[3] = mctrack->Pt();
-    container[4] = mctrack->Eta();
-    container[5] = mctrack->Phi();
-    
-    if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepMCGenerated, mctrack)) signal = kFALSE;
-    
     if(signal) {
-      alreadyseen = cont.Find(TMath::Abs(track->GetLabel()));
-      cont.Append(TMath::Abs(track->GetLabel()));
-      
-      fCFM->GetParticleContainer()->Fill(container, (AliHFEcuts::kStepRecKineTPC + AliHFEcuts::kNcutESDSteps + 1));
-      fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepRecKineTPC + 2*(AliHFEcuts::kNcutESDSteps + 1)));
-      if(alreadyseen) {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepRecKineTPC + 4*(AliHFEcuts::kNcutESDSteps + 1)));
-      }
-      else {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepRecKineTPC + 3*(AliHFEcuts::kNcutESDSteps + 1)));
-      }
+      fVarManager->FillContainer(fContainer, "recTrackContReco", AliHFEcuts::kStepRecNoCut, kFALSE);
+      fVarManager->FillContainer(fContainer, "recTrackContMC", AliHFEcuts::kStepRecNoCut, kTRUE);
     }
 
+    // RecKine: ITSTPC cuts  
+    if(!ProcessCutStep(AliHFEcuts::kStepRecKineITSTPC, track)) continue;
     
-    // RecKine: ITS cuts
-    if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepRecKineITS, track)) continue;
-    fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepRecKineITS);
-    if(signal) {
-      fCFM->GetParticleContainer()->Fill(container, (AliHFEcuts::kStepRecKineITS + AliHFEcuts::kNcutESDSteps + 1));
-      fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepRecKineITS + 2*(AliHFEcuts::kNcutESDSteps + 1)));
-      if(alreadyseen) {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepRecKineITS + 4*(AliHFEcuts::kNcutESDSteps + 1)));
-      }
-      else {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepRecKineITS + 3*(AliHFEcuts::kNcutESDSteps + 1)));
-      }
-    }
-
-
     // Check TRD criterions (outside the correction framework)
     if(track->GetTRDncls()){
-      (dynamic_cast<TH1F *>(fQA->At(6)))->Fill(track->GetTRDchi2()/track->GetTRDncls());
-      (dynamic_cast<TH1F *>(fQA->At(1)))->Fill(track->GetAlpha());    // Check the acceptance without tight cuts
-      (dynamic_cast<TProfile *>(fQA->At(4)))->Fill(container[0], track->GetTRDpidQuality());
-      (dynamic_cast<TProfile *>(fQA->At(5)))->Fill(container[0], track->GetTRDncls());
+      fQACollection->Fill("chi2TRD", track->GetTRDchi2()/track->GetTRDncls());
+      fQACollection->Fill("alpha_rec", track->GetAlpha());
+      fQACollection->Fill("pidquality", container[0], track->GetTRDpidQuality());
+      fQACollection->Fill("ntrdclusters", container[0], track->GetTRDncls());
     }
 
     
     // RecPrim
-    if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepRecPrim, track)) continue;
-    fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepRecPrim);
-    if(signal) {
-      fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepRecPrim + AliHFEcuts::kNcutESDSteps + 1);
-      fCFM->GetParticleContainer()->Fill(&container[3], AliHFEcuts::kStepRecPrim + 2*(AliHFEcuts::kNcutESDSteps + 1));
-      if(alreadyseen) {
-        fCFM->GetParticleContainer()->Fill(&container[3], AliHFEcuts::kStepRecPrim + 4*(AliHFEcuts::kNcutESDSteps + 1));
-      }
-      else {
-        fCFM->GetParticleContainer()->Fill(&container[3], AliHFEcuts::kStepRecPrim + 3*(AliHFEcuts::kNcutESDSteps + 1));
-      }
-    }
-
+    if(!ProcessCutStep(AliHFEcuts::kStepRecPrim, track)) continue;
 
     // HFEcuts: ITS layers cuts
-    if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepHFEcutsITS, track)) continue;
-    fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepHFEcutsITS);
-    if(signal) {
-      fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepHFEcutsITS + AliHFEcuts::kNcutESDSteps + 1);
-      fCFM->GetParticleContainer()->Fill(&container[3], AliHFEcuts::kStepHFEcutsITS + 2*(AliHFEcuts::kNcutESDSteps + 1));
-      if(alreadyseen) {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepHFEcutsITS + 4*(AliHFEcuts::kNcutESDSteps + 1)));
-      }
-      else {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepHFEcutsITS + 3*(AliHFEcuts::kNcutESDSteps + 1)));
-      }
+    if(!ProcessCutStep(AliHFEcuts::kStepHFEcutsITS, track)) continue;
+
+    if(HasMCData() && IsQAOn(kMCqa)) {
+      // mc qa for after the reconstruction cuts  
+      AliDebug(2, "Running MC QA");
+      fMCQA->GetDecayedKine(mctrack4QA, AliHFEmcQA::kCharm,  AliHFEmcQA::kElectronPDG, 3);  // charm
+      fMCQA->GetDecayedKine(mctrack4QA, AliHFEmcQA::kBeauty,  AliHFEmcQA::kElectronPDG, 3); // beauty 
+      fMCQA->GetDecayedKine(mctrack4QA, AliHFEmcQA::kOthers,  AliHFEmcQA::kElectronPDG, 3); // beauty 
     }
 
-    // HFEcuts: TPC ratio clusters
-    if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepHFEcutsTPC, track)) continue;
-    fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepHFEcutsTPC);
-    if(signal) {
-      fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepHFEcutsTPC + AliHFEcuts::kNcutESDSteps + 1);
-      fCFM->GetParticleContainer()->Fill(&container[3], AliHFEcuts::kStepHFEcutsTPC + 2*(AliHFEcuts::kNcutESDSteps + 1));
-      if(alreadyseen) {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepHFEcutsTPC + 4*(AliHFEcuts::kNcutESDSteps + 1)));
-      }
-      else {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepHFEcutsTPC + 3*(AliHFEcuts::kNcutESDSteps + 1)));
-      }
-      // dimensions 3&4&5 : pt,eta,phi (MC)
-      ((THnSparseF *)fCorrelation->At(0))->Fill(container);
-    }
-    
     // HFEcuts: Nb of tracklets TRD0
-    if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepHFEcutsTRD, track)) continue;
-    fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepHFEcutsTRD);
-    if(signal) {
-      fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepHFEcutsTRD + AliHFEcuts::kNcutESDSteps + 1);
-      fCFM->GetParticleContainer()->Fill(&container[3], AliHFEcuts::kStepHFEcutsTRD + 2*(AliHFEcuts::kNcutESDSteps + 1));
-      if(alreadyseen) {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepHFEcutsTRD + 4*(AliHFEcuts::kNcutESDSteps + 1)));
-      }
-      else {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepHFEcutsTRD + 3*(AliHFEcuts::kNcutESDSteps + 1)));
-      }
-      // dimensions 3&4&5 : pt,eta,phi (MC)
-      ((THnSparseF *)fCorrelation->At(1))->Fill(container);
+    if(!ProcessCutStep(AliHFEcuts::kStepHFEcutsTRD, track)) continue;
+
+    if (HasMCData() && IsQAOn(kMCqa)) {
+      // mc qa for after the reconstruction and pid cuts  
+      AliDebug(2, "Running MC QA");
+      fMCQA->GetDecayedKine(mctrack4QA, AliHFEmcQA::kCharm,  AliHFEmcQA::kElectronPDG, 4);  // charm
+      fMCQA->GetDecayedKine(mctrack4QA, AliHFEmcQA::kBeauty,  AliHFEmcQA::kElectronPDG, 4); // beauty 
+      fMCQA->GetDecayedKine(mctrack4QA, AliHFEmcQA::kOthers,  AliHFEmcQA::kElectronPDG, 4); // beauty 
     }
 
+    if(HasMCData()){
+      FillProductionVertex(track);
+    }
 
     // track accepted, do PID
-    if(!fPID->IsSelected(track)) continue;
+    AliHFEpidObject hfetrack;
+    hfetrack.SetAnalysisType(AliHFEpidObject::kESDanalysis);
+    hfetrack.SetRecTrack(track);
+    if(HasMCData()) hfetrack.SetMCTrack(mctrack);
+    hfetrack.SetCentrality(fCentralityF);
+    fPID->SetVarManager(fVarManager);
+    if(!fPID->IsSelected(&hfetrack, fContainer, "recTrackCont", fPIDqa)) continue;
     nElectronCandidates++;
 
+    // Fill Histogram for Hadronic Background
+    if(HasMCData()){
+      if(mctrack && (TMath::Abs(mctrack->Particle()->GetPdgCode()) != 11))
+        fVarManager->FillContainer(fContainer, "hadronicBackground", UInt_t(0), kFALSE);
+    }
 
     // Fill Containers
-    fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepHFEcutsTRD + 1);
     if(signal) {
-      fCFM->GetParticleContainer()->Fill(container, AliHFEcuts::kStepHFEcutsTRD + AliHFEcuts::kNcutESDSteps + 2);
-      fCFM->GetParticleContainer()->Fill(&container[3], AliHFEcuts::kStepHFEcutsTRD + 2*(AliHFEcuts::kNcutESDSteps + 1)+1);
-      if(alreadyseen) {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepHFEcutsTRD + 1 + 4*(AliHFEcuts::kNcutESDSteps + 1)));
+      // Apply weight for background contamination
+      if(fBackGroundFactorsFunction) {
+       Double_t weightBackGround = fBackGroundFactorsFunction->Eval(TMath::Abs(track->P()));
+       if(weightBackGround < 0.0) weightBackGround = 0.0;
+        else if(weightBackGround > 1.0) weightBackGround = 1.0;
+        // weightBackGround as special weight
+        fVarManager->FillContainer(fContainer, "hadronicBackground", 1, kFALSE, weightBackGround);
       }
-      else {
-        fCFM->GetParticleContainer()->Fill(&container[3], (AliHFEcuts::kStepHFEcutsTRD + 1 + 3*(AliHFEcuts::kNcutESDSteps + 1)));
-      }
-      // dimensions 3&4&5 : pt,eta,phi (MC)
-      ((THnSparseF *)fCorrelation->At(2))->Fill(container);
+      fVarManager->FillCorrelationMatrix(fContainer->GetCorrelationMatrix("correlationstepafterPID"));
+    }
+
+    if(GetPlugin(kSecVtx)) {
+      AliDebug(2, "Running Secondary Vertex Analysis");
+      fSecVtx->Process(track);
     }
 
-    // Track selected: distinguish between true and fake
-    AliDebug(1, Form("Candidate Selected, filling THnSparse, PID: %d\n", mctrack->Particle()->GetPdgCode()));
-    if((pid = TMath::Abs(mctrack->Particle()->GetPdgCode())) == 11){
-      Int_t type = IsSignalElectron(track);
-      AliDebug(1, Form("Type: %d\n", type));
-      if(type){
-             dataE[4] = type; // beauty[1] or charm[2]
-             dataE[3] = 2;  // signal electron
+    if(HasMCData()){
+      dataE[0] = track->Pt();
+      dataE[1] = track->Eta();
+      dataE[2] = track->Phi();
+      dataE[3] = track->Charge();
+      dataE[4] = -1.;
+      dataE[5] = -1.;
+
+      // Track selected: distinguish between true and fake
+      AliDebug(1, Form("Candidate Selected, filling THnSparse, PID: %d\n", mctrack->Particle()->GetPdgCode()));
+      if((pid = TMath::Abs(mctrack->Particle()->GetPdgCode())) == 11){
+        Int_t type = 0;
+        if(fSignalCuts->IsCharmElectron(track))
+          type = 1;
+        else if(fSignalCuts->IsBeautyElectron(track))
+          type = 2;
+        AliDebug(1, Form("Type: %d\n", type));
+        if(type){
+               dataE[5] = type; // beauty[1] or charm[2]
+               dataE[4] = 2;  // signal electron
+        }
+        else{
+               dataE[4] = 1; // not a signal electron
+               dataE[5] = 0;
+        }
+      } 
+      else {
+        // Fill THnSparse with the information for Fake Electrons
+        dataE[4] = 0;
+        dataE[5] = 0;
       }
-      else{
-             dataE[3] = 1; // not a signal electron
-             dataE[4] = 0;
+      // fill the performance THnSparse, if the mc origin could be defined
+      if(dataE[4] > -1){
+        AliDebug(1, Form("Entries: [%.3f|%.3f|%.3f|%f|%f|%f]\n", dataE[0],dataE[1],dataE[2],dataE[3],dataE[4],dataE[5]));
+        fQACollection->Fill("PIDperformance", dataE);
       }
-      // pair analysis [mj]
-      if (IsSecVtxOn()) {
-        AliDebug(2, "Running Secondary Vertex Analysis");
-        fSecVtx->InitAnaPair();
-        for(Int_t jtrack = 0; jtrack < fESD->GetNumberOfTracks(); jtrack++){
-          htrack = fESD->GetTrack(jtrack);
-          if ( itrack == jtrack ) continue;
-          //if( fPID->IsSelected(htrack) && (itrack < jtrack)) continue;
-          if( abs(fSecVtx->GetMCPID(track)) == 11 && (itrack < jtrack)) continue;
-          fSecVtx->AnaPair(track, htrack, jtrack);
-        }
-        // based on the partner of e info, you run secandary vertexing function
-        fSecVtx->RunSECVTX(track);
-      } // end of pair analysis
-    } 
-    else {
-      // Fill THnSparse with the information for Fake Electrons
-      dataE[3] = 0;
-      dataE[4] = 0;
     }
-    // fill the performance THnSparse, if the mc origin could be defined
-    if(dataE[3] > -1){
-      AliDebug(1, Form("Entries: [%.3f|%.3f|%.3f|%f|%f]\n", dataE[0],dataE[1],dataE[2],dataE[3],dataE[4]));
-      fPIDperformance->Fill(dataE);
+    // Electron background analysis 
+    if (GetPlugin(kIsElecBackGround)) {
+      
+      AliDebug(2, "Running BackGround Analysis");
+      
+      for(Int_t jtrack = 0; jtrack < fESD->GetNumberOfTracks(); jtrack++){
+             htrack = fESD->GetTrack(jtrack);
+       if ( itrack == jtrack ) continue;  
+       fElecBackGround->PairAnalysis(track, htrack); 
+      }
+    } // end of electron background analysis
+
+    if (GetPlugin(kDEstep)) { 
+      // Fill Containers for impact parameter analysis
+      if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepHFEcutsDca + AliHFEcuts::kNcutStepsMCTrack + AliHFEcuts::kNcutStepsRecTrack,track)) continue;
+      if(signal) {
+        fVarManager->FillContainer(fContainer, "recTrackContDEReco", AliHFEcuts::kStepHFEcutsDca, kFALSE);
+        fVarManager->FillContainer(fContainer, "recTrackContDEMC", AliHFEcuts::kStepHFEcutsDca, kTRUE);
+        fVarManager->FillCorrelationMatrix(fContainer->GetCorrelationMatrix("correlationstepafterDE"));
+      }
+      if(HasMCData()){
+        if(mctrack && (TMath::Abs(mctrack->Particle()->GetPdgCode()) != 11))
+          fVarManager->FillContainer(fContainer, "hadronicBackground", 2, kFALSE);
+      }
     }
+
   }
-  
-  fNEvents->Fill(1);
-  fNElectronTracksEvent->Fill(nElectronCandidates);
-  
-  // Done!!!
-  PostData(0, fNEvents);
-  PostData(1, fOutput);
-  PostData(2, fQA);
+  fQACollection->Fill("nElectronTracksEvent", nElectronCandidates);
 }
 
 //____________________________________________________________
-void AliAnalysisTaskHFE::Terminate(Option_t *){
+void AliAnalysisTaskHFE::ProcessAOD(){
   //
-  // Terminate not implemented at the moment
+  // Run Analysis in AOD Mode
+  // Function is still in development
   //
-  if(IsRunningPostProcess()){
-    fOutput = dynamic_cast<TList *>(GetOutputData(1));
-    if(!fOutput){
-      AliError("Results not available");
+  AliDebug(3, "Processing AOD Event");
+  Double_t eventContainer[2];
+  eventContainer[0] = fInputEvent->GetPrimaryVertex()->GetZ();
+  eventContainer[1] = 1.; // No Information available in AOD analysis, assume all events have V0AND
+
+  AliAODEvent *fAOD = dynamic_cast<AliAODEvent *>(fInputEvent);
+  if(!fAOD){
+    AliError("AOD Event required for AOD Analysis")
       return;
+  }
+  
+  //
+  fCFM->GetEventContainer()->Fill(eventContainer, AliHFEcuts::kEventStepRecNoCut);
+
+  //
+  if(fIdentifiedAsPileUp) return; 
+  fCFM->GetEventContainer()->Fill(eventContainer, AliHFEcuts::kEventStepRecNoPileUp);
+
+  //
+  if(fIdentifiedAsOutInz) return;
+  fCFM->GetEventContainer()->Fill(eventContainer, AliHFEcuts::kEventStepZRange);  
+
+  //
+  if(!fPassTheEventCut) return;
+  fCFM->GetEventContainer()->Fill(eventContainer, AliHFEcuts::kEventStepReconstructed);
+
+  fContainer->NewEvent();
+  AliAODTrack *track = NULL;
+  AliAODMCParticle *mctrack = NULL;
+  Double_t dataE[6]; // [pT, eta, Phi, Charge, type, 'C' or 'B']
+  Int_t nElectronCandidates = 0;
+  Int_t pid;
+  Bool_t signal;
+  for(Int_t itrack = 0; itrack < fAOD->GetNumberOfTracks(); itrack++){
+    track = fAOD->GetTrack(itrack);
+    if(!track) continue;
+    if(track->GetFlags() != 1<<4) continue;  // Only process AOD tracks where the HFE is set
+
+    signal = kTRUE;
+    if(HasMCData()){
+
+      Int_t label = TMath::Abs(track->GetLabel());
+      if(label)
+        mctrack = dynamic_cast<AliAODMCParticle *>(fMCEvent->GetTrack(label));
+        if(fFillSignalOnly && !fCFM->CheckParticleCuts(AliHFEcuts::kStepMCGenerated, mctrack)) signal = kFALSE;
+    }
+    fVarManager->NewTrack(track, mctrack, fCentralityF, -1, kTRUE);
+    // track accepted, do PID
+    AliHFEpidObject hfetrack;
+    hfetrack.SetAnalysisType(AliHFEpidObject::kAODanalysis);
+    hfetrack.SetRecTrack(track);
+    if(HasMCData()) hfetrack.SetMCTrack(mctrack);
+    hfetrack.SetCentrality(fCentralityF);
+    fPID->SetVarManager(fVarManager);
+    if(!fPID->IsSelected(&hfetrack, fContainer, "recTrackCont", fPIDqa)) continue;    // we will do PID here as soon as possible
+    // Apply weight for background contamination
+    Double_t weightBackGround = 1.0;
+    if(fBackGroundFactorsFunction) {
+      weightBackGround = fBackGroundFactorsFunction->Eval(TMath::Abs(track->P()));
+      if(weightBackGround < 0.0) weightBackGround = 0.0;
+    }
+    fVarManager->FillContainer(fContainer, "hadronicBackground", 1, kFALSE);
+    nElectronCandidates++;    
+    if(HasMCData()){
+      dataE[0] = track->Pt();
+      dataE[1] = track->Eta();
+      dataE[2] = track->Phi();
+      dataE[3] = track->Charge();
+      dataE[4] = -1;
+      dataE[5] = -1;
+     // Track selected: distinguish between true and fake
+      AliDebug(1, Form("Candidate Selected, filling THnSparse, PID: %d\n", mctrack->GetPdgCode()));
+      if((pid = TMath::Abs(mctrack->GetPdgCode())) == 11){
+      
+        Int_t type = 0;
+        if(fSignalCuts->IsCharmElectron(track))
+          type = 1;
+        else if(fSignalCuts->IsBeautyElectron(track))
+          type = 2;
+        AliDebug(1, Form("Type: %d\n", type));
+        if(type){
+               dataE[5] = type; // beauty[1] or charm[2]
+               dataE[4] = 2;  // signal electron
+        }
+        else{
+               dataE[4] = 1; // not a signal electron
+               dataE[5] = 0;
+        }
+      } 
+      else {
+        // Fill THnSparse with the information for Fake Electrons
+        dataE[4] = 0;
+        dataE[5] = 0;
+      }
+      // fill the performance THnSparse, if the mc origin could be defined
+      if(dataE[4] > -1){
+        AliDebug(1, Form("Entries: [%.3f|%.3f|%.3f|%f|%f|%f]\n", dataE[0],dataE[1],dataE[2],dataE[3],dataE[4],dataE[5]));
+        fQACollection->Fill("PIDperformance", dataE);
+      }
     }
-    PostProcess();
   }
+  fQACollection->Fill("nElectronTracksEvent", nElectronCandidates);
 }
 
 //____________________________________________________________
-void AliAnalysisTaskHFE::Load(TString filename){
+Bool_t AliAnalysisTaskHFE::ProcessMCtrack(AliVParticle *track){
   //
-  // Load Results into the task
+  // Filter the Monte Carlo Track
+  // Additionally Fill a THnSparse for Signal To Background Studies
+  // Works for AOD and MC analysis Type
   //
-  fQA = NULL; fOutput = NULL; fNEvents = NULL;
-  TFile *input = TFile::Open(filename.Data());
-  if(!input || input->IsZombie()){
-    AliError("Cannot read file");
-    return;
+  fVarManager->NewTrack(track, NULL, -1, kTRUE);
+  Double_t signalContainer[6];
+
+  signalContainer[0] = track->Pt();
+  signalContainer[1] = track->Eta();
+  signalContainer[2] = track->Phi();
+  signalContainer[3] = track->Charge()/3;
+
+ Double_t vertex[3]; // Production vertex cut to mask gammas which are NOT supposed to have hits in the first ITS layer(s)
+  if(IsESDanalysis()){
+    AliMCParticle *mctrack = dynamic_cast<AliMCParticle *>(track);
+    vertex[0] = mctrack->Particle()->Vx();
+    vertex[1] = mctrack->Particle()->Vy();
+  } else {
+    AliAODMCParticle *aodmctrack = dynamic_cast<AliAODMCParticle *>(track);
+    aodmctrack->XvYvZv(vertex);
+  }
+
+  if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepMCGenerated, track)) return kFALSE;
+  fQACollection->Fill("mccharge", signalContainer[3]);
+  fVarManager->FillContainer(fContainer, "MCTrackCont", AliHFEcuts::kStepMCGenerated, kFALSE);
+  signalContainer[4] = 0;
+  if(fSignalCuts->IsSelected(track)){
+    //fVarManager->FillContainer(fContainer, "MCTrackCont", AliHFEcuts::kStepMCsignal, kFALSE);
+    // Filling of the Signal/Background histogram using the 
+    // definition of the codes for charm and beauty as below in
+    // th crearion of the histogram
+    if(fSignalCuts->IsCharmElectron(track))
+      signalContainer[4] = 1;
+    else 
+      signalContainer[4] = 2;
+  } else {
+    signalContainer[4] = 0; // (and other background)
+  }
+  signalContainer[5] = 0;
+  // apply cut on the sqrt of the production vertex
+  Double_t radVertex = TMath::Sqrt(vertex[0]*vertex[0] + vertex[1] * vertex[1]);
+  if(radVertex < 3.5){
+    // Within first ITS layer(2) -> Background we cannot reject by ITS cut, let it pass
+    signalContainer[5] = 1;
+  } else if (radVertex < 7.5){
+    signalContainer[5] = 2;
   }
-  TH1 *htmp = dynamic_cast<TH1I *>(input->Get("nEvents"));
-  if(htmp)
-    fNEvents = dynamic_cast<TH1I *>(htmp->Clone());
-  else
-    AliError("Event Counter histogram not found"); 
-  TList *ltmp = dynamic_cast<TList *>(input->Get("Results"));
-  if(ltmp)
-    fOutput = dynamic_cast<TList *>(ltmp->Clone());
-  else
-    AliError("Output Histograms not found");
-  ltmp = dynamic_cast<TList *>(input->Get("QA"));
-  if(ltmp)
-    fQA = dynamic_cast<TList *>(ltmp->Clone());
-  else
-    AliError("QA histograms not found");
-  input->Close();
-  delete input;
-  Int_t nObjects = 0;
-  if(fNEvents) nObjects++;  
-  if(fOutput) nObjects++;
-  if(fQA) nObjects++;
-  AliInfo(Form("Loaded %d Objects into task", nObjects));
+  fQACollection->Fill("SignalToBackgroundMC", signalContainer);
+  fQACollection->Fill("alpha_sim", track->Phi() - TMath::Pi());
+
+  // Step GeneratedZOutNoPileUp
+  if((fIdentifiedAsPileUp) || (fIdentifiedAsOutInz)) return kFALSE;
+  fVarManager->FillContainer(fContainer, "MCTrackCont", AliHFEcuts::kStepMCGeneratedZOutNoPileUp, kFALSE);
+
+  // Step Generated Event Cut
+  if(!fPassTheEventCut) return kFALSE;
+  fVarManager->FillContainer(fContainer, "MCTrackCont", AliHFEcuts::kStepMCGeneratedEventCut, kFALSE);
+
+  if(!fCFM->CheckParticleCuts(AliHFEcuts::kStepMCInAcceptance, track)) return kFALSE;
+  fVarManager->FillContainer(fContainer, "MCTrackCont", AliHFEcuts::kStepMCInAcceptance, kFALSE);
+  return kTRUE;
 }
 
 //____________________________________________________________
-void AliAnalysisTaskHFE::PostProcess(){
-  //
-  // Plotting Ratio histograms
-  // + All electrons / all candidates (Purity for Electrons)
-  // + All signal electrons / all electrons (Purity for signals)
-  // For this the following pt-histograms have to be projected from the THnSparse
-  // + All Electron candidates
-  // + All Real electrons
-  // + All Signal Electrons
-  // + All misidentified electrons
-  //
-  fPIDperformance = dynamic_cast<THnSparseF *>(fOutput->FindObject("PIDperformance"));
-  if(!fPIDperformance){
-    AliError("PID Performance histogram not found in the output container");
-    return;
-  }
+Bool_t AliAnalysisTaskHFE::PreSelectTrack(AliESDtrack *track) const {
+  //
+  // Preselect tracks
+  //
   
-  // Make projection
-  // always project to pt dimension
-  // get the histograms under our control
-  TH1 *allCandidates = NULL, *allElectrons = NULL, *allSignals = NULL, *allFakes = NULL;
-  allCandidates = fPIDperformance->Projection(0);
-  allCandidates->SetName("hAllCandidates");
-  allCandidates->SetTitle("All Candidates");
-  Int_t firstDim3 = fPIDperformance->GetAxis(3)->GetFirst(), lastDim3 = fPIDperformance->GetAxis(3)->GetLast();
-  fPIDperformance->GetAxis(3)->SetRange(firstDim3 + 1, lastDim3);
-  allElectrons = fPIDperformance->Projection(0);
-  allElectrons->SetName("hAllElectrons");
-  allElectrons->SetTitle("All Electrons");
-  Int_t firstDim4 = fPIDperformance->GetAxis(4)->GetFirst(), lastDim4 = fPIDperformance->GetAxis(4)->GetLast();
-  fPIDperformance->GetAxis(4)->SetRange(firstDim4 + 1, lastDim4);
-  allSignals = fPIDperformance->Projection(0);
-  allSignals->SetName("hAllSignals");
-  allSignals->SetTitle("All Signal Electrons");
-  fPIDperformance->GetAxis(4)->SetRange(firstDim4, lastDim4);       // Reset 4th axis
-  fPIDperformance->GetAxis(3)->SetRange(firstDim3, firstDim3 + 1);  // Select fakes
-  allFakes = fPIDperformance->Projection(0);
-  allFakes->SetName("hAllFakes");
-  allFakes->SetTitle("All Fakes");
-  fPIDperformance->GetAxis(3)->SetRange(firstDim3, lastDim3);       // Reset also 3rd axis
-
-  // Make Ratios
-  TH1D *electronPurity = dynamic_cast<TH1D *>(allElectrons->Clone());
-  electronPurity->Divide(allCandidates);
-  electronPurity->SetName("electronPurity");
-  electronPurity->SetTitle("Electron Purity");
-  electronPurity->GetXaxis()->SetTitle("p_T / GeV/c");
-  electronPurity->GetYaxis()->SetTitle("Purity / %");
-  TH1D *signalPurity = dynamic_cast<TH1D *>(allSignals->Clone());
-  signalPurity->Divide(allElectrons);
-  signalPurity->SetName("signalPurity");
-  signalPurity->SetTitle("Purity of Electrons coming from Heavy flavours");
-  signalPurity->GetXaxis()->SetTitle("p_T / GeV/c");
-  signalPurity->GetYaxis()->SetTitle("Purity / %");
-  TH1D *fakeContamination = dynamic_cast<TH1D *>(allFakes->Clone());
-  fakeContamination->Divide(allCandidates);
-  fakeContamination->SetName("fakeContamination");
-  fakeContamination->SetTitle("Contamination of misidentified hadrons");
-  fakeContamination->GetXaxis()->SetTitle("p_T / GeV/c");
-  fakeContamination->GetYaxis()->SetTitle("Purity / %");
+
+  Bool_t survived = kTRUE;
+  
+  if(!fCutspreselect->CheckParticleCuts(AliHFEcuts::kStepRecKineITSTPC, track)) {
+    survived = kFALSE;
+    //printf("Did not pass AliHFEcuts::kStepRecKineITSTPC\n");
+  }
+  //else printf("Pass AliHFEcuts::kStepRecKineITSTPC\n");
+  if(!fCutspreselect->CheckParticleCuts(AliHFEcuts::kStepRecPrim, track)) {
+    survived = kFALSE;
+    //printf("Did not pass AliHFEcuts::kStepRecPrim\n");
+  }
+  //else printf("Pass AliHFEcuts::kStepRecPrim\n");
+  if(!fCutspreselect->CheckParticleCuts(AliHFEcuts::kStepHFEcutsITS, track)) {
+    survived = kFALSE;
+    //printf("Did not pass AliHFEcuts::kStepHFEcutsITS\n");
+  }
+  //else printf("Pass AliHFEcuts::kStepHFEcutsITS\n");
+  if(!fCutspreselect->CheckParticleCuts(AliHFEcuts::kStepHFEcutsTRD, track)) {
+    survived = kFALSE;
+    //printf("Did not pass AliHFEcuts::kStepHFEcutsTRD\n");
+  }
+  //else printf("Pass AliHFEcuts::kStepHFEcutsTRD\n");
   
-  // Draw output
-  TCanvas *cSpectra = new TCanvas("cSpectra","pt Spectra", 800, 600);
-  cSpectra->Divide(2,2);
-  TCanvas *cRatios = new TCanvas("cRatios", "Ratio Plots", 800, 600);
-  cRatios->Divide(2,2);
-  cSpectra->cd(1);
-  allCandidates->Draw();
-  cSpectra->cd(2);
-  allElectrons->Draw();
-  cSpectra->cd(3);
-  allSignals->Draw();
-  cSpectra->cd(4);
-  allFakes->Draw();
-  cRatios->cd(1);
-  electronPurity->Draw();
-  cRatios->cd(2);
-  signalPurity->Draw();
-  cRatios->cd(3);
-  fakeContamination->Draw();
-
-  // cleanup
-  //delete allCandidates; delete allElectrons; delete allSignals; delete allFakes;
-  //delete electronPurity; delete signalPurity; delete fakeContamination;
+  if(survived){
+    // Apply PID
+    AliHFEpidObject hfetrack;
+    hfetrack.SetAnalysisType(AliHFEpidObject::kESDanalysis);
+    hfetrack.SetRecTrack(track);
+    if(!fPIDpreselect->IsSelected(&hfetrack)) {
+      //printf("Did not pass AliHFEcuts::kPID\n");
+      survived = kFALSE;
+    }
+    //else printf("Pass AliHFEcuts::kPID\n");
+  }
+
+  return survived; 
+      
+}
+//____________________________________________________________
+void AliAnalysisTaskHFE::MakeEventContainer(){
+  //
+  // Create the event container for the correction framework and link it
+  // 1st bin: Vertex z-position
+  // 2nd bin: V0AND decision (normalization to sigma_inel)
+  // 3rd bin: Centrality class (for pp defined as 99.)
+  //
+  const Int_t kNvar = 3;  // number of variables on the grid: 
+  Int_t nBins[kNvar] = {120, 2, 20};
+  Double_t binMin[kNvar] = {-30. , 0., 0.};
+  Double_t binMax[kNvar] = {30., 2., 100};
+
+  AliCFContainer *evCont = new AliCFContainer("eventContainer", "Container for events", AliHFEcuts::kNcutStepsEvent, kNvar, nBins);
+
+  Double_t *vertexBins = AliHFEtools::MakeLinearBinning(nBins[0], binMin[0], binMax[0]);
+  Double_t *v0andBins = AliHFEtools::MakeLinearBinning(nBins[1], binMin[1], binMax[1]);
+  evCont->SetBinLimits(0, vertexBins);
+  evCont->SetBinLimits(1, v0andBins);
+  delete[] vertexBins; delete[] v0andBins;
+
+  fCFM->SetEventContainer(evCont);
 }
 
 //____________________________________________________________
@@ -748,188 +1150,229 @@ void AliAnalysisTaskHFE::MakeParticleContainer(){
   // Create the particle container for the correction framework manager and 
   // link it
   //
-  const Int_t kNvar   = 3 ; //number of variables on the grid:pt,eta, phi
-  const Double_t kPtmin = 0.1, kPtmax = 10.;
-  const Double_t kEtamin = -0.9, kEtamax = 0.9;
-  const Double_t kPhimin = 0., kPhimax = 2. * TMath::Pi();
-
-  //arrays for the number of bins in each dimension
-  Int_t iBin[kNvar];
-  iBin[0] = 40; //bins in pt
-  iBin[1] =  8; //bins in eta 
-  iBin[2] = 18; // bins in phi
-
-  //arrays for lower bounds :
-  Double_t* binEdges[kNvar];
-  for(Int_t ivar = 0; ivar < kNvar; ivar++)
-    binEdges[ivar] = new Double_t[iBin[ivar] + 1];
-
-  //values for bin lower bounds
-  for(Int_t i=0; i<=iBin[0]; i++) binEdges[0][i]=(Double_t)TMath::Power(10,TMath::Log10(kPtmin) + (TMath::Log10(kPtmax)-TMath::Log10(kPtmin))/iBin[0]*(Double_t)i);  
-  for(Int_t i=0; i<=iBin[1]; i++) binEdges[1][i]=(Double_t)kEtamin  + (kEtamax-kEtamin)/iBin[1]*(Double_t)i;
-  for(Int_t i=0; i<=iBin[2]; i++) binEdges[2][i]=(Double_t)kPhimin  + (kPhimax-kPhimin)/iBin[2]*(Double_t)i;
-
-  //one "container" for MC
-  AliCFContainer* container = new AliCFContainer("container","container for tracks", (AliHFEcuts::kNcutSteps + 1 + 4*(AliHFEcuts::kNcutESDSteps + 1)), kNvar, iBin);
-
-  //setting the bin limits
-  for(Int_t ivar = 0; ivar < kNvar; ivar++)
-    container -> SetBinLimits(ivar, binEdges[ivar]);
-  fCFM->SetParticleContainer(container);
-
-  //create correlation matrix for unfolding
-  Int_t thnDim[2*kNvar];
-  for (int k=0; k<kNvar; k++) {
-    //first half  : reconstructed 
-    //second half : MC
-    thnDim[k]      = iBin[k];
-    thnDim[k+kNvar] = iBin[k];
-  }
-
-  if(!fCorrelation) fCorrelation = new TList();
-  fCorrelation->SetName("correlation");
-
-  THnSparseF *correlation0 = new THnSparseF("correlationstep13","THnSparse with correlations",2*kNvar,thnDim);
-  THnSparseF *correlation1 = new THnSparseF("correlationstep14","THnSparse with correlations",2*kNvar,thnDim);
-  THnSparseF *correlation2 = new THnSparseF("correlationstep15","THnSparse with correlations",2*kNvar,thnDim);
-  for (int k=0; k<kNvar; k++) {
-    correlation0->SetBinEdges(k,binEdges[k]);
-    correlation0->SetBinEdges(k+kNvar,binEdges[k]);
-    correlation1->SetBinEdges(k,binEdges[k]);
-    correlation1->SetBinEdges(k+kNvar,binEdges[k]);
-    correlation2->SetBinEdges(k,binEdges[k]);
-    correlation2->SetBinEdges(k+kNvar,binEdges[k]);
-  }
-  correlation0->Sumw2();
-  correlation1->Sumw2();
-  correlation2->Sumw2();
-
-  fCorrelation->AddAt(correlation0,0);
-  fCorrelation->AddAt(correlation1,1);
-  fCorrelation->AddAt(correlation2,2);
   
+  if(!fContainer) fContainer = new AliHFEcontainer("trackContainer");
+  fVarManager->DefineVariables(fContainer);
 
-  // Add a histogram for Fake electrons
-  const Int_t nDim=5;
-  Int_t nBin[nDim] = {40, 8, 18, 3, 3};
-  Double_t* binEdges2[nDim];
-  for(Int_t ivar = 0; ivar < nDim; ivar++)
-    binEdges2[ivar] = new Double_t[nBin[ivar] + 1];
-
-  //values for bin lower bounds
-  for(Int_t i=0; i<=nBin[0]; i++) binEdges2[0][i]=(Double_t)TMath::Power(10,TMath::Log10(kPtmin) + (TMath::Log10(kPtmax)-TMath::Log10(kPtmin))/nBin[0]*(Double_t)i);  
-  for(Int_t i=0; i<=nBin[1]; i++) binEdges2[1][i]=(Double_t)kEtamin  + (kEtamax-kEtamin)/nBin[1]*(Double_t)i;
-  for(Int_t i=0; i<=nBin[2]; i++) binEdges2[2][i]=(Double_t)kPhimin  + (kPhimax-kPhimin)/nBin[2]*(Double_t)i;
-  for(Int_t i=0; i<=nBin[3]; i++) binEdges2[3][i] = i;
-  for(Int_t i=0; i<=nBin[4]; i++) binEdges2[4][i] = i;
-
-  fPIDperformance = new THnSparseF("PIDperformance", "PID performance; pT [GeV/c]; theta [rad]; phi [rad] type (0 - not el, 1 - other el, 2 - HF el; flavor (0 - no, 1 - charm, 2 - bottom)", nDim, nBin);
-  for(Int_t idim = 0; idim < nDim; idim++)
-    fPIDperformance->SetBinEdges(idim, binEdges2[idim]);
+  // Create Correction Framework containers
+  fContainer->CreateContainer("MCTrackCont", "Track Container filled with MC information", AliHFEcuts::kNcutStepsMCTrack);
+  fContainer->CreateContainer("recTrackContReco", "Track Container filled with MC information", AliHFEcuts::kNcutStepsRecTrack + fPID->GetNumberOfPIDdetectors());
+  fContainer->CreateContainer("recTrackContMC", "Track Container filled with MC information", AliHFEcuts::kNcutStepsRecTrack + fPID->GetNumberOfPIDdetectors());
+  
+  fContainer->CreateContainer("hadronicBackground", "Container for Hadronic Background", 3);
+  fContainer->CreateContainer("recTrackContDEReco", "Container for displaced electron analysis with Reco information", 1);
+  fContainer->CreateContainer("recTrackContDEMC", "Container for displaced electron analysis with MC information", 1);
+  fContainer->CreateCorrelationMatrix("correlationstepafterPID","THnSparse with correlations");
+  fContainer->CreateCorrelationMatrix("correlationstepafterDE","THnSparse with correlations");
+
+  // Define the step names
+  for(UInt_t istep = 0; istep < AliHFEcuts::kNcutStepsMCTrack; istep++){
+    fContainer->SetStepTitle("MCTrackCont", AliHFEcuts::MCCutName(istep), istep);
+  }
+  for(UInt_t istep = 0; istep < AliHFEcuts::kNcutStepsRecTrack; istep++){
+    fContainer->SetStepTitle("recTrackContReco", AliHFEcuts::RecoCutName(istep), istep);
+    fContainer->SetStepTitle("recTrackContMC", AliHFEcuts::RecoCutName(istep), istep);
+  }
+  for(UInt_t ipid = 0; ipid < fPID->GetNumberOfPIDdetectors(); ipid++){
+    fContainer->SetStepTitle("recTrackContReco", fPID->SortedDetectorName(ipid), AliHFEcuts::kNcutStepsRecTrack + ipid);
+    fContainer->SetStepTitle("recTrackContMC", fPID->SortedDetectorName(ipid), AliHFEcuts::kNcutStepsRecTrack + ipid);
+  }
 }
 
-void AliAnalysisTaskHFE::AddPIDdetector(Char_t *detector){
-  if(!fPIDdetectors.Length()) 
-    fPIDdetectors = detector;
-  else
-    fPIDdetectors += Form(":%s", detector);
+//____________________________________________________________
+void AliAnalysisTaskHFE::InitPIDperformanceQA(){
+  // Add a histogram for Fake electrons
+  const Int_t nDim=6;
+  Int_t nBin[nDim] = {40, 8, 18, 2, 3, 3};
+  //number of variables on the grid:pt,eta,phi,charge,
+  const Double_t kPtbound[2] = {0.1, 20.};
+  const Double_t kEtabound[2] = {-0.8, 0.8};
+  const Double_t kPhibound[2] = {0., 2. * TMath::Pi()}; 
+  const Double_t kChargebound[2] = {-1.1, 1.1};
+  const Double_t kAddInf1bound[2] = {0., 3.};
+  const Double_t kAddInf2bound[2] = {0., 3.};
+  Double_t minima[nDim] = {kPtbound[0], kEtabound[0], kPhibound[0], kChargebound[0], kAddInf1bound[0], kAddInf2bound[0]}; 
+  Double_t maxima[nDim] = {kPtbound[1], kEtabound[1], kPhibound[1], kChargebound[1], kAddInf1bound[1], kAddInf2bound[1]}; 
+  
+  fQACollection->CreateTHnSparse("PIDperformance", "PID performance; pT [GeV/c]; theta [rad]; phi [rad]; charge; type (0 - not el, 1 - other el, 2 - HF el; flavor (0 - no, 1 - charm, 2 - bottom)", nDim, nBin, minima, maxima);
+  fQACollection->CreateTHnSparse("SignalToBackgroundMC", "PID performance; pT [GeV/c]; theta [rad]; phi [rad]; charge; flavor (0 - no, 1 - charm, 2 - bottom); ITS Cluster (0 - no, 1 - first (and maybe second), 2 - second)", nDim, nBin, minima, maxima);
+
+  fQACollection->BinLogAxis("PIDperformance", 0);
+  fQACollection->BinLogAxis("SignalToBackgroundMC", 0);
+  fQACollection->Sumw2("PIDperformance");
+  fQACollection->Sumw2("SignalToBackgroundMC");
 }
 
 //____________________________________________________________
-void AliAnalysisTaskHFE::PrintStatus(){
+void AliAnalysisTaskHFE::PrintStatus() const {
   //
   // Print Analysis status
   //
   printf("\n\tAnalysis Settings\n\t========================================\n\n");
-  printf("\tSecondary Vertex finding: %s\n", IsSecVtxOn() ? "YES" : "NO");
-  printf("\tPrimary Vertex resolution: %s\n", IsPriVtxOn() ? "YES" : "NO");
+  printf("\tSecondary Vertex finding: %s\n", GetPlugin(kSecVtx) ? "YES" : "NO");
+  printf("\tPrimary Vertex resolution: %s\n", GetPlugin(kPriVtx) ? "YES" : "NO");
+  printf("\tDisplaced electron analysis step: %s\n", GetPlugin(kDEstep) ? "YES" : "NO");
+  printf("\tTagged Track Analysis: %s\n", GetPlugin(kTaggedTrackAnalysis) ? "YES" : "NO");
   printf("\n");
   printf("\tParticle Identification Detectors:\n");
-  TObjArray *detectors = fPIDdetectors.Tokenize(":");
-  for(Int_t idet = 0; idet < detectors->GetEntries(); idet++)
-    printf("\t\t%s\n", (dynamic_cast<TObjString *>(detectors->At(idet)))->String().Data());
+  fPID->PrintStatus();
   printf("\n");
   printf("\tQA: \n");
   printf("\t\tPID: %s\n", IsQAOn(kPIDqa) ? "YES" :  "NO");
-  printf("\t\tCUTS: %s\n", IsQAOn(kCUTqa) ? "YES" : "NO");
+  printf("\t\tCUTS: %s\n", (fCuts != NULL && fCuts->IsQAOn()) ? "YES" : "NO");
   printf("\t\tMC: %s\n", IsQAOn(kMCqa) ? "YES" : "NO");
   printf("\n");
 }
 
 //____________________________________________________________
-AliAnalysisTaskHFE::LabelContainer::LabelContainer(Int_t capacity):
-  fContainer(NULL),
-  fBegin(NULL),
-  fEnd(NULL),
-  fLast(NULL),
-  fCurrent(NULL)
-{
+Bool_t AliAnalysisTaskHFE::FillProductionVertex(const AliVParticle * const track) const{
   //
-  // Default constructor
+  // Find the production vertex of the associated MC track
   //
-  fContainer = new Int_t[capacity];
-  fBegin = &fContainer[0];
-  fEnd = &fContainer[capacity - 1];
-  fLast = fCurrent = fBegin;
-}
+  if(!fMCEvent) return kFALSE;
+  const AliVParticle *mctrack = NULL;
+  TString objectType = track->IsA()->GetName();
+  if(objectType.CompareTo("AliESDtrack") == 0 || objectType.CompareTo("AliAODTrack") == 0){
+    // Reconstructed track
+    mctrack = fMCEvent->GetTrack(TMath::Abs(track->GetLabel()));
+  } else {
+    // MCParticle
+    mctrack = track;
+  }
+
+  if(!mctrack) return kFALSE;
+
+  Double_t xv = 0.0;
+  Double_t yv = 0.0;
+  if(TString(mctrack->IsA()->GetName()).CompareTo("AliMCParticle") == 0){
+    // case MCParticle
+    xv =  (dynamic_cast<const AliMCParticle *>(mctrack)->Xv());
+    yv =  (dynamic_cast<const AliMCParticle *>(mctrack)->Yv());
+       
+  } else {
+    // case AODMCParticle
+    xv =  (dynamic_cast<const AliAODMCParticle *>(mctrack)->Xv());
+    yv =  (dynamic_cast<const AliAODMCParticle *>(mctrack)->Yv());
+  }
+
+  //printf("xv %f, yv %f\n",xv,yv);
+  fQACollection->Fill("radius", TMath::Abs(xv),TMath::Abs(yv));
 
-//____________________________________________________________
-Bool_t AliAnalysisTaskHFE::LabelContainer::Append(Int_t label){
-  //
-  // Add Label to the container
-  //
-  if(fLast > fEnd) return kFALSE;
-  *fLast++ = label;
   return kTRUE;
-}
 
-//____________________________________________________________
-Bool_t AliAnalysisTaskHFE::LabelContainer::Find(Int_t label){
+}
+//__________________________________________
+void AliAnalysisTaskHFE::SwitchOnPlugin(Int_t plug){
   //
-  // Find track in the list of labels
+  // Switch on Plugin
+  // Available:
+  //  - Primary vertex studies
+  //  - Secondary vertex Studies
+  //  - Post Processing
   //
-  for(Int_t *entry = fBegin; entry <= fLast; entry++) 
-    if(*entry == label) return kTRUE;
-  return kFALSE;
+  switch(plug){
+    case kPriVtx: SETBIT(fPlugins, plug); break;
+    case kSecVtx: SETBIT(fPlugins, plug); break;
+    case kIsElecBackGround: SETBIT(fPlugins, plug); break;
+    case kPostProcess: SETBIT(fPlugins, plug); break;
+    case kDEstep: SETBIT(fPlugins, plug); break;
+    case kTaggedTrackAnalysis: SETBIT(fPlugins, plug); break;
+    default: AliError("Unknown Plugin");
+  };
 }
-
-//____________________________________________________________
-Int_t AliAnalysisTaskHFE::LabelContainer::Next(){
+//__________________________________________
+Bool_t AliAnalysisTaskHFE::ProcessCutStep(Int_t cutStep, AliVParticle *track){
   //
-  // Mimic iterator
+  // Check single track cuts for a given cut step
+  // Fill the particle container
   //
-  if(fCurrent > fLast) return -1; 
-  return *fCurrent++;
+  const Int_t kMCOffset = AliHFEcuts::kNcutStepsMCTrack;
+  if(!fCFM->CheckParticleCuts(cutStep + kMCOffset, track)) return kFALSE;
+  if(fVarManager->IsSignalTrack()) {
+    fVarManager->FillContainer(fContainer, "recTrackContReco", cutStep, kFALSE);
+    fVarManager->FillContainer(fContainer, "recTrackContMC", cutStep, kTRUE);
+  }
+  return kTRUE;
 }
+//___________________________________________________
+void AliAnalysisTaskHFE::ReadCentrality() {
+  //
+  // Recover the centrality of the event from ESD or AOD
+  //
+ if(IsAODanalysis()){
+
+   AliAODEvent *fAOD = dynamic_cast<AliAODEvent *>(fInputEvent);
+   if(!fAOD){
+     AliError("AOD Event required for AOD Analysis")
+       return;
+   }
+   // Centrality
+   //AliAODCentrality *aodCentrality = fAOD->GetCentrality();
+   //Double_t fCentralityF = aodCentrality->GetCentralityPercentile("V0M");
+   fCentralityF = 99.0; // Fake for the moment
+   
+   
+ } else {
+   
+   AliDebug(3, "Processing ESD Centrality");
+   AliESDEvent *fESD = dynamic_cast<AliESDEvent *>(fInputEvent);
+   if(!fESD){
+     AliError("ESD Event required for ESD Analysis")
+       return;
+   }
+   // Centrality
+  AliESDCentrality *esdCentrality = fESD->GetCentrality();
+  fCentralityF = esdCentrality->GetCentralityPercentile("V0M");
+
+  //printf("centrality %f\n",fCentralityF);
+
+ }
 
-//____________________________________________________________
-Int_t AliAnalysisTaskHFE::IsSignalElectron(AliESDtrack *fTrack) const{
+}
+//___________________________________________________
+void AliAnalysisTaskHFE::RejectionPileUpVertexRangeEventCut() {
   //
-  // Checks whether the identified electron track is coming from heavy flavour
-  // returns 0 in case of no signal, 1 in case of charm and 2 in case of Bottom
+  // Recover the centrality of the event from ESD or AOD
   //
-  enum{
-    kNoSignal = 0,
-    kCharm,
-    kBeauty
-  };
-  AliMCParticle *mctrack = dynamic_cast<AliMCParticle *>(fMC->GetTrack(TMath::Abs(fTrack->GetLabel())));
-  if(!mctrack) return kNoSignal;
-  TParticle *ecand = mctrack->Particle(); 
-  if(TMath::Abs(ecand->GetPdgCode()) != 11) return kNoSignal; // electron candidate not true electron
-  Int_t motherLabel = TMath::Abs(ecand->GetFirstMother());
-  AliDebug(3, Form("mother label: %d\n", motherLabel));
-  if(!motherLabel) return kNoSignal; // mother track unknown
-  AliMCParticle *motherTrack = dynamic_cast<AliMCParticle *>(fMC->GetTrack(motherLabel));
-  if(!motherTrack) return kNoSignal;
-  TParticle *mparticle = motherTrack->Particle();
-  Int_t pid = TMath::Abs(mparticle->GetPdgCode());
-  AliDebug(3, Form("PDG code: %d\n", pid));
-
-  // identify signal according to Pdg Code 
-  if((pid % 1000) / 100 == 4) return kCharm;    // charmed meson, 3rd position in pdg code == 4
-  if(pid / 1000 == 4) return kCharm;            // charmed baryon, 4th position in pdg code == 4
-  if((pid % 1000) / 100 == 5) return kBeauty;   // beauty meson, 3rd position in pdg code == 5
-  if(pid / 1000 == 5) return kBeauty;           // beauty baryon, 4th position in pdg code == 5   
-  return kNoSignal;
+ if(IsAODanalysis()){
+
+   AliAODEvent *fAOD = dynamic_cast<AliAODEvent *>(fInputEvent);
+   if(!fAOD){
+     AliError("AOD Event required for AOD Analysis")
+       return;
+   }
+   // PileUp
+   if(fRemovePileUp && fAOD->IsPileupFromSPD()) fIdentifiedAsPileUp = kTRUE; 
+   // Z vertex
+   if(TMath::Abs(fAOD->GetPrimaryVertex()->GetZ()) > fCuts->GetVertexRange()) fIdentifiedAsOutInz = kTRUE;
+   // Event Cut
+   fPassTheEventCut = kTRUE;
+   if(!fCFM->CheckEventCuts(AliHFEcuts::kEventStepReconstructed, fAOD)) fPassTheEventCut = kFALSE; 
+   
+   
+ } else {
+   
+   AliDebug(3, "Processing ESD Centrality");
+   AliESDEvent *fESD = dynamic_cast<AliESDEvent *>(fInputEvent);
+   if(!fESD){
+     AliError("ESD Event required for ESD Analysis")
+       return;
+   }
+   // PileUp
+   fIdentifiedAsPileUp = kFALSE;
+   if(fRemovePileUp && fESD->IsPileupFromSPD()) fIdentifiedAsPileUp = kTRUE; 
+   // Z vertex
+   fIdentifiedAsOutInz = kFALSE;
+   if(fESD->GetPrimaryVertexTracks()){
+     if(TMath::Abs(fESD->GetPrimaryVertexTracks()->GetZ()) > fCuts->GetVertexRange()) fIdentifiedAsOutInz = kTRUE;
+   }
+   //Event Cut
+   fPassTheEventCut = kTRUE;
+   if(!fCFM->CheckEventCuts(AliHFEcuts::kEventStepReconstructed, fESD)) fPassTheEventCut = kFALSE;   
+  
+
+ }
+
 }
+