]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG4/PartCorrBase/AliCaloPID.cxx
Cosmetics: one \n too much
[u/mrichter/AliRoot.git] / PWG4 / PartCorrBase / AliCaloPID.cxx
index 7bb34f6527fe27cfe0013d6b8fbdd59eef945fa8..f7ae32acd1ae51c78080bdbc932568448aec8a64 100755 (executable)
 
 //_________________________________________________________________________
 // Class for PID selection with calorimeters
-// The Output of the 2 main methods GetPdg is a PDG number identifying the cluster, 
+// The Output of the 2 main methods GetIdentifiedParticleType is a PDG number identifying the cluster, 
 // being kPhoton, kElectron, kPi0 ... as defined in the header file
-//   - GetPdg(const TString calo, const Double_t * pid, const Float_t energy)
+//   - GetIdentifiedParticleType(const TString calo, const Double_t * pid, const Float_t energy)
 //      Reads the PID weights array of the ESDs and depending on its magnitude identifies the particle
-//   - GetPdg(const TString calo,const TLorentzVector mom, const AliAODCaloCluster * cluster)
+//   - GetIdentifiedParticleType(const TString calo,const TLorentzVector mom, const AliVCluster * cluster)
 //      Recalcultes PID, the bayesian or any new one to be implemented in the future
 //      Right now only the possibility to recalculate EMCAL with bayesian and simple PID.
 //      In order to recalculate Bayesian, it is necessary to load the EMCALUtils library
@@ -30,7 +30,7 @@
 //      where flux is AliCaloPID::kLow or AliCaloPID::kHigh
 //      If it is necessary to change the parameters use the constructor 
 //      AliCaloPID(AliEMCALPIDUtils *utils) and set the parameters before.
-//   - SetPIDBits: Simple PID, depending on the thresholds fDispCut fTOFCut and even the
+//   - SetPIDBits: Simple PID, depending on the thresholds fL0Cut fTOFCut and even the
 //     result of the PID bayesian a different PID bit is set. 
 //
 //  All these methods can be called in the analysis you are interested.
 // --- ROOT system ---
 #include <TMath.h>
 #include <TString.h>
-#include <TFormula.h>
 
 //---- ANALYSIS system ----
 #include "AliCaloPID.h"
-#include "AliAODCaloCluster.h"
+#include "AliVCluster.h"
+#include "AliVTrack.h"
 #include "AliAODPWG4Particle.h"
-#ifdef __EMCALUTIL__
-#include "AliEMCALPIDUtils.h"
-#endif
+#include "AliCalorimeterUtils.h"
+
 ClassImp(AliCaloPID)
 
 
 //________________________________________________
 AliCaloPID::AliCaloPID() : 
-TObject(), fEMCALPhotonWeight(0.), fEMCALPi0Weight(0.),  
-fEMCALElectronWeight(0.),  fEMCALChargeWeight(0.),
-fEMCALNeutralWeight(0.),
-fPHOSPhotonWeight(0.), fPHOSPi0Weight(0.),  
-fPHOSElectronWeight(0.), fPHOSChargeWeight(0.) , 
-fPHOSNeutralWeight(0.), fPHOSWeightFormula(0), 
-fPHOSPhotonWeightFormula(0x0), fPHOSPi0WeightFormula(0x0),
-fDispCut(0.),fTOFCut(0.), fDebug(-1), 
-fRecalculateBayesian(kFALSE), fParticleFlux(kLow)
-#ifdef __EMCALUTIL__
-, fEMCALPIDUtils(new AliEMCALPIDUtils)
-#endif
+TObject(), 
+fEMCALPhotonWeight(0.),   fEMCALPi0Weight(0.),  
+fEMCALElectronWeight(0.), fEMCALChargeWeight(0.),      fEMCALNeutralWeight(0.),
+fPHOSPhotonWeight(0.),    fPHOSPi0Weight(0.),  
+fPHOSElectronWeight(0.),  fPHOSChargeWeight(0.) ,      fPHOSNeutralWeight(0.), 
+fPHOSWeightFormula(0),    fPHOSPhotonWeightFormula(0), fPHOSPi0WeightFormula(0),
+fPHOSPhotonWeightFormulaExpression(""), fPHOSPi0WeightFormulaExpression(""),
+fL0CutMax(100.),          fL0CutMin(0),                fTOFCut(0.), 
+fDebug(-1), 
+fRecalculateBayesian(kFALSE), fParticleFlux(kLow),     fEMCALPIDUtils(),
+fHistoNEBins(100),        fHistoEMax(100.),            fHistoEMin(0.),
+fHistoNDEtaBins(100),     fHistoDEtaMax(0.15),         fHistoDEtaMin(-0.15),
+fHistoNDPhiBins(100),     fHistoDPhiMax(0.15),         fHistoDPhiMin(-0.15),
+fhTrackMatchedDEta(0x0),  fhTrackMatchedDPhi(0x0),     fhTrackMatchedDEtaDPhi(0x0)
 {
   //Ctor
   
@@ -77,152 +78,130 @@ fRecalculateBayesian(kFALSE), fParticleFlux(kLow)
 
 //________________________________________________
 AliCaloPID::AliCaloPID(const Int_t flux) : 
-TObject(), fEMCALPhotonWeight(0.), fEMCALPi0Weight(0.),  
-fEMCALElectronWeight(0.),  fEMCALChargeWeight(0.),
-fEMCALNeutralWeight(0.),
-fPHOSPhotonWeight(0.), fPHOSPi0Weight(0.),  
-fPHOSElectronWeight(0.), fPHOSChargeWeight(0.) , 
-fPHOSNeutralWeight(0.), fPHOSWeightFormula(0), 
-fPHOSPhotonWeightFormula(0x0), fPHOSPi0WeightFormula(0x0),
-fDispCut(0.),fTOFCut(0.), fDebug(-1), 
-fRecalculateBayesian(kTRUE), fParticleFlux(flux)
-#ifdef __EMCALUTIL__
-, fEMCALPIDUtils(new AliEMCALPIDUtils)
-#endif
+TObject(), 
+fEMCALPhotonWeight(0.),   fEMCALPi0Weight(0.),  
+fEMCALElectronWeight(0.), fEMCALChargeWeight(0.),      fEMCALNeutralWeight(0.),
+fPHOSPhotonWeight(0.),    fPHOSPi0Weight(0.),  
+fPHOSElectronWeight(0.),  fPHOSChargeWeight(0.) ,      fPHOSNeutralWeight(0.), 
+fPHOSWeightFormula(0),    fPHOSPhotonWeightFormula(0), fPHOSPi0WeightFormula(0),
+fPHOSPhotonWeightFormulaExpression(""), fPHOSPi0WeightFormulaExpression(""),
+fL0CutMax(100.),          fL0CutMin(0),                fTOFCut(0.), 
+fDebug(-1), 
+fRecalculateBayesian(kFALSE), fParticleFlux(flux),     fEMCALPIDUtils(),
+fHistoNEBins(100),        fHistoEMax(100.),            fHistoEMin(0.),
+fHistoNDEtaBins(100),     fHistoDEtaMax(0.15),         fHistoDEtaMin(-0.15),
+fHistoNDPhiBins(100),     fHistoDPhiMax(0.15),         fHistoDPhiMin(-0.15),
+fhTrackMatchedDEta(0x0),  fhTrackMatchedDPhi(0x0),     fhTrackMatchedDEtaDPhi(0x0)
 {
-       //Ctor
+  //Ctor
        
-       //Initialize parameters
-       InitParameters();
+  //Initialize parameters
+  InitParameters();
+
 }
 
 //________________________________________________
 AliCaloPID::AliCaloPID(const TTask * emcalpid) : 
-TObject(), fEMCALPhotonWeight(0.), fEMCALPi0Weight(0.),  
-fEMCALElectronWeight(0.),  fEMCALChargeWeight(0.),
-fEMCALNeutralWeight(0.),
-fPHOSPhotonWeight(0.), fPHOSPi0Weight(0.),  
-fPHOSElectronWeight(0.), fPHOSChargeWeight(0.) , 
-fPHOSNeutralWeight(0.), fPHOSWeightFormula(0), 
-fPHOSPhotonWeightFormula(0x0), fPHOSPi0WeightFormula(0x0),
-fDispCut(0.),fTOFCut(0.), fDebug(-1), 
-fRecalculateBayesian(kTRUE), fParticleFlux(-1)
-#ifdef __EMCALUTIL__
-, fEMCALPIDUtils( (AliEMCALPIDUtils*) emcalpid)
-#endif
-{
-       //Ctor
-       
-       //Initialize parameters
-       InitParameters();
-}
-
-//____________________________________________________________________________
-AliCaloPID::AliCaloPID(const AliCaloPID & pid) :   
-TObject(pid), fEMCALPhotonWeight(pid.fEMCALPhotonWeight), 
-fEMCALPi0Weight(pid.fEMCALPi0Weight), 
-fEMCALElectronWeight(pid.fEMCALElectronWeight), 
-fEMCALChargeWeight(pid.fEMCALChargeWeight), 
-fEMCALNeutralWeight(pid.fEMCALNeutralWeight), 
-fPHOSPhotonWeight(pid.fPHOSPhotonWeight),
-fPHOSPi0Weight(pid.fPHOSPi0Weight),
-fPHOSElectronWeight(pid.fPHOSElectronWeight), 
-fPHOSChargeWeight(pid.fPHOSChargeWeight),
-fPHOSNeutralWeight(pid.fPHOSNeutralWeight),
-fPHOSWeightFormula(pid.fPHOSWeightFormula), 
-fPHOSPhotonWeightFormula(pid.fPHOSPhotonWeightFormula), 
-fPHOSPi0WeightFormula(pid.fPHOSPi0WeightFormula), 
-fDispCut(pid.fDispCut),fTOFCut(pid.fTOFCut),
-fDebug(pid.fDebug), fRecalculateBayesian(pid.fRecalculateBayesian),
-fParticleFlux(pid.fParticleFlux)
-#ifdef __EMCALUTIL__
-, fEMCALPIDUtils(pid.fEMCALPIDUtils)
-#endif
+TObject(), 
+fEMCALPhotonWeight(0.),   fEMCALPi0Weight(0.),  
+fEMCALElectronWeight(0.), fEMCALChargeWeight(0.),      fEMCALNeutralWeight(0.),
+fPHOSPhotonWeight(0.),    fPHOSPi0Weight(0.),  
+fPHOSElectronWeight(0.),  fPHOSChargeWeight(0.) ,      fPHOSNeutralWeight(0.), 
+fPHOSWeightFormula(0),    fPHOSPhotonWeightFormula(0), fPHOSPi0WeightFormula(0),
+fPHOSPhotonWeightFormulaExpression(""), fPHOSPi0WeightFormulaExpression(""),
+fL0CutMax(100.),         fL0CutMin(0),                 fTOFCut(0.), 
+fDebug(-1), 
+fRecalculateBayesian(kFALSE), fParticleFlux(kLow),     fEMCALPIDUtils((AliEMCALPIDUtils*) emcalpid),
+fHistoNEBins(100),        fHistoEMax(100.),            fHistoEMin(0.),
+fHistoNDEtaBins(100),     fHistoDEtaMax(0.15),         fHistoDEtaMin(-0.15),
+fHistoNDPhiBins(100),     fHistoDPhiMax(0.15),         fHistoDPhiMin(-0.15),
+fhTrackMatchedDEta(0x0),  fhTrackMatchedDPhi(0x0),     fhTrackMatchedDEtaDPhi(0x0)
 {
-  // cpy ctor
-       
-}
-
-//_________________________________________________________________________
-AliCaloPID & AliCaloPID::operator = (const AliCaloPID & pid)
-{
-  // assignment operator
-  
-  if(&pid == this) return *this;
-  
-  fEMCALPhotonWeight = pid. fEMCALPhotonWeight ;
-  fEMCALPi0Weight = pid.fEMCALPi0Weight ;
-  fEMCALElectronWeight = pid.fEMCALElectronWeight; 
-  fEMCALChargeWeight = pid.fEMCALChargeWeight;
-  fEMCALNeutralWeight = pid.fEMCALNeutralWeight;
-  
-  fPHOSPhotonWeight = pid.fPHOSPhotonWeight ;
-  fPHOSPi0Weight = pid.fPHOSPi0Weight ;
-  fPHOSElectronWeight = pid.fPHOSElectronWeight; 
-  fPHOSChargeWeight = pid.fPHOSChargeWeight;
-  fPHOSNeutralWeight = pid.fPHOSNeutralWeight;
-  
-  fPHOSWeightFormula       = pid.fPHOSWeightFormula; 
-  fPHOSPhotonWeightFormula = pid.fPHOSPhotonWeightFormula; 
-  fPHOSPi0WeightFormula    = pid.fPHOSPi0WeightFormula;
-  
-  fDispCut  = pid.fDispCut;
-  fTOFCut   = pid.fTOFCut;
-  fDebug    = pid.fDebug;
-  
-  fRecalculateBayesian = pid.fRecalculateBayesian;
-  fParticleFlux        = pid.fParticleFlux;
-#ifdef __EMCALUTIL__
-  fEMCALPIDUtils       = pid.fEMCALPIDUtils;
-#endif
-       
+  //Ctor
        
-  return *this;
-  
+  //Initialize parameters
+  InitParameters();
 }
 
 //_________________________________
 AliCaloPID::~AliCaloPID() {
   //Dtor
   
-  if(fPHOSPhotonWeightFormula) delete  fPHOSPhotonWeightFormula ;
-  if(fPHOSPi0WeightFormula) delete  fPHOSPi0WeightFormula ;
-#ifdef __EMCALUTIL__
-       if(fEMCALPIDUtils) delete fEMCALPIDUtils ;
-#endif
+  delete fPHOSPhotonWeightFormula ;
+  delete fPHOSPi0WeightFormula ;
+  delete fEMCALPIDUtils ;
+
+}
+
+//________________________________________________________________________
+TList *  AliCaloPID::GetCreateOutputObjects()
+{  
+  // Create histograms to be saved in output file and 
+  // store them in outputContainer of the analysis class that calls this class.
+  
+  TList * outputContainer = new TList() ; 
+  outputContainer->SetName("CaloPIDHistos") ; 
+  
+  outputContainer->SetOwner(kFALSE);
+  
+  fhTrackMatchedDEta  = new TH2F
+  ("TrackMatchedDEta",
+   "d#eta of cluster-track vs cluster energy",
+   fHistoNEBins,fHistoEMin,fHistoEMax,fHistoNDEtaBins,fHistoDEtaMin,fHistoDEtaMax); 
+  fhTrackMatchedDEta->SetYTitle("d#eta");
+  fhTrackMatchedDEta->SetXTitle("E_{cluster} (GeV)");
+  
+  fhTrackMatchedDPhi  = new TH2F
+  ("TrackMatchedDPhi",
+   "d#phi of cluster-track vs cluster energy"
+   ,fHistoNEBins,fHistoEMin,fHistoEMax,fHistoNDPhiBins,fHistoDPhiMin,fHistoDPhiMax); 
+  fhTrackMatchedDPhi->SetYTitle("d#phi (rad)");
+  fhTrackMatchedDPhi->SetXTitle("E_{cluster} (GeV)");
+  
+  fhTrackMatchedDEtaDPhi  = new TH2F
+  ("TrackMatchedDEtaDPhi",
+   "d#eta vs d#phi of cluster-track vs cluster energy"
+   ,fHistoNDEtaBins,fHistoDEtaMin,fHistoDEtaMax,fHistoNDPhiBins,fHistoDPhiMin,fHistoDPhiMax); 
+  fhTrackMatchedDEtaDPhi->SetYTitle("d#phi (rad)");
+  fhTrackMatchedDEtaDPhi->SetXTitle("d#eta");   
+  
+  outputContainer->Add(fhTrackMatchedDEta) ; 
+  outputContainer->Add(fhTrackMatchedDPhi) ;
+  outputContainer->Add(fhTrackMatchedDEtaDPhi) ; 
+  
+  return outputContainer;
 }
 
 
+
 //_______________________________________________________________
 void AliCaloPID::InitParameters()
 {
   //Initialize the parameters of the PID.
   
-  fEMCALPhotonWeight   = 0.8 ;
-  fEMCALPi0Weight      = 0.5 ;
-  fEMCALElectronWeight = 0.8 ;
-  fEMCALChargeWeight   = 0.5 ;
-  fEMCALNeutralWeight  = 0.5 ;
+  fEMCALPhotonWeight   = 0.6 ;
+  fEMCALPi0Weight      = 0.6 ;
+  fEMCALElectronWeight = 0.6 ;
+  fEMCALChargeWeight   = 0.6 ;
+  fEMCALNeutralWeight  = 0.6 ;
   
-  fPHOSPhotonWeight    = 0.75 ;
-  fPHOSPi0Weight       = 0.8 ;
-  fPHOSElectronWeight  = 0.5 ;
-  fPHOSChargeWeight    = 0.5 ;
-  fPHOSNeutralWeight   = 0.5 ;
+  fPHOSPhotonWeight    = 0.6 ;
+  fPHOSPi0Weight       = 0.6 ;
+  fPHOSElectronWeight  = 0.6 ;
+  fPHOSChargeWeight    = 0.6 ;
+  fPHOSNeutralWeight   = 0.6 ;
   
   //Formula to set the PID weight threshold for photon or pi0
-  fPHOSWeightFormula = kTRUE;
-  fPHOSPhotonWeightFormula = 
-    new TFormula("photonWeight","0.98*(x<40)+ 0.68*(x>=100)+(x>=40 && x<100)*(0.98+x*(6e-3)-x*x*(2e-04)+x*x*x*(1.1e-06))");
-  fPHOSPi0WeightFormula = 
-    new TFormula("pi0Weight","0.98*(x<65)+ 0.915*(x>=100)+(x>=65 && x-x*(1.95e-3)-x*x*(4.31e-05)+x*x*x*(3.61e-07))");
+  fPHOSWeightFormula       = kFALSE;
+  fPHOSPhotonWeightFormulaExpression = "0.98*(x<40)+ 0.68*(x>=100)+(x>=40 && x<100)*(0.98+x*(6e-3)-x*x*(2e-04)+x*x*x*(1.1e-06))";
+  fPHOSPi0WeightFormulaExpression    = "0.98*(x<65)+ 0.915*(x>=100)+(x>=65 && x-x*(1.95e-3)-x*x*(4.31e-05)+x*x*x*(3.61e-07))"   ;
   
-  fDispCut  = 1.5;
+  fL0CutMax = 0.3;
+  fL0CutMin = 0.01;
   fTOFCut   = 5.e-9;
-  fDebug -1;
+  fDebug    =-1;
        
   if(fRecalculateBayesian){
-#ifdef __EMCALUTIL__
        if(fParticleFlux == kLow){
                printf("AliCaloPID::Init() - SetLOWFluxParam\n");
                fEMCALPIDUtils->SetLowFluxParam() ;
@@ -231,16 +210,15 @@ void AliCaloPID::InitParameters()
                printf("AliCaloPID::Init() - SetHIGHFluxParam\n");
                fEMCALPIDUtils->SetHighFluxParam() ;
        }
-#endif
   }
 }
 
 //_______________________________________________________________
-Int_t AliCaloPID::GetPdg(const TString calo, const Double_t * pid, const Float_t energy) const {
+Int_t AliCaloPID::GetIdentifiedParticleType(const TString calo, const Double_t * pid, const Float_t energy) {
   //Return most probable identity of the particle.
   
   if(!pid){ 
-    printf("AliCaloPID::GetPdg() - pid pointer not initialized!!!\n");
+    printf("AliCaloPID::GetIdentifiedParticleType() - pid pointer not initialized!!!\n");
     abort();
   }
   
@@ -249,11 +227,10 @@ Int_t AliCaloPID::GetPdg(const TString calo, const Double_t * pid, const Float_t
   Float_t wE   =  fPHOSElectronWeight ;
   Float_t wCh  =  fPHOSChargeWeight ;
   Float_t wNe  =  fPHOSNeutralWeight ;
-  
-  
+    
   if(calo == "PHOS" && fPHOSWeightFormula){
-    wPh  = fPHOSPhotonWeightFormula->Eval(energy) ;
-    wPi0 = fPHOSPi0WeightFormula->Eval(energy);
+    wPh  = GetPHOSPhotonWeightFormula()->Eval(energy) ;
+    wPi0 = GetPHOSPi0WeightFormula()   ->Eval(energy);
   }
   
   if(calo == "EMCAL"){
@@ -266,96 +243,92 @@ Int_t AliCaloPID::GetPdg(const TString calo, const Double_t * pid, const Float_t
     
   }
   
-  if(fDebug > 0)  printf("AliCaloPID::GetPdg: calo %s, ph %0.2f, pi0 %0.2f, el %0.2f, conv el %0.2f, hadrons: pion %0.2f, kaon %0.2f, proton %0.2f , neutron %0.2f, kaon %0.2f \n",
-                        calo.Data(),pid[AliAODCluster::kPhoton], pid[AliAODCluster::kPi0],
-                        pid[AliAODCluster::kElectron], pid[AliAODCluster::kEleCon],
-                        pid[AliAODCluster::kPion], pid[AliAODCluster::kKaon], pid[AliAODCluster::kProton],
-                        pid[AliAODCluster::kNeutron], pid[AliAODCluster::kKaon0]);
+  if(fDebug > 0)  printf("AliCaloPID::GetIdentifiedParticleType: calo %s, ph %0.2f, pi0 %0.2f, el %0.2f, conv el %0.2f, hadrons: pion %0.2f, kaon %0.2f, proton %0.2f , neutron %0.2f, kaon %0.2f \n",
+                        calo.Data(),pid[AliVCluster::kPhoton], pid[AliVCluster::kPi0],
+                        pid[AliVCluster::kElectron], pid[AliVCluster::kEleCon],
+                        pid[AliVCluster::kPion], pid[AliVCluster::kKaon], pid[AliVCluster::kProton],
+                        pid[AliVCluster::kNeutron], pid[AliVCluster::kKaon0]);
   
   Int_t pdg = kNeutralUnknown ;
-  Float_t chargedHadronWeight = pid[AliAODCluster::kProton]+pid[AliAODCluster::kKaon]+
-    pid[AliAODCluster::kPion]+pid[AliAODCluster::kMuon];
-  Float_t neutralHadronWeight = pid[AliAODCluster::kNeutron]+pid[AliAODCluster::kKaon0];
-  Float_t allChargedWeight    = pid[AliAODCluster::kElectron]+pid[AliAODCluster::kEleCon]+ chargedHadronWeight;
-  Float_t allNeutralWeight    = pid[AliAODCluster::kPhoton]+pid[AliAODCluster::kPi0]+ neutralHadronWeight;
+  Float_t chargedHadronWeight = pid[AliVCluster::kProton]+pid[AliVCluster::kKaon]+
+    pid[AliVCluster::kPion]+pid[AliVCluster::kMuon];
+  Float_t neutralHadronWeight = pid[AliVCluster::kNeutron]+pid[AliVCluster::kKaon0];
+  Float_t allChargedWeight    = pid[AliVCluster::kElectron]+pid[AliVCluster::kEleCon]+ chargedHadronWeight;
+  Float_t allNeutralWeight    = pid[AliVCluster::kPhoton]+pid[AliVCluster::kPi0]+ neutralHadronWeight;
   
   //Select most probable ID
   if(calo=="PHOS"){
-    if(pid[AliAODCluster::kPhoton] > wPh) pdg = kPhoton ;
-    else if(pid[AliAODCluster::kPi0] > wPi0) pdg = kPi0 ; 
-    else if(pid[AliAODCluster::kElectron] > wE)  pdg = kElectron ;
-    else if(pid[AliAODCluster::kEleCon] >  wE) pdg = kEleCon ;
-    else if(chargedHadronWeight > wCh) pdg = kChargedHadron ;  
-    else if(neutralHadronWeight > wNe) pdg = kNeutralHadron ; 
+    if(pid[AliVCluster::kPhoton] > wPh)        pdg = kPhoton ;
+    else if(pid[AliVCluster::kPi0] > wPi0)     pdg = kPi0 ; 
+    else if(pid[AliVCluster::kElectron] > wE)  pdg = kElectron ;
+    else if(pid[AliVCluster::kEleCon] >  wE)   pdg = kEleCon ;
+    else if(chargedHadronWeight > wCh)         pdg = kChargedHadron ;  
+    else if(neutralHadronWeight > wNe)         pdg = kNeutralHadron ; 
     else if(allChargedWeight >  allNeutralWeight)
       pdg = kChargedUnknown ; 
     else 
       pdg = kNeutralUnknown ;
   }
   else{//EMCAL
-
-    if(pid[AliAODCluster::kPhoton]+pid[AliAODCluster::kElectron]  > wPh) pdg = kPhoton ; //temporal sollution until track matching for electrons is considered
-    //if(pid[AliAODCluster::kPhoton]  > wPh) pdg = kPhoton ;
-    else if(pid[AliAODCluster::kPi0] > wPi0) pdg = kPi0 ; 
-    //else if(pid[AliAODCluster::kElectron]  > wE) pdg = kElectron ;
+    
+    if(pid[AliVCluster::kPhoton]  > wPh)                     pdg = kPhoton ;
+    else if(pid[AliVCluster::kElectron]  > wE)               pdg = kElectron ;
+    else if(pid[AliVCluster::kPhoton]+pid[AliVCluster::kElectron]  > wPh) pdg = kPhoton ; //temporal sollution until track matching for electrons is considered
+    else if(pid[AliVCluster::kPi0] > wPi0)                   pdg = kPi0 ; 
     else if(chargedHadronWeight + neutralHadronWeight > wCh) pdg = kChargedHadron ;  
     else if(neutralHadronWeight + chargedHadronWeight > wNe) pdg = kNeutralHadron ; 
-    else pdg =  kNeutralUnknown ;
-    
+    else                                                     pdg = kNeutralUnknown ;
   }
   
-  if(fDebug > 0)printf("AliCaloPID::GetPdg:Final Pdg: %d \n", pdg);
-   
+  if(fDebug > 0)printf("AliCaloPID::GetIdentifiedParticleType:Final Pdg: %d, cluster energy %2.2f \n", pdg,energy);
+   //printf("PDG1\n");
   return pdg ;
   
 }
 
 //_______________________________________________________________
-Int_t AliCaloPID::GetPdg(const TString calo,const TLorentzVector mom, const AliAODCaloCluster * cluster) const {
+Int_t AliCaloPID::GetIdentifiedParticleType(const TString calo,const TLorentzVector mom, const AliVCluster * cluster) {
   //Recalculated PID with all parameters
+  
   Float_t lambda0 = cluster->GetM02();
-  Float_t energy = mom.E();    
-
-  if(fDebug > 0) printf("AliCaloPID::GetPdg: Calorimeter %s, E %3.2f, l0 %3.2f, l1 %3.2f, disp %3.2f, tof %1.11f, distCPV %3.2f, distToBC %1.1f, NMax %d\n",
-                                               calo.Data(),energy,lambda0,cluster->GetM20(),cluster->GetDispersion(),cluster->GetTOF(), 
-                                               cluster->GetEmcCpvDistance(), cluster->GetDistToBadChannel(),cluster->GetNExMax());
-
+  Float_t lambda1 = cluster->GetM20();
+  Float_t energy  = mom.E();   
+  
+  if(fDebug > 0) printf("AliCaloPID::GetIdentifiedParticleType: Calorimeter %s, E %3.2f, l0 %3.2f, l1 %3.2f, disp %3.2f, tof %1.11f, distCPV %3.2f, distToBC %1.1f, NMax %d\n",
+                        calo.Data(),energy,lambda0,cluster->GetM20(),cluster->GetDispersion(),cluster->GetTOF(), 
+                        cluster->GetEmcCpvDistance(), cluster->GetDistanceToBadChannel(),cluster->GetNExMax());
+  
   if(calo == "EMCAL") {
          //Recalculate Bayesian
          if(fRecalculateBayesian){       
-#ifdef __EMCALUTIL__
-                
                  if(fDebug > 0)  {
-                         const Double_t  *pid0 = cluster->PID();
-                         printf("AliCaloPID::GetPdg: BEFORE calo %s, ph %0.2f, pi0 %0.2f, el %0.2f, conv el %0.2f, hadrons: pion %0.2f, kaon %0.2f, proton %0.2f , neutron %0.2f, kaon %0.2f \n",
-                                                                calo.Data(),pid0[AliAODCluster::kPhoton], pid0[AliAODCluster::kPi0],
-                                                                pid0[AliAODCluster::kElectron], pid0[AliAODCluster::kEleCon],
-                                                                pid0[AliAODCluster::kPion], pid0[AliAODCluster::kKaon], pid0[AliAODCluster::kProton],
-                                                                pid0[AliAODCluster::kNeutron], pid0[AliAODCluster::kKaon0]);
+                         const Double_t  *pid0 = cluster->GetPID();
+                         printf("AliCaloPID::GetIdentifiedParticleType: BEFORE calo %s, ph %0.2f, pi0 %0.2f, el %0.2f, conv el %0.2f, hadrons: pion %0.2f, kaon %0.2f, proton %0.2f , neutron %0.2f, kaon %0.2f \n",
+               calo.Data(),pid0[AliVCluster::kPhoton], pid0[AliVCluster::kPi0],
+               pid0[AliVCluster::kElectron], pid0[AliVCluster::kEleCon],
+               pid0[AliVCluster::kPion], pid0[AliVCluster::kKaon], pid0[AliVCluster::kProton],
+               pid0[AliVCluster::kNeutron], pid0[AliVCluster::kKaon0]);
                  }
                  
-                fEMCALPIDUtils->ComputePID(energy, lambda0);
-                Double_t pid[AliPID::kSPECIESN];
-                for(Int_t i = 0; i < AliPID::kSPECIESN; i++) pid[i] = fEMCALPIDUtils->GetPIDFinal(i);
-                return GetPdg(calo, pid, energy);
+      fEMCALPIDUtils->ComputePID(energy, lambda0);
+      Double_t pid[AliPID::kSPECIESN];
+      for(Int_t i = 0; i < AliPID::kSPECIESN; i++) pid[i] = fEMCALPIDUtils->GetPIDFinal(i);
+      return GetIdentifiedParticleType(calo, pid, energy);
                  
-#endif
-         
-       }
-         
-       // If no use of bayesian, simple PID  
-    if(lambda0 < 0.25) return kPhoton ;
-    //else return  kNeutralHadron ; 
-       else return  kPi0 ;
-  }
-  
-  //   if(calo == "PHOS") {
-  //    if(cluster->GetM02()< 0.25) return kPhoton ;
-  //    else return  kNeutralHadron ; 
-  //  }
+    }
+    
+    // If no use of bayesian, simplest PID  
+    if(lambda0 < fL0CutMax && lambda0 > fL0CutMin) return kPhoton ;
+    else return  kPi0 ; // Wild guess, it can be hadron but not photon
   
-  return  kNeutralHadron ; 
+  }//EMCAL
+  else {//PHOS
+    
+    // Do not use bayesian, cut based on shower ellipse
+    return IsPHOSPhoton(lambda0,lambda1);
   
+  }
+    
 }
 
 //__________________________________________________
@@ -363,39 +336,40 @@ TString  AliCaloPID::GetPIDParametersList()  {
   //Put data member values in string to keep in output container
   
   TString parList ; //this will be list of parameters used for this analysis.
-  char onePar[255] ;
-  sprintf(onePar,"--- AliCaloPID ---\n") ;
+  const Int_t buffersize = 255;
+  char onePar[buffersize] ;
+  snprintf(onePar,buffersize,"--- AliCaloPID ---\n") ;
   parList+=onePar ;    
-  sprintf(onePar,"fDispCut =%2.2f (Cut on dispersion, used in PID evaluation) \n",fDispCut) ;
+  snprintf(onePar,buffersize,"fL0CutMin =%2.2f, fL0CutMax =%2.2f  (Cut on Shower Shape, used in PID evaluation) \n",fL0CutMin, fL0CutMax) ;
   parList+=onePar ;
-  sprintf(onePar,"fTOFCut  =%e (Cut on TOF, used in PID evaluation) \n",fTOFCut) ;
+  snprintf(onePar,buffersize,"fTOFCut  =%e (Cut on TOF, used in PID evaluation) \n",fTOFCut) ;
   parList+=onePar ;
-  sprintf(onePar,"fEMCALPhotonWeight =%2.2f (EMCAL bayesian weight for photons)\n",fEMCALPhotonWeight) ;
+  snprintf(onePar,buffersize,"fEMCALPhotonWeight =%2.2f (EMCAL bayesian weight for photons)\n",fEMCALPhotonWeight) ;
   parList+=onePar ;
-  sprintf(onePar,"fEMCALPi0Weight =%2.2f (EMCAL bayesian weight for pi0)\n",fEMCALPi0Weight) ;
+  snprintf(onePar,buffersize,"fEMCALPi0Weight =%2.2f (EMCAL bayesian weight for pi0)\n",fEMCALPi0Weight) ;
   parList+=onePar ;
-  sprintf(onePar,"fEMCALElectronWeight =%2.2f(EMCAL bayesian weight for electrons)\n",fEMCALElectronWeight) ;
+  snprintf(onePar,buffersize,"fEMCALElectronWeight =%2.2f(EMCAL bayesian weight for electrons)\n",fEMCALElectronWeight) ;
   parList+=onePar ;
-  sprintf(onePar,"fEMCALChargeWeight =%2.2f (EMCAL bayesian weight for charged hadrons)\n",fEMCALChargeWeight) ;
+  snprintf(onePar,buffersize,"fEMCALChargeWeight =%2.2f (EMCAL bayesian weight for charged hadrons)\n",fEMCALChargeWeight) ;
   parList+=onePar ;
-  sprintf(onePar,"fEMCALNeutralWeight =%2.2f (EMCAL bayesian weight for neutral hadrons)\n",fEMCALNeutralWeight) ;
+  snprintf(onePar,buffersize,"fEMCALNeutralWeight =%2.2f (EMCAL bayesian weight for neutral hadrons)\n",fEMCALNeutralWeight) ;
   parList+=onePar ;
-  sprintf(onePar,"fPHOSPhotonWeight =%2.2f (PHOS bayesian weight for photons)\n",fPHOSPhotonWeight) ;
+  snprintf(onePar,buffersize,"fPHOSPhotonWeight =%2.2f (PHOS bayesian weight for photons)\n",fPHOSPhotonWeight) ;
   parList+=onePar ;
-  sprintf(onePar,"fPHOSPi0Weight =%2.2f (PHOS bayesian weight for pi0)\n",fPHOSPi0Weight) ;
+  snprintf(onePar,buffersize,"fPHOSPi0Weight =%2.2f (PHOS bayesian weight for pi0)\n",fPHOSPi0Weight) ;
   parList+=onePar ;
-  sprintf(onePar,"fPHOSElectronWeight =%2.2f(PHOS bayesian weight for electrons)\n",fPHOSElectronWeight) ;
+  snprintf(onePar,buffersize,"fPHOSElectronWeight =%2.2f(PHOS bayesian weight for electrons)\n",fPHOSElectronWeight) ;
   parList+=onePar ;
-  sprintf(onePar,"fPHOSChargeWeight =%2.2f (PHOS bayesian weight for charged hadrons)\n",fPHOSChargeWeight) ;
+  snprintf(onePar,buffersize,"fPHOSChargeWeight =%2.2f (PHOS bayesian weight for charged hadrons)\n",fPHOSChargeWeight) ;
   parList+=onePar ;
-  sprintf(onePar,"fPHOSNeutralWeight =%2.2f (PHOS bayesian weight for neutral hadrons)\n",fPHOSNeutralWeight) ;
+  snprintf(onePar,buffersize,"fPHOSNeutralWeight =%2.2f (PHOS bayesian weight for neutral hadrons)\n",fPHOSNeutralWeight) ;
   parList+=onePar ;
   
   if(fPHOSWeightFormula){
-       sprintf(onePar,"PHOS Photon Weight Formula: %s\n",(fPHOSPhotonWeightFormula->GetExpFormula("p")).Data()) ;
+    snprintf(onePar,buffersize,"PHOS Photon Weight Formula: %s\n",fPHOSPhotonWeightFormulaExpression.Data() ) ;
     parList+=onePar;
-       sprintf(onePar,"PHOS Pi0    Weight Formula: %s\n",(fPHOSPi0WeightFormula->GetExpFormula("p")).Data()) ;
-       parList+=onePar;          
+    snprintf(onePar,buffersize,"PHOS Pi0    Weight Formula: %s\n",fPHOSPi0WeightFormulaExpression.Data()    ) ;
+    parList+=onePar;     
   }
   
   return parList; 
@@ -421,12 +395,12 @@ void AliCaloPID::Print(const Option_t * opt) const
   
   printf("PHOS Parametrized weight on?  =     %d\n",  fPHOSWeightFormula) ; 
   if(fPHOSWeightFormula){
-    printf("Photon weight formula = %s\n", (fPHOSPhotonWeightFormula->GetExpFormula("p")).Data());
-    printf("Pi0    weight formula = %s\n", (fPHOSPhotonWeightFormula->GetExpFormula("p")).Data());
+    printf("Photon weight formula = %s\n", fPHOSPhotonWeightFormulaExpression.Data());
+    printf("Pi0    weight formula = %s\n", fPHOSPi0WeightFormulaExpression   .Data());
   }
   
   printf("TOF cut        = %e\n",fTOFCut);
-  printf("Dispersion cut = %2.2f\n",fDispCut);
+  printf("Lambda0 cut min = %2.2f; max = %2.2f\n",fL0CutMin, fL0CutMax);
   printf("Debug level    = %d\n",fDebug);
   printf("Recalculate Bayesian?    = %d\n",fRecalculateBayesian);
  if(fRecalculateBayesian) printf("Particle Flux?    = %d\n",fParticleFlux);
@@ -435,32 +409,127 @@ void AliCaloPID::Print(const Option_t * opt) const
 } 
 
 //_______________________________________________________________
-void AliCaloPID::SetPIDBits(const TString calo, const AliAODCaloCluster * cluster, AliAODPWG4Particle * ph) {
+void AliCaloPID::SetPIDBits(const TString calo, const AliVCluster * cluster, AliAODPWG4Particle * ph, const AliCalorimeterUtils* cu) {
   //Set Bits for PID selection
   
   //Dispersion/lambdas
-  Double_t disp=cluster->GetDispersion()  ;
-       //    Double_t m20=calo->GetM20() ;
-       //    Double_t m02=calo->GetM02() ; 
-  ph->SetDispBit(disp<fDispCut) ;  
+  //Double_t disp= cluster->GetDispersion()  ;
+  Double_t l1  = cluster->GetM20() ;
+  Double_t l0  = cluster->GetM02() ; 
+  Bool_t isDispOK = kTRUE ;
+  if(cluster->IsPHOS()){ 
+    
+   isDispOK =  IsPHOSPhoton(l0,l1);
+    
+  }
+  else{//EMCAL
+    
+    if(l0 > fL0CutMin && l0 < fL0CutMax) isDispOK = kTRUE;
+    
+  }
+  
+  ph->SetDispBit(isDispOK) ;
   
   //TOF
   Double_t tof=cluster->GetTOF()  ;
   ph->SetTOFBit(TMath::Abs(tof)<fTOFCut) ; 
   
-  //Charged veto
-  //    Double_t cpvR=calo->GetEmcCpvDistance() ; 
-  Int_t ntr=cluster->GetNTracksMatched();  //number of track matched
-  ph->SetChargedBit(ntr>0) ;  //Temporary cut, should we evaluate distance?
+  //Charged veto  
+  //Bool_t isNeutral = kTRUE ;
+  //if(cluster->IsPHOS())  isNeutral = cluster->GetEmcCpvDistance() > 5. ;
+  //else 
+  Bool_t isNeutral = IsTrackMatched(cluster,cu);
+  
+  ph->SetChargedBit(isNeutral);
   
   //Set PID pdg
-  ph->SetPdg(GetPdg(calo,cluster->PID(),ph->E()));
+  ph->SetIdentifiedParticleType(GetIdentifiedParticleType(calo,cluster->GetPID(),ph->E()));
   
   if(fDebug > 0){ 
-    printf("AliCaloPID::SetPIDBits: TOF %e, Dispersion %2.2f, NTracks %d\n",tof , disp, ntr);  
+    printf("AliCaloPID::SetPIDBits: TOF %e, Lambda0 %2.2f, Lambda1 %2.2f\n",tof , l0, l1);     
     printf("AliCaloPID::SetPIDBits: pdg %d, bits: TOF %d, Dispersion %d, Charge %d\n",
-            ph->GetPdg(), ph->GetTOFBit() , ph->GetDispBit() , ph->GetChargedBit()); 
+            ph->GetIdentifiedParticleType(), ph->GetTOFBit() , ph->GetDispBit() , ph->GetChargedBit()); 
+  }
+}
+
+//__________________________________________________________________________
+Bool_t AliCaloPID::IsTrackMatched(const AliVCluster* cluster, const AliCalorimeterUtils * cu) const {
+  //Check if there is any track attached to this cluster
+  
+  Int_t nMatches = cluster->GetNTracksMatched();
+//  if(nMatches>0){
+//    printf("N matches %d, first match (ESD) %d or (AOD) %d\n",nMatches,cluster->GetTrackMatchedIndex(), cluster->GetTrackMatched(0));
+//    if     (cluster->GetTrackMatched(0))        printf("\t matched track id %d\n",((AliVTrack*)cluster->GetTrackMatched(0)) ->GetID() ) ;
+//  }
+//  else {
+//    printf("Not Matched");
+//  }
+
+  //If EMCAL track matching needs to be recalculated
+  if(cluster->IsEMCAL() && cu && cu->IsRecalculationOfClusterTrackMatchingOn()){
+    Float_t dR = 999., dZ = 999.;
+    cu->GetEMCALRecoUtils()->GetMatchedResiduals(cluster->GetID(),dR,dZ);
+
+    if(dR < 999) {     
+      
+      if(fhTrackMatchedDEta){
+        fhTrackMatchedDEta->Fill(cluster->E(),dZ);
+        fhTrackMatchedDPhi->Fill(cluster->E(),dR);
+        if(cluster->E() > 0.5)fhTrackMatchedDEtaDPhi->Fill(dZ,dR);
+      }
+      //printf("dR %f, dZ %f \n",dR,dZ);
+      return kTRUE;
+    }
+    else         
+      return kFALSE;
+  }//EMCAL cluster and recalculation of matching on
+  
+  if(fhTrackMatchedDEta){
+    fhTrackMatchedDEta->Fill(cluster->GetTrackDz(),cluster->E());
+    fhTrackMatchedDEta->Fill(cluster->GetTrackDx(),cluster->E());
+    if(cluster->E() > 0.5)fhTrackMatchedDEtaDPhi->Fill(cluster->GetTrackDz(),cluster->GetTrackDx());
   }
+  
+  if(!strcmp("AliESDCaloCluster",Form("%s",cluster->ClassName())))
+  {    
+    if (nMatches > 0) {
+      if (nMatches == 1 ) {
+        Int_t iESDtrack = cluster->GetTrackMatchedIndex();
+        //printf("Track Matched index %d\n",iESDtrack);
+        if(iESDtrack==-1) return kFALSE ;// Default value of array, there is no match
+        else              return kTRUE;
+      }//Just one, check
+      else return kTRUE ;//More than one, there is a match.
+    }// > 0
+    else return kFALSE; //It does not happen, but in case
+    
+  }//ESDs
+  else
+  {    
+    if(nMatches > 0) return kTRUE; //There is at least one match.
+    else             return kFALSE;
+    
+  }//AODs or MC (copy into AOD)
+  
+  return kFALSE;
+  
 }
 
+//__________________________________________________________________________
+Bool_t IsPHOSPhoton(const Double_t l0, const Double_t l1) {
+  // Check the shape of the PHOS cluster
+  // Return true if photon like, from Dmitri P.
+  // TO DO, move parameters to data members
+  
+  Double_t l0Mean  = 1.22 ;
+  Double_t l1Mean  = 2.0  ;
+  Double_t l0Sigma = 0.42 ;
+  Double_t l1Sigma = 0.71 ;
+  Double_t c       =-0.59 ;
+  
+  Double_t R2=(l1-l1Mean)*(l0-l0Mean)/l0Sigma/l0Sigma+(l1-l1Mean)*(l1-l1Mean)/l1Sigma/l1Sigma-c*(l0-l0Mean)*(l1-l1Mean)/l0Sigma/l1Sigma ;
+  
+  return (R2<9.) ;
+  
+}