AnaExample: Bug with handling calo cells corrected

CaloPID: In EMCAL trach matching not used in PID until now, photon and electron weights summed to get the correct photon weight.

diff --git a/PWG4/PartCorrBase/AliCaloPID.cxx b/PWG4/PartCorrBase/AliCaloPID.cxx
index 19b36489682c044c56e73fd4b1648619b564cddf..d124a37d1cd4d0efc21eeee4149fb271badfd504 100755 (executable)
--- a/PWG4/PartCorrBase/AliCaloPID.cxx
+++ b/PWG4/PartCorrBase/AliCaloPID.cxx
@@ -153,11 +153,11 @@ Int_t AliCaloPID::GetPdg(const TString calo, const Double_t * pid, const Float_t
     abort();
   }
   
-  Float_t wPh =  fPHOSPhotonWeight ;
+  Float_t wPh  =  fPHOSPhotonWeight ;
   Float_t wPi0 =  fPHOSPi0Weight ;
-  Float_t wE =  fPHOSElectronWeight ;
-  Float_t wCh =  fPHOSChargeWeight ;
-  Float_t wNe =  fPHOSNeutralWeight ;
+  Float_t wE   =  fPHOSElectronWeight ;
+  Float_t wCh  =  fPHOSChargeWeight ;
+  Float_t wNe  =  fPHOSNeutralWeight ;
   
   
   if(calo == "PHOS" && fPHOSWeightFormula){
@@ -202,9 +202,10 @@ Int_t AliCaloPID::GetPdg(const TString calo, const Double_t * pid, const Float_t
       pdg = kNeutralUnknown ;
   }
   else{//EMCAL
-    if(pid[AliAODCluster::kPhoton]  > wPh) pdg = kPhoton ;
+    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 ;
+    //else if(pid[AliAODCluster::kElectron]  > wE) pdg = kElectron ;
     else if(chargedHadronWeight + neutralHadronWeight > wCh) pdg = kChargedHadron ;  
     else if(neutralHadronWeight + chargedHadronWeight > wNe) pdg = kNeutralHadron ; 
     else pdg =  kNeutralUnknown ;

diff --git a/PWG4/PartCorrDep/AliAnaExample.cxx b/PWG4/PartCorrDep/AliAnaExample.cxx
index b5095521337f63bb69c81bd59c51bbb112a8dd51..cc092a20714296fdd816a76e4f5aa7f3af3a3172 100755 (executable)
--- a/PWG4/PartCorrDep/AliAnaExample.cxx
+++ b/PWG4/PartCorrDep/AliAnaExample.cxx
@@ -262,11 +262,11 @@ void  AliAnaExample::MakeAnalysisFillAOD()
       
       AliESDCaloCells * esdCell = new AliESDCaloCells ;
       if(fDetector == "PHOS") {
-       //ConnectAODPHOSCells(); //Do Only when filling AODCaloCells
+       ConnectAODPHOSCells(); //Do Only when filling AODCaloCells
        esdCell = (AliESDCaloCells *) GetPHOSCells();
       }
       else  {
-       //ConnectAODEMCALCells(); //Do Only when filling AODCaloCells
+       ConnectAODEMCALCells(); //Do Only when filling AODCaloCells
        esdCell = (AliESDCaloCells *) GetEMCALCells();
       }