]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWGHF/hfe/AliAnalysisTaskHFECal.cxx
Fix of sigmaZ for crossing tracklets from Alex
[u/mrichter/AliRoot.git] / PWGHF / hfe / AliAnalysisTaskHFECal.cxx
index bab6827e1d94a699bda52df518cd8d4bdc89fd66..3accdbd995413e1bb1263cf703bdfc55c056b652 100644 (file)
@@ -29,6 +29,8 @@
 #include "TFile.h"
 #include "TGraphErrors.h"
 
+#include "TDatabasePDG.h"
+
 #include "AliAnalysisTask.h"
 #include "AliAnalysisManager.h"
 
@@ -82,6 +84,8 @@
 
 #include "AliCentrality.h"
 
+using namespace std;
+
 ClassImp(AliAnalysisTaskHFECal)
 //________________________________________________________________________
 AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name) 
@@ -91,7 +95,7 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   ,stack(0)
   ,fGeom(0)
   ,fOutputList(0)
-  ,fqahist(1
+  ,fqahist(0
   ,fTrackCuts(0)
   ,fCuts(0)
   ,fIdentifiedAsOutInz(kFALSE)
@@ -103,7 +107,13 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   ,fPID(0)
   ,fPIDqa(0)          
   ,fOpeningAngleCut(0.1)
-  ,fInvmassCut(0.01)   
+  ,fMimpTassCut(0.5)
+  ,fMimNsigassCut(-3)
+  ,fInvmassCut(0)       // no mass
+  ,fSetMassConstraint(kTRUE)
+  ,fSetMassWidthCut(kFALSE)
+  ,fSetMassNonlinear(kFALSE)
+  ,fSetKFpart(kTRUE)
   ,fNoEvents(0)
   ,fEMCAccE(0)
   ,hEMCAccE(0)
@@ -118,6 +128,8 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   ,fInvmassULS(0)              
   ,fInvmassLSmc(0)             
   ,fInvmassULSmc(0)            
+  ,fInvmassLSreco(0)           
+  ,fInvmassULSreco(0)          
   ,fInvmassLSmc0(0)            
   ,fInvmassLSmc1(0)            
   ,fInvmassLSmc2(0)            
@@ -131,13 +143,17 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   ,fPhotoElecPt(0)
   ,fPhoElecPt(0)
   ,fPhoElecPtM20(0)
+  ,fPhoElecPtM20Mass(0)
   ,fSameElecPt(0)
   ,fSameElecPtM20(0)
+  ,fSameElecPtM20Mass(0)
+  ,fSemiElecPtM20(0)
   ,fTrackPtBefTrkCuts(0)        
   ,fTrackPtAftTrkCuts(0)
   ,fTPCnsigma(0)
   ,fCent(0)
   ,fEleInfo(0)
+  ,fElenSigma(0)
   /*
   ,fClsEBftTrigCut(0)   
   ,fClsEAftTrigCut(0)   
@@ -163,8 +179,10 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   ,fIncpTMCM20pho(0)   
   ,fPhoElecPtMC(0)
   ,fPhoElecPtMCM20(0)
+  ,fPhoElecPtMCM20Mass(0)
   ,fSameElecPtMC(0)
   ,fSameElecPtMCM20(0)
+  ,fSameElecPtMCM20Mass(0)
   ,fIncpTMCM20pho_pi0e(0)      
   ,fPhoElecPtMCM20_pi0e(0)
   ,fSameElecPtMCM20_pi0e(0)
@@ -174,8 +192,12 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   ,fIncpTMCpho_pi0e_TPC(0)     
   ,fPhoElecPtMC_pi0e_TPC(0)
   ,fSameElecPtMC_pi0e_TPC(0)
+  ,fIncpTMCpho_eta_TPC(0)      
+  ,fPhoElecPtMC_eta_TPC(0)
+  ,fSameElecPtMC_eta_TPC(0)
   ,CheckNclust(0)
   ,CheckNits(0)
+  ,CheckDCA(0)
   ,Hpi0pTcheck(0)
   ,HETApTcheck(0)
   ,HphopTcheck(0)
@@ -185,7 +207,26 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   ,fMomDtoE(0) 
   ,fLabelCheck(0)
   ,fgeoFake(0)
-  ,ftimingEle(0) 
+  ,fFakeTrk0(0)
+  ,fFakeTrk1(0)
+  ,ftimingEle(0)
+  ,fIncMaxE(0)
+  ,fIncReco(0)
+  ,fPhoReco(0)
+  ,fSamReco(0) 
+  ,fIncRecoMaxE(0)
+  ,fPhoRecoMaxE(0)
+  ,fSamRecoMaxE(0) 
+  ,fPhoVertexReco_HFE(0)
+  ,fPhoVertexReco_EMCal(0)
+  ,fPhoVertexReco_Invmass(0)
+  ,fPhoVertexReco_step0(0)
+  ,fPhoVertexReco_step1(0)
+  ,fMatchV0_0(0)
+  ,fMatchV0_1(0)
+  ,fMatchMC_0(0)
+  ,fMatchMC_1(0)
+  ,fpair(0)
   //,fnSigEtaCorr(NULL)
 {
   //Named constructor
@@ -213,7 +254,7 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   ,stack(0)
   ,fGeom(0)
   ,fOutputList(0)
-  ,fqahist(1)
+  ,fqahist(0)
   ,fTrackCuts(0)
   ,fCuts(0)
   ,fIdentifiedAsOutInz(kFALSE)
@@ -225,7 +266,13 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   ,fPID(0)       
   ,fPIDqa(0)          
   ,fOpeningAngleCut(0.1)
-  ,fInvmassCut(0.01)   
+  ,fMimpTassCut(0.5)
+  ,fMimNsigassCut(-3)
+  ,fInvmassCut(0)       // no mass
+  ,fSetMassConstraint(kTRUE)
+  ,fSetMassWidthCut(kFALSE)
+  ,fSetMassNonlinear(kFALSE)
+  ,fSetKFpart(kTRUE)
   ,fNoEvents(0)
   ,fEMCAccE(0)
   ,hEMCAccE(0)
@@ -240,6 +287,8 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   ,fInvmassULS(0)              
   ,fInvmassLSmc(0)             
   ,fInvmassULSmc(0)            
+  ,fInvmassLSreco(0)           
+  ,fInvmassULSreco(0)          
   ,fInvmassLSmc0(0)            
   ,fInvmassLSmc1(0)            
   ,fInvmassLSmc2(0)            
@@ -253,13 +302,17 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   ,fPhotoElecPt(0)
   ,fPhoElecPt(0)
   ,fPhoElecPtM20(0)
+  ,fPhoElecPtM20Mass(0)
   ,fSameElecPt(0)
   ,fSameElecPtM20(0)
+  ,fSameElecPtM20Mass(0)
+  ,fSemiElecPtM20(0)
   ,fTrackPtBefTrkCuts(0)        
   ,fTrackPtAftTrkCuts(0)                 
   ,fTPCnsigma(0)
   ,fCent(0)
   ,fEleInfo(0)
+  ,fElenSigma(0)
   /*
   ,fClsEBftTrigCut(0)   
   ,fClsEAftTrigCut(0)   
@@ -285,8 +338,10 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   ,fIncpTMCM20pho(0)   
   ,fPhoElecPtMC(0)
   ,fPhoElecPtMCM20(0)
+  ,fPhoElecPtMCM20Mass(0)
   ,fSameElecPtMC(0)
   ,fSameElecPtMCM20(0)
+  ,fSameElecPtMCM20Mass(0)
   ,fIncpTMCM20pho_pi0e(0)      
   ,fPhoElecPtMCM20_pi0e(0)
   ,fSameElecPtMCM20_pi0e(0)
@@ -296,8 +351,12 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   ,fIncpTMCpho_pi0e_TPC(0)     
   ,fPhoElecPtMC_pi0e_TPC(0)
   ,fSameElecPtMC_pi0e_TPC(0)
+  ,fIncpTMCpho_eta_TPC(0)      
+  ,fPhoElecPtMC_eta_TPC(0)
+  ,fSameElecPtMC_eta_TPC(0)
   ,CheckNclust(0)
   ,CheckNits(0)
+  ,CheckDCA(0)
   ,Hpi0pTcheck(0)
   ,HETApTcheck(0)
   ,HphopTcheck(0)
@@ -307,7 +366,26 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   ,fMomDtoE(0)
   ,fLabelCheck(0)
   ,fgeoFake(0)
+  ,fFakeTrk0(0)
+  ,fFakeTrk1(0)
   ,ftimingEle(0)
+  ,fIncMaxE(0)
+  ,fIncReco(0)
+  ,fPhoReco(0)
+  ,fSamReco(0)
+  ,fIncRecoMaxE(0)
+  ,fPhoRecoMaxE(0)
+  ,fSamRecoMaxE(0)
+  ,fPhoVertexReco_HFE(0)
+  ,fPhoVertexReco_EMCal(0)
+  ,fPhoVertexReco_Invmass(0)
+  ,fPhoVertexReco_step0(0)
+  ,fPhoVertexReco_step1(0)
+  ,fMatchV0_0(0)
+  ,fMatchV0_1(0)
+  ,fMatchMC_0(0)
+  ,fMatchMC_1(0)
+  ,fpair(0)
   //,fnSigEtaCorr(NULL)
 {
        //Default constructor
@@ -397,8 +475,6 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
       mcphoinfo[0] = cent;
       mcphoinfo[1] = pTMC;
       mcphoinfo[2] = iHijing;
-      //if(fPDG==111)Hpi0pTcheck->Fill(pTMC,iHijing);
-      //if(fPDG==221)HETApTcheck->Fill(pTMC,iHijing);
       if(fPDG==111)Hpi0pTcheck->Fill(mcphoinfo);
       if(fPDG==221)HETApTcheck->Fill(mcphoinfo);
       if(fabs(fPDG)==411 || fabs(fPDG)==413 || fabs(fPDG)==421 || fabs(fPDG)==423 || fabs(fPDG)==431)HDpTcheck->Fill(pTMC,iHijing);
@@ -459,9 +535,6 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
   
   fCFM->SetRecEventInfo(fESD);
   
-  //Float_t cent = -1.;
-  //AliCentrality *centrality = fESD->GetCentrality(); 
-  //cent = centrality->GetCentralityPercentile("V0M");
   fCent->Fill(cent);
   
   //if(cent>90.) return;
@@ -471,6 +544,7 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
    FindTriggerClusters();
 
   // make EMCAL array 
+  double maxE = 0.0;
   for(Int_t iCluster=0; iCluster<fESD->GetNumberOfCaloClusters(); iCluster++)
      {
       AliESDCaloCluster *clust = fESD->GetCaloCluster(iCluster);
@@ -485,9 +559,8 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
          double calInfo[5];
          calInfo[0] = emcphi; calInfo[1] = emceta; calInfo[2] = clustE; calInfo[3] = cent; calInfo[4] = clust->Chi2(); 
          //fEMCAccE->Fill(calInfo); 
-         //if(clustE>3.0)fEMCAccE->Fill(calInfo); 
-         //if(fqahist==1 && clustE>1.5)fEMCAccE->Fill(calInfo); 
          hEMCAccE->Fill(cent,clustE); 
+         if(clustE>maxE)maxE = clustE; 
         }
    }
 
@@ -499,6 +572,8 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
       continue;
     }
    
+    //--- Get MC informtion
+
     int parentlabel = 99999;
     int parentPID = 99999;
     int grand_parentlabel = 99999;
@@ -513,6 +588,7 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
     double mcMompT = 0.0;
     //double mcGrandMompT = 0.0;
     double mcWeight = -10.0;
+    double conv_proR = -1.0;
 
     int iHijing = 1;
     int mcLabel = -1;
@@ -531,6 +607,7 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
               TParticle* particle = stack->Particle(label);
               int mcpid = particle->GetPdgCode();
               mcpT = particle->Pt();
+               conv_proR = particle->R();
               //printf("MCpid = %d",mcpid);
               if(particle->GetFirstMother()>-1)
               {
@@ -636,15 +713,29 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
  
        } // end of mcLabel>-1
 
-      } // end of MC info.
+      } // <------ end of MC info.
  
     //cout << "Pi0 = " << mcOrgPi0 << " ; Eta = " << mcOrgEta << endl; 
     //printf("weight = %f\n",mcWeight);
 
     if(TMath::Abs(track->Eta())>0.6) continue;
-    if(TMath::Abs(track->Pt()<2.0)) continue;
+    //if(TMath::Abs(track->Pt()<2.5)) continue;
+    if(TMath::Abs(track->Pt()<0.1)) continue;
     
+    int nITS = track->GetNcls(0);
+
     fTrackPtBefTrkCuts->Fill(track->Pt());             
+
+    /*
+    UChar_t itsPixel = track->GetITSClusterMap();
+    cout << "nITS = " << nITS << endl;
+    if(itsPixel & BIT(0))cout << "1st layer hit" << endl;
+    if(itsPixel & BIT(1))cout << "2nd layer hit" << endl;
+    if(itsPixel & BIT(2))cout << "3rd layer hit" << endl;
+    if(itsPixel & BIT(3))cout << "4th layer hit" << endl;
+    if(itsPixel & BIT(4))cout << "5th layer hit" << endl;
+    */
+
     // RecKine: ITSTPC cuts  
     if(!ProcessCutStep(AliHFEcuts::kStepRecKineITSTPC, track)) continue;
     
@@ -662,47 +753,56 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
     // HFE cuts: TPC PID cleanup
     if(!ProcessCutStep(AliHFEcuts::kStepHFEcutsTPC, track)) continue;
 
+    if(mcPho && iHijing==0)fPhoVertexReco_step0->Fill(track->Pt(),conv_proR); // check MC vertex
+    if(mcPho && iHijing==1)fPhoVertexReco_step1->Fill(track->Pt(),conv_proR); // check MC vertex
+
     int nTPCcl = track->GetTPCNcls();
     //int nTPCclF = track->GetTPCNclsF(); // warnings
-    int nITS = track->GetNcls(0);
-    
+    //int nITS = track->GetNcls(0);
+   
+    if(mcPho && iHijing==1)fPhoVertexReco_HFE->Fill(track->Pt(),conv_proR); // check MC vertex
     fTrackPtAftTrkCuts->Fill(track->Pt());             
     
     Double_t mom = -999., eop=-999., pt = -999., dEdx=-999., fTPCnSigma=-10, phi=-999., eta=-999.;
     pt = track->Pt();
-    if(pt<2.0)continue;
-    
-    // Track extrapolation
+    if(pt<2.5)continue;
+    if(pt<0.1)continue;
     
-    Int_t charge = track->Charge();
+    //Int_t charge = track->Charge();
     fTrkpt->Fill(pt);
     mom = track->P();
     phi = track->Phi();
     eta = track->Eta();
+    float dca_xy;
+    float dca_z;
+    track->GetImpactParameters(dca_xy,dca_z);
+
     dEdx = track->GetTPCsignal();
     fTPCnSigma = fPID->GetPIDResponse() ? fPID->GetPIDResponse()->NumberOfSigmasTPC(track, AliPID::kElectron) : 1000;
 
     //cout << "nSigma correctoon-----" << endl;
     //cout << "org = " << fTPCnSigma << endl; 
+    /*
     if(!fmcData) // nsigma eta correction
        {
         double nSigexpCorr = NsigmaCorrection(eta,cent);
         fTPCnSigma -= nSigexpCorr;
        }
-
+    */
     //cout << "correction = " << fTPCnSigma << endl; 
 
+    //--- track cluster match
+
         double ncells = -1.0;
         double m20 = -1.0;
         double m02 = -1.0;
         double disp = -1.0;
         double rmatch = -1.0;  
         double nmatch = -1.0;
-        double oppstatus = 0.0;
+        //double oppstatus = 0.0;
         double emctof = 0.0;
-
-    Bool_t fFlagPhotonicElec = kFALSE;
-    Bool_t fFlagConvinatElec = kFALSE;
+        Bool_t MaxEmatch = kFALSE;
 
     Int_t clsId = track->GetEMCALcluster();
     if (clsId>0){
@@ -710,14 +810,8 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
       if(clust && clust->IsEMCAL()){
 
                double clustE = clust->E();
+                if(clustE==maxE)MaxEmatch = kTRUE;
                 eop = clustE/fabs(mom);
-                 //cout << "eop org = "<< eop << endl;
-                if(mcLabel>-1.0)
-                  {
-                   double mceopcorr = MCEopMeanCorrection(pt,cent);
-                   eop += mceopcorr;
-                  }
-                //cout << "eop corr = " << eop << endl;
 
                 //double clustT = clust->GetTOF();
                 ncells = clust->GetNCells();
@@ -730,57 +824,57 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
                nmatch = clust->GetNTracksMatched();
                 emctof = clust->GetTOF();
                 //cout << "emctof = " << emctof << endl;
-
-               if(fTPCnSigma>-1.5 && fTPCnSigma<3.0)
-               {
-                 SelectPhotonicElectron(iTracks,cent,track,fFlagPhotonicElec,fFlagConvinatElec,fTPCnSigma,m20,eop,mcele,mcWeight,iHijing,mcOrgPi0,mcOrgEta);
-               }
-               if(fFlagPhotonicElec)oppstatus = 1.0;
-               if(fFlagConvinatElec)oppstatus = 2.0;
-               if(fFlagPhotonicElec && fFlagConvinatElec)oppstatus = 3.0;
+                cout << "eop org = "<< eop << endl;
+                double eoporg =  eop;
+                if(fmcData)
+                  {
+                   double mceopcorr = MCEopMeanCorrection(pt,cent);
+                   eop += mceopcorr;
+                  }
+                cout << "eop corr = " << eop << endl;
 
                  double valdedx[16];
                  valdedx[0] = pt; valdedx[1] = nITS; valdedx[2] = phi; valdedx[3] = eta; valdedx[4] = fTPCnSigma;
-                 //valdedx[5] = eop; valdedx[6] = rmatch; valdedx[7] = ncells,  valdedx[8] = nTPCclF; valdedx[9] = m20; valdedx[10] = mcpT;
-                 valdedx[5] = eop; valdedx[6] = rmatch; valdedx[7] = ncells,  valdedx[8] = nmatch; valdedx[9] = m20; valdedx[10] = mcpT;
-                 valdedx[11] = cent; valdedx[12] = charge; valdedx[13] = oppstatus; valdedx[14] = nTPCcl;
+                 valdedx[5] = eop; valdedx[6] = rmatch; valdedx[7] = dca_xy,  valdedx[8] = dca_z; valdedx[9] = m20; valdedx[10] = mcpT;
+                 valdedx[11] = cent; valdedx[12] = dEdx; valdedx[13] = eoporg; valdedx[14] = nTPCcl;
                   valdedx[15] = mcele;
-                  if(fqahist==1)fEleInfo->Fill(valdedx);
-                 
+                  fEleInfo->Fill(valdedx);
 
       }
     }
-     
+
+    //Get Cal info PID response
+    /*
+    double eop2;
+    double ss[4];
+    Double_t nSigmaEop = fPID->GetPIDResponse()->NumberOfSigmasEMCAL(track,AliPID::kElectron,eop2,ss);
+    if(fTPCnSigma>-1.5 && fTPCnSigma<3.0 && nITS>2.5 && nTPCcl>100)
+      {
+       double valEop[3];
+       valEop[0] = cent;
+       valEop[1] = pt;
+       valEop[2] = nSigmaEop;
+       fElenSigma->Fill(valEop);
+      }
+    */
+   // --- tarck cut & e ID 
+
     if(nITS<2.5)continue;
     if(nTPCcl<100)continue;
    
     CheckNclust->Fill(nTPCcl); 
     CheckNits->Fill(nITS); 
+    CheckDCA->Fill(dca_xy,dca_z); 
+    // check production vertex of photons
+
 
     fdEdxBef->Fill(mom,fTPCnSigma);
     fTPCnsigma->Fill(mom,fTPCnSigma);
     if(fTPCnSigma >= -1.0 && fTPCnSigma <= 3)fTrkEovPBef->Fill(pt,eop);
 
-    Int_t pidpassed = 1;
-    // check reco eff. with TPC
+    //--- track accepted by HFE
 
-    double phoval[5];
-    phoval[0] = cent;
-    phoval[1] = pt;
-    phoval[2] = fTPCnSigma;
-    phoval[3] = iHijing;
-    phoval[4] = mcMompT;
-   
-    if((fTPCnSigma >= -1.0 && fTPCnSigma <= 3) && mcele>0 && mcPho && mcOrgPi0)
-      {
-        if(iHijing==1)mcWeight = 1.0; 
-        fIncpTMCpho_pi0e_TPC->Fill(phoval,mcWeight);    
-        if(fFlagPhotonicElec) fPhoElecPtMC_pi0e_TPC->Fill(phoval,mcWeight);
-        if(fFlagConvinatElec) fSameElecPtMC_pi0e_TPC->Fill(phoval,mcWeight);
-      }
-
-    //--- track accepted
+    Int_t pidpassed = 1;
     AliHFEpidObject hfetrack;
     hfetrack.SetAnalysisType(AliHFEpidObject::kESDanalysis);
     hfetrack.SetRecTrack(track);
@@ -801,8 +895,62 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
     hfetrack.SetPbPb();
     if(!fPID->IsSelected(&hfetrack, NULL, "", fPIDqa)) pidpassed = 0;
 
-    if(pidpassed==0) continue;
-    
+    if(pidpassed==0) continue; // nSigma rejection
+    //--- photonic ID
+
+    Bool_t fFlagPhotonicTPC = kFALSE;
+    Bool_t fFlagConvinatTPC = kFALSE;
+    SelectPhotonicElectron(iTracks,cent,track,fFlagPhotonicTPC,fFlagConvinatTPC,fTPCnSigma,m20,eop,mcele,mcWeight,iHijing,mcOrgPi0,mcOrgEta,0);
+
+    //--- check reco eff. with TPC
+    double phoval[5];
+    phoval[0] = cent;
+    phoval[1] = pt;
+    phoval[2] = fTPCnSigma;
+    phoval[3] = iHijing;
+    phoval[4] = mcMompT;
+   
+    if((fTPCnSigma >= -5.0 && fTPCnSigma <= 5) && (mcOrgPi0 || mcOrgEta))
+      {
+        if(iHijing==1)mcWeight = 1.0; 
+        if(mcOrgPi0)
+          {
+           fIncpTMCpho_pi0e_TPC->Fill(phoval,mcWeight);    
+           if(fFlagPhotonicTPC) fPhoElecPtMC_pi0e_TPC->Fill(phoval,mcWeight);
+           if(fFlagConvinatTPC) fSameElecPtMC_pi0e_TPC->Fill(phoval,mcWeight);
+          }
+        if(mcOrgEta)
+          {
+           fIncpTMCpho_eta_TPC->Fill(phoval,mcWeight);    
+           if(fFlagPhotonicTPC) fPhoElecPtMC_eta_TPC->Fill(phoval,mcWeight);
+           if(fFlagConvinatTPC) fSameElecPtMC_eta_TPC->Fill(phoval,mcWeight);
+          }
+      }
+
+    //--- matching check
+    double emcphimim = 1.396;
+    double emcphimax = 3.14;
+    if(phi>emcphimim && phi<emcphimax)
+      {
+       if(fFlagPhotonicTPC)fMatchV0_0->Fill(pt);  // data  
+       if(mcele>2.1)fMatchMC_0->Fill(pt,mcWeight); // MC  
+
+       if(eop>=0.0) // have a match
+         {
+          if(fFlagPhotonicTPC)fMatchV0_1->Fill(pt);   
+          if(mcele>2.1)fMatchMC_1->Fill(pt,mcWeight);   
+         }
+      }
+
+    //+++++++  E/p cut ++++++++++++++++   
+   
+    if(eop<0.9 || eop>1.3)continue;
+    Bool_t fFlagPhotonicElec = kFALSE;
+    Bool_t fFlagConvinatElec = kFALSE;
+    SelectPhotonicElectron(iTracks,cent,track,fFlagPhotonicElec,fFlagConvinatElec,fTPCnSigma,m20,eop,mcele,mcWeight,iHijing,mcOrgPi0,mcOrgEta,1);
+  
     fTrkEovPAft->Fill(pt,eop);
     fdEdxAft->Fill(mom,fTPCnSigma);
 
@@ -817,27 +965,32 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
        ftimingEle->Fill(pt,emctof); 
        if(fFlagPhotonicElec) fPhoElecPtM20->Fill(cent,pt);
        if(fFlagConvinatElec) fSameElecPtM20->Fill(cent,pt);
+       if(!fFlagPhotonicElec) fSemiElecPtM20->Fill(cent,pt);
      }
     
     // MC
     // check label for electron candidiates
-
     int idlabel = 1;
     if(mcLabel==0)idlabel = 0;
     fLabelCheck->Fill(pt,idlabel);
     if(mcLabel==0)fgeoFake->Fill(phi,eta);
 
-    if(mcele>0) // select MC electrons
+    if(mcLabel<0 && m20>0.0 && m20<0.3 && fTPCnSigma>-1 && fTPCnSigma<3)
+       {
+        fFakeTrk0->Fill(cent,pt);
+       }
+
+    if(mcele>-1) // select MC electrons
       {
 
           fIncpTMChfeAll->Fill(cent,pt);    
           if(m20>0.0 && m20<0.3)fIncpTMCM20hfeAll->Fill(cent,pt);    
+          if(m20>0.0 && m20<0.3 && fTPCnSigma>-1 && fTPCnSigma<3)fFakeTrk1->Fill(cent,pt);
 
        if(mcBtoE || mcDtoE) // select B->e & D->e
          {
           fIncpTMChfe->Fill(cent,pt);    
-          //if(m20>0.0 && m20<0.3)fIncpTMCM20hfe->Fill(cent,pt);    
-          //if(m20>0.0 && m20<0.3)fIncpTMCM20hfeCheck->Fill(cent,mcpT);    
           if(m20>0.0 && m20<0.3)
             {
                 //cout << "MC label = " << mcLabel << endl;
@@ -868,20 +1021,20 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
                   fIncpTMCM20pho_pi0e->Fill(phoval,mcWeight);    
                   if(fFlagPhotonicElec) fPhoElecPtMCM20_pi0e->Fill(phoval,mcWeight);
                   if(fFlagConvinatElec) fSameElecPtMCM20_pi0e->Fill(phoval,mcWeight);
-                  //fIncpTMCM20pho_pi0e->Fill(phoval);   // v5-04-02-AN & v5-04-06-AN 
-                  //if(fFlagPhotonicElec) fPhoElecPtMCM20_pi0e->Fill(phoval);
-                  //if(fFlagConvinatElec) fSameElecPtMCM20_pi0e->Fill(phoval);
-                 }
+                 
+                  // check production vertex
+                  fPhoVertexReco_EMCal->Fill(track->Pt(),conv_proR);
+                  if(fFlagPhotonicElec)fPhoVertexReco_Invmass->Fill(track->Pt(),conv_proR);
+
+                  }
+               // --- eta
                if(mcOrgEta)
                  {
                   fIncpTMCM20pho_eta->Fill(phoval,mcWeight);    
                   if(fFlagPhotonicElec) fPhoElecPtMCM20_eta->Fill(phoval,mcWeight);
                   if(fFlagConvinatElec) fSameElecPtMCM20_eta->Fill(phoval,mcWeight);
-                  //fIncpTMCM20pho_eta->Fill(phoval);    
-                  //if(fFlagPhotonicElec) fPhoElecPtMCM20_eta->Fill(phoval);
-                  //if(fFlagConvinatElec) fSameElecPtMCM20_eta->Fill(phoval);
                  }
-               // --- eta
+                // check production vertex
               }
            }
         } 
@@ -920,7 +1073,7 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   if(!fPID->GetNumberOfPIDdetectors()) 
     {
       fPID->AddDetector("TPC", 0);
-      fPID->AddDetector("EMCAL", 1);
+      //fPID->AddDetector("EMCAL", 1); <--- apply PID selection in task
     }
   
   Double_t params[4];
@@ -949,12 +1102,15 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fCuts->SetTPCmodes(AliHFEextraCuts::kFound, AliHFEextraCuts::kFoundOverFindable);
   //fCuts->SetMinNClustersITS(3);
   fCuts->SetMinNClustersITS(2);
+  fCuts->SetProductionVertex(0,50,0,50);
   fCuts->SetCutITSpixel(AliHFEextraCuts::kAny);
   fCuts->SetCheckITSLayerStatus(kFALSE);
   fCuts->SetVertexRange(10.);
   fCuts->SetTOFPIDStep(kFALSE);
-  fCuts->SetPtRange(2, 50);
-  fCuts->SetMaxImpactParam(3.,3.);
+  //fCuts->SetPtRange(2, 50);
+  fCuts->SetPtRange(0.1, 50);
+  //fCuts->SetMaxImpactParam(3.,3.);
+  fCuts->SetMaxImpactParam(2.4,3.2); // standard in 2011
 
   //--------Initialize correction Framework and Cuts
   fCFM = new AliCFManager;
@@ -982,7 +1138,7 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   Double_t xminE[5] = {1.0,  -1,   0.0,   0, -0.5}; 
   Double_t xmaxE[5] = {3.5,   1, 100.0, 100,  9.5}; 
   fEMCAccE = new THnSparseD("fEMCAccE","EMC acceptance & E;#eta;#phi;Energy;Centrality;trugCondition;",5,binsE,xminE,xmaxE);
-  if(fqahist==1)fOutputList->Add(fEMCAccE);
+  //if(fqahist==1)fOutputList->Add(fEMCAccE);
 
   hEMCAccE = new TH2F("hEMCAccE","Cluster Energy",200,0,100,100,0,20);
   fOutputList->Add(hEMCAccE);
@@ -1017,9 +1173,9 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fIncpTM20 = new TH2F("fIncpTM20","HFE pid electro vs. centrality with M20",200,0,100,100,0,50);
   fOutputList->Add(fIncpTM20);
   
-  Int_t nBinspho[9] =  { 200, 100, 500, 12,   50,    4, 200,   8, 100};
-  Double_t minpho[9] = {  0.,  0.,  0., -2.5,  0, -0.5,   0,-1.5,   0};   
-  Double_t maxpho[9] = {100., 50., 0.5, 3.5,   1,  3.5,   2, 6.5,  50};   
+  Int_t nBinspho[9] =  { 10,  30,   600, 60,   50,    4,  40,   8,  30};
+  Double_t minpho[9] = {  0.,  0., -0.1, 40,  0, -0.5,   0,-1.5,   0};   
+  Double_t maxpho[9] = {100., 30.,  0.5, 100,   1,  3.5,   2, 6.5,  30};   
 
   fInvmassLS = new THnSparseD("fInvmassLS", "Inv mass of LS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2); nSigma; angle; m20cut; eop; Mcele;", 9, nBinspho,minpho, maxpho);
   if(fqahist==1)fOutputList->Add(fInvmassLS);
@@ -1033,35 +1189,43 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fInvmassULSmc = new THnSparseD("fInvmassULSmc", "Inv mass of ULS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2); nSigma; angle; m20cut; eop; MCele", 9, nBinspho,minpho, maxpho);
   if(fqahist==1)fOutputList->Add(fInvmassULSmc);
 
-  fInvmassLSmc0 = new TH2D("fInvmassLSmc0", "Inv mass of LS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,500,0,0.5 );
+  fInvmassLSreco = new TH2D("fInvmassLSreco", "Inv mass of LS (e,e) reco; cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,600,-0.1,0.5 );
+  fInvmassLSreco->Sumw2();
+  fOutputList->Add(fInvmassLSreco);
+
+  fInvmassULSreco = new TH2D("fInvmassULSreco", "Inv mass of ULS (e,e) reco; cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,600,-0.1,0.5 );
+  fInvmassULSreco->Sumw2();
+  fOutputList->Add(fInvmassULSreco);
+
+  fInvmassLSmc0 = new TH2D("fInvmassLSmc0", "Inv mass of LS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,600,-0.1,0.5 );
   fInvmassLSmc0->Sumw2();
   fOutputList->Add(fInvmassLSmc0);
   
-  fInvmassLSmc1 = new TH2D("fInvmassLSmc1", "Inv mass of LS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,500,0,0.5 );
+  fInvmassLSmc1 = new TH2D("fInvmassLSmc1", "Inv mass of LS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,600,-0.1,0.5 );
   fInvmassLSmc1->Sumw2();
   fOutputList->Add(fInvmassLSmc1);
 
-  fInvmassLSmc2 = new TH2D("fInvmassLSmc2", "Inv mass of LS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,500,0,0.5 );
+  fInvmassLSmc2 = new TH2D("fInvmassLSmc2", "Inv mass of LS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,600,-0.1,0.5 );
   fInvmassLSmc2->Sumw2();
   fOutputList->Add(fInvmassLSmc2);
 
-  fInvmassLSmc3 = new TH2D("fInvmassLSmc3", "Inv mass of LS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,500,0,0.5 );
+  fInvmassLSmc3 = new TH2D("fInvmassLSmc3", "Inv mass of LS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,600,-0.1,0.5 );
   fInvmassLSmc3->Sumw2();
   fOutputList->Add(fInvmassLSmc3);
 
-  fInvmassULSmc0 = new TH2D("fInvmassULSmc0", "Inv mass of ULS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,500,0,0.5 );
+  fInvmassULSmc0 = new TH2D("fInvmassULSmc0", "Inv mass of ULS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,600,-0.1,0.5 );
   fInvmassULSmc0->Sumw2();
   fOutputList->Add(fInvmassULSmc0);
 
-  fInvmassULSmc1 = new TH2D("fInvmassULSmc1", "Inv mass of ULS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,500,0,0.5 );
+  fInvmassULSmc1 = new TH2D("fInvmassULSmc1", "Inv mass of ULS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,600,-0.1,0.5 );
   fInvmassULSmc1->Sumw2();
   fOutputList->Add(fInvmassULSmc1);
 
-  fInvmassULSmc2 = new TH2D("fInvmassULSmc2", "Inv mass of ULS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,500,0,0.5 );
+  fInvmassULSmc2 = new TH2D("fInvmassULSmc2", "Inv mass of ULS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,600,-0.1,0.5 );
   fInvmassULSmc2->Sumw2();
   fOutputList->Add(fInvmassULSmc2);
 
-  fInvmassULSmc3 = new TH2D("fInvmassULSmc3", "Inv mass of ULS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,500,0,0.5 );
+  fInvmassULSmc3 = new TH2D("fInvmassULSmc3", "Inv mass of ULS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2)",20,0,20,600,-0.1,0.5 );
   fInvmassULSmc3->Sumw2();
   fOutputList->Add(fInvmassULSmc3);
 
@@ -1080,27 +1244,46 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fPhoElecPtM20 = new TH2F("fPhoElecPtM20", "Pho-inclusive electron pt with M20",200,0,100,100,0,50);
   fOutputList->Add(fPhoElecPtM20);
 
+  fPhoElecPtM20Mass = new TH2F("fPhoElecPtM20Mass", "Pho-inclusive electron pt with M20 Mass",200,0,100,100,0,50);
+  fPhoElecPtM20Mass->Sumw2();
+  fOutputList->Add(fPhoElecPtM20Mass);
+
   fSameElecPt = new TH2F("fSameElecPt", "Same-inclusive electron pt",200,0,100,100,0,50);
   fOutputList->Add(fSameElecPt);
 
   fSameElecPtM20 = new TH2F("fSameElecPtM20", "Same-inclusive electron pt with M20",200,0,100,100,0,50);
   fOutputList->Add(fSameElecPtM20);
 
+  fSameElecPtM20Mass = new TH2F("fSameElecPtM20Mass", "Same-inclusive electron pt with M20 Mass",200,0,100,100,0,50);
+  fSameElecPtM20Mass->Sumw2();
+  fOutputList->Add(fSameElecPtM20Mass);
+
+  fSemiElecPtM20 = new TH2F("fSemiElecPtM20", "Semi-inclusive electron pt with M20",200,0,100,100,0,50);
+  fOutputList->Add(fSemiElecPtM20);
+
   fCent = new TH1F("fCent","Centrality",200,0,100) ;
   fOutputList->Add(fCent);
  
   // Make common binning
   const Double_t kMinP = 0.;
-  const Double_t kMaxP = 50.;
-  //const Double_t kTPCSigMim = 40.;
-  //const Double_t kTPCSigMax = 140.;
+  const Double_t kMaxP = 20.;
+
+  //+++ 1st histogram: TPC dEdx with/without EMCAL (p, pT, TPC Signal, phi, eta,  Sig,  e/p,  ,match, cell, M02, M20, Disp, Centrality, select)
+  // 1st histogram: TPC dEdx with/without EMCAL (p, pT, TPC Signal, phi, eta,  Sig,  e/p,  ,match, dca_xy, dca_z, M20, Disp, Centrality, select)
+  Int_t nBins[16] =  {  100,     7,  60,    20,    90,  100,   25,     60,    60,  100,    40,  10,  250,  100, 100,    8};
+  Double_t min[16] = {kMinP,  -0.5, 1.0,  -1.0,  -5.0,    0,    0,   -3.0,  -3.0,  0.0,   0.0,   0,    0,    0,  80, -1.5};
+  Double_t max[16] = {kMaxP,   6.5, 4.0,   1.0,   4.0,  2.0, 0.05,    3.0,   3.0,  1.0,  20.0, 100,  100,  2.0, 180,  6.5};
+  //fEleInfo = new THnSparseD("fEleInfo", "Electron Info; pT [GeV/c]; TPC signal;phi;eta;nSig; E/p;Rmatch;Ncell;clsF;M20;mcpT;Centrality;charge;opp;same;trigCond;MCele", 16, nBins, min, max);
+  fEleInfo = new THnSparseD("fEleInfo", "Electron Info; pT [GeV/c]; TPC signal;phi;eta;nSig; E/p;Rmatch;DCA_xy;DCA_z;M20;mcpT;Centrality;charge;opp;same;trigCond;MCele", 16, nBins, min, max);
+  //if(fqahist==1)fOutputList->Add(fEleInfo);
+
+  // Make common binning
+  Int_t nBinsEop[3] =  { 10, 50, 100};
+  Double_t minEop[3] = {  0,  0,  -5};
+  Double_t maxEop[3] = {100, 50,   5};
+  fElenSigma= new THnSparseD("fElenSigma", "Electron nSigma; cent; pT [GeV/c]; nSigma", 3, nBinsEop, minEop, maxEop);
+  fOutputList->Add(fElenSigma);
 
-  // 1st histogram: TPC dEdx with/without EMCAL (p, pT, TPC Signal, phi, eta,  Sig,  e/p,  ,match, cell, M02, M20, Disp, Centrality, select)
-  Int_t nBins[16] =  {  250,    10,   60,    20,   100,  300,  50,   40,   200, 200,  250, 200,    3,    5, 100,    8};
-  Double_t min[16] = {kMinP,  -0.5, 1.0,  -1.0,  -6.0,    0,   0,    0,   0.0, 0.0,  0.0,   0, -1.5, -0.5,  80, -1.5};
-  Double_t max[16] = {kMaxP,   9.5, 4.0,   1.0,   4.0,  3.0, 0.1,   40,   200, 2.0, 50.0, 100,  1.5,  4.5, 180,  6.5};
-  fEleInfo = new THnSparseD("fEleInfo", "Electron Info; pT [GeV/c]; TPC signal;phi;eta;nSig; E/p;Rmatch;Ncell;clsF;M20;mcpT;Centrality;charge;opp;same;trigCond;MCele", 16, nBins, min, max);
-  if(fqahist==1)fOutputList->Add(fEleInfo);
 
   //<---  Trigger info
   /*
@@ -1179,12 +1362,18 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fPhoElecPtMCM20 = new THnSparseD("fPhoElecPtMCM20", "MC Pho-inclusive electron pt with M20",5,nBinspho2,minpho2,maxpho2);
   fOutputList->Add(fPhoElecPtMCM20);
 
+  fPhoElecPtMCM20Mass = new TH2D("fPhoElecPtMCM20Mass", "MC Pho-inclusive electron pt with M20 Mass",200,0,100,100,0,50);
+  fOutputList->Add(fPhoElecPtMCM20Mass);
+
   fSameElecPtMC = new THnSparseD("fSameElecPtMC", "MC Same-inclusive electron pt",5,nBinspho2,minpho2,maxpho2);
   fOutputList->Add(fSameElecPtMC);
 
   fSameElecPtMCM20 = new THnSparseD("fSameElecPtMCM20", "MC Same-inclusive electron pt with M20",5,nBinspho2,minpho2,maxpho2);
   fOutputList->Add(fSameElecPtMCM20);
 
+  fSameElecPtMCM20Mass = new TH2D("fSameElecPtMCM20Mass", "MC Same-inclusive electron pt with M20 Mass",200,0,100,100,0,50);
+  fOutputList->Add(fSameElecPtMCM20Mass);
+
   fIncpTMCM20pho_pi0e = new THnSparseD("fIncpTMCM20pho_pi0e","MC Pho pi0->e pid electro vs. centrality with M20",5,nBinspho2,minpho2,maxpho2);
   fIncpTMCM20pho_pi0e->Sumw2();
   fOutputList->Add(fIncpTMCM20pho_pi0e);
@@ -1220,6 +1409,20 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fSameElecPtMC_pi0e_TPC = new THnSparseD("fSameElecPtMC_pi0e_TPC", "MC Same-inclusive electron pt pi0->e",5,nBinspho2,minpho2,maxpho2);
   fSameElecPtMC_pi0e_TPC->Sumw2();
   fOutputList->Add(fSameElecPtMC_pi0e_TPC);
+
+  fIncpTMCpho_eta_TPC = new THnSparseD("fIncpTMCpho_eta_TPC","MC Pho pi0->e pid electro vs. centrality with M20",5,nBinspho2,minpho2,maxpho2);
+  fIncpTMCpho_eta_TPC->Sumw2();
+  fOutputList->Add(fIncpTMCpho_eta_TPC);
+
+  fPhoElecPtMC_eta_TPC = new THnSparseD("fPhoElecPtMC_eta_TPC", "MC Pho-inclusive electron pt with  pi0->e",5,nBinspho2,minpho2,maxpho2);
+  fPhoElecPtMC_eta_TPC->Sumw2();
+  fOutputList->Add(fPhoElecPtMC_eta_TPC);
+
+  fSameElecPtMC_eta_TPC = new THnSparseD("fSameElecPtMC_eta_TPC", "MC Same-inclusive electron pt pi0->e",5,nBinspho2,minpho2,maxpho2);
+  fSameElecPtMC_eta_TPC->Sumw2();
+  fOutputList->Add(fSameElecPtMC_eta_TPC);
+
+
   //-------------
 
   CheckNclust = new TH1D("CheckNclust","cluster check",200,0,200);
@@ -1227,6 +1430,9 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
 
   CheckNits = new TH1D("CheckNits","ITS cluster check",8,-0.5,7.5);
   fOutputList->Add(CheckNits);
+
+  CheckDCA = new TH2D("CheckDCA","DCA check",200,-5,5,200,-5,5);
+  fOutputList->Add(CheckDCA);
   /*
   Hpi0pTcheck = new TH2D("Hpi0pTcheck","Pi0 pT from Hijing",100,0,50,3,-0.5,2.5);
   fOutputList->Add(Hpi0pTcheck);
@@ -1267,6 +1473,12 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fgeoFake = new TH2D("fgeoFake","Label==0 eta and phi",628,0,6.28,200,-1,1);
   fOutputList->Add(fgeoFake);
 
+  fFakeTrk0 = new TH2D("fFakeTrk0","fake trakcs",10,0,100,20,0,20);
+  fOutputList->Add(fFakeTrk0);
+
+  fFakeTrk1 = new TH2D("fFakeTrk1","true all e a.f. eID",10,0,100,20,0,20);
+  fOutputList->Add(fFakeTrk1);
+
   ftimingEle = new TH2D("ftimingEle","electron TOF",100,0,20,100,1e-7,1e-6);
   fOutputList->Add(ftimingEle);
 
@@ -1291,6 +1503,58 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fnSigEtaCorr[5] = new TGraphErrors(12,etaval,corr5); // 50-70
   fnSigEtaCorr[6] = new TGraphErrors(12,etaval,corr6); // 70-90
 
+  fIncMaxE = new TH2D("fIncMaxE","Inc",10,0,100,10,0,100);
+  fOutputList->Add(fIncMaxE);
+
+  fIncReco = new TH2D("fIncReco","Inc",10,0,100,100,0,500);
+  fOutputList->Add(fIncReco);
+
+  fPhoReco = new TH2D("fPhoReco","Pho",10,0,100,100,0,500);
+  fOutputList->Add(fPhoReco);
+
+  fSamReco = new TH2D("fSamReco","Same",10,0,100,100,0,500);
+  fOutputList->Add(fSamReco);
+
+  fIncRecoMaxE = new TH2D("fIncRecoMaxE","Inc",10,0,100,100,0,500);
+  fOutputList->Add(fIncRecoMaxE);
+
+  fPhoRecoMaxE = new TH2D("fPhoRecoMaxE","Pho",10,0,100,100,0,500);
+  fOutputList->Add(fPhoRecoMaxE);
+
+  fSamRecoMaxE = new TH2D("fSamRecoMaxE","Same",10,0,100,100,0,500);
+  fOutputList->Add(fSamRecoMaxE);
+
+  fPhoVertexReco_HFE = new TH2D("fPhoVertexReco_HFE","photon production Vertex mass selection",40,0,20,250,0,50);
+  fOutputList->Add(fPhoVertexReco_HFE);
+
+  fPhoVertexReco_EMCal = new TH2D("fPhoVertexReco_EMCal","photon production Vertex mass selection",40,0,20,250,0,50);
+  fOutputList->Add(fPhoVertexReco_EMCal);
+
+  fPhoVertexReco_Invmass = new TH2D("fPhoVertexReco_Invmass","photon production Vertex mass selection",40,0,20,250,0,50);
+  fOutputList->Add(fPhoVertexReco_Invmass);
+
+  fPhoVertexReco_step0= new TH2D("fPhoVertexReco_step0","photon production Vertex mass selection",40,0,20,250,0,50);
+  fPhoVertexReco_step0->Sumw2();
+  fOutputList->Add(fPhoVertexReco_step0);
+
+  fPhoVertexReco_step1= new TH2D("fPhoVertexReco_step1","photon production Vertex mass selection",40,0,20,250,0,50);
+  fPhoVertexReco_step1->Sumw2();
+  fOutputList->Add(fPhoVertexReco_step1);
+
+  fMatchV0_0 = new TH1D("fMatchV0_0","V0 match",100,0,20);
+  fOutputList->Add(fMatchV0_0);
+
+  fMatchV0_1 = new TH1D("fMatchV0_1","V0 match",100,0,20);
+  fOutputList->Add(fMatchV0_1);
+
+  fMatchMC_0 = new TH1D("fMatchMC_0","MC match",100,0,20);
+  fOutputList->Add(fMatchMC_0);
+
+  fMatchMC_1 = new TH1D("fMatchMC_1","MC match",100,0,20);
+  fOutputList->Add(fMatchMC_1);
+
+  fpair = new TH2D("fpair","pair of associate",100,0,20,21,-10.5,10.5);
+  fOutputList->Add(fpair);
 
   PostData(1,fOutputList);
 }
@@ -1311,9 +1575,7 @@ Bool_t AliAnalysisTaskHFECal::ProcessCutStep(Int_t cutStep, AliVParticle *track)
   return kTRUE;
 }
 //_________________________________________
-//void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent, AliESDtrack *track, Bool_t &fFlagPhotonicElec)
-//void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent, AliESDtrack *track, Bool_t &fFlagPhotonicElec, Bool_t &fFlagConvinatElec, Double_t nSig)
-void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent, AliESDtrack *track, Bool_t &fFlagPhotonicElec, Bool_t &fFlagConvinatElec, Double_t nSig, Double_t shower, Double_t ep, Double_t mce, Double_t w, Int_t ibgevent, Bool_t tagpi0, Bool_t tageta)
+void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent, AliESDtrack *track, Bool_t &fFlagPhotonic, Bool_t &fFlagConvinat, Double_t nSig, Double_t shower, Double_t ep, Double_t mce, Double_t w, Int_t ibgevent, Bool_t tagpi0, Bool_t tageta, Int_t iCal)
 {
   //Identify non-heavy flavour electrons using Invariant mass method
   
@@ -1321,12 +1583,13 @@ void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent,
   fTrackCuts->SetRequireTPCRefit(kTRUE);
   fTrackCuts->SetRequireITSRefit(kTRUE);
   fTrackCuts->SetEtaRange(-0.9,0.9);
-  //fTrackCuts->SetRequireSigmaToVertex(kTRUE);
   fTrackCuts->SetMaxChi2PerClusterTPC(3.5);
   fTrackCuts->SetMinNClustersTPC(90);
   
-  const AliESDVertex *pVtx = fESD->GetPrimaryVertex();
-  
+  //const AliESDVertex *pVtx = fESD->GetPrimaryVertex();
+  Double_t bfield = fESD->GetMagneticField();
+  Double_t emass = 0.51*0.001; // (0.51 MeV)
+
   double ptEle = track->Pt();  //add
   if(ibgevent==0 && w > 0.0)
      {
@@ -1344,7 +1607,9 @@ void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent,
        p1 = particle->GetFirstMother();
      }
 
-  //for(Int_t jTracks = itrack+1; jTracks<fESD->GetNumberOfTracks(); jTracks++){
+  int numULS = 0;
+  int numLS = 0;
+
   for(Int_t jTracks = 0; jTracks<fESD->GetNumberOfTracks(); jTracks++){
     AliESDtrack* trackAsso = fESD->GetTrack(jTracks);
     if (!trackAsso) {
@@ -1378,9 +1643,13 @@ void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent,
     Int_t charge = track->Charge();
     
 
-    if(ptAsso <0.5) continue;
+    if(ptAsso <fMimpTassCut) continue;
     if(!fTrackCuts->AcceptTrack(trackAsso)) continue;
-    if(dEdxAsso <65 || dEdxAsso>100) continue; //11a pass1
+    double fTPCnSigmaAss = fPID->GetPIDResponse() ? fPID->GetPIDResponse()->NumberOfSigmasTPC(trackAsso, AliPID::kElectron) : 1000;
+    //cout << "fTPCnSigmaAss = " << fTPCnSigmaAss << endl;
+    //cout << "fTPCnSigmaAss Cut = " << fMimNsigassCut << endl;
+    if(fTPCnSigmaAss <fMimNsigassCut || fTPCnSigmaAss>5) continue;
+    //cout << "fTPCnSigmaAss a.f. cut = " << fTPCnSigmaAss << endl;
     
     Int_t fPDGe1 = 11; Int_t fPDGe2 = 11;
     if(charge>0) fPDGe1 = -11;
@@ -1395,98 +1664,153 @@ void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent,
     //printf("fFlagULS = %d\n",fFlagULS);
     //printf("\n");
 
+    AliKFParticle::SetField(bfield);
     AliKFParticle ge1(*track, fPDGe1);
     AliKFParticle ge2(*trackAsso, fPDGe2);
+
+    if(fSetMassNonlinear)
+      {
+       ge1.SetNonlinearMassConstraint(emass);
+       ge2.SetNonlinearMassConstraint(emass);
+      }
+
     AliKFParticle recg(ge1, ge2);
     
-    if(recg.GetNDF()<1) continue;
-    Double_t chi2recg = recg.GetChi2()/recg.GetNDF();
-    if(TMath::Sqrt(TMath::Abs(chi2recg))>3.) continue;
-    
-    //  for v5-03-70-AN comment
+    /* 
+    // vertex 
     AliKFVertex primV(*pVtx);
     primV += recg;
+    primV -= ge1;
+    primV -= ge2;
     recg.SetProductionVertex(primV);
-    
-    recg.SetMassConstraint(0,0.0001);
-    
+    */     
+
+    // check chi2
+    if(recg.GetNDF()<1) continue;
+    Double_t chi2recg = recg.GetChi2()/recg.GetNDF();
+    Double_t chi2cut = 3.0;
+
+    // mass.
+    if(fSetMassConstraint)
+      {
+       recg.SetMassConstraint(0,0.0001);
+       chi2cut = 30.0;
+      }
+    recg.GetMass(mass,width);
+
+    if(fSetMassWidthCut && width>1e10)continue;
+
+        // angle   
     openingAngle = ge1.GetAngle(ge2);
     if(fFlagLS) fOpeningAngleLS->Fill(openingAngle);
     if(fFlagULS) fOpeningAngleULS->Fill(openingAngle);
-    
-    
-    recg.GetMass(mass,width);
-    
+       
     double ishower = 0;
     if(shower>0.0 && shower<0.3)ishower = 1;
 
-    double phoinfo[9];
-    phoinfo[0] = cent;
-    phoinfo[1] = ptPrim;
-    phoinfo[2] = mass;
-    phoinfo[3] = nSig;
-    phoinfo[4] = openingAngle;
-    phoinfo[5] = ishower;
-    phoinfo[6] = ep;
-    phoinfo[7] = mce;
-    phoinfo[8] = ptAsso;
-
-    if(fFlagLS) fInvmassLS->Fill(phoinfo);
-    if(fFlagULS) fInvmassULS->Fill(phoinfo);
-    if(fFlagLS && ibgevent==0 && jbgevent==0) fInvmassLSmc->Fill(phoinfo,w);
-    if(fFlagULS && ibgevent==0 && jbgevent==0)
-       {
-         fInvmassULSmc->Fill(phoinfo,w);
-       }
-    //printf("fInvmassCut %f\n",fInvmassCut);
-    //printf("openingAngle %f\n",fOpeningAngleCut);
+    if(iCal==1)
+      {
+        double phoinfo[9];
+        phoinfo[0] = cent;
+        phoinfo[1] = ptPrim;
+        phoinfo[2] = mass;
+        phoinfo[3] = nSig;
+        phoinfo[4] = openingAngle;
+        phoinfo[5] = ishower;
+        phoinfo[6] = ep;
+        phoinfo[7] = mce;
+        phoinfo[8] = ptAsso;
+
+        if(fFlagLS) fInvmassLS->Fill(phoinfo);
+        if(fFlagULS) fInvmassULS->Fill(phoinfo);
+        if(fFlagLS && ibgevent==0 && jbgevent==0) fInvmassLSmc->Fill(phoinfo,w);
+        if(fFlagULS && ibgevent==0 && jbgevent==0)
+        {
+             fInvmassULSmc->Fill(phoinfo,w);
+        }
+       //printf("fInvmassCut %f\n",fInvmassCut);
+       //printf("openingAngle %f\n",fOpeningAngleCut);
+      }
 
+    // angle cut
     if(openingAngle > fOpeningAngleCut) continue;
-    
+    // chi2 cut
+    //if(TMath::Sqrt(TMath::Abs(chi2recg))>chi2cut) continue;
+    if(chi2recg>chi2cut) continue;
+    if(fFlagLS ) fInvmassLSreco->Fill(ptPrim,mass);
+    if(fFlagULS) fInvmassULSreco->Fill(ptPrim,mass);
+  
+    // check double count
+    if(mass<fInvmassCut && fFlagULS)numULS++;
+    if(mass<fInvmassCut && fFlagLS)numLS++;
+
     // for real data  
     //printf("mce =%f\n",mce);
+
     if(mce<-0.5) // mce==-1. is real
-       {
-         //printf("Real data\n");
-        if(mass<fInvmassCut && fFlagULS && !flagPhotonicElec){
-        //if(mass<fInvmassCut && fFlagULS && !flagPhotonicElec && (p1==p2)){ <--- only MC train (55,56) v5-03-68-AN & 69 for check
-              flagPhotonicElec = kTRUE;
-             }
-        if(mass<fInvmassCut && fFlagLS && !flagConvinatElec){
-              flagConvinatElec = kTRUE;
-             }
-        }
+    {
+           //printf("Real data\n");
+
+           // count
+           if(mass<fInvmassCut && fFlagULS && shower>0.0 && shower<0.3 && iCal==1)fPhoElecPtM20Mass->Fill(cent,ptPrim);
+           if(mass<fInvmassCut && fFlagLS && shower>0.0 && shower<0.3 && iCal==1)fSameElecPtM20Mass->Fill(cent,ptPrim);
+
+           // flag
+           if(mass<fInvmassCut && fFlagULS && !flagPhotonicElec){
+                   flagPhotonicElec = kTRUE;
+           }
+           if(mass<fInvmassCut && fFlagLS && !flagConvinatElec){
+                   flagConvinatElec = kTRUE;
+           }
+    }
     // for MC data  
     else
-       {
-         //printf("MC data\n");
+    {
+           // count
+           if(mass<fInvmassCut && fFlagULS && shower>0.0 && shower<0.3 && mce>2.1 && iCal==1)fPhoElecPtMCM20Mass->Fill(cent,ptPrim,w);
+           if(mass<fInvmassCut && fFlagLS && shower>0.0 && shower<0.3 && mce>2.1 && iCal==1)fSameElecPtMCM20Mass->Fill(cent,ptPrim,w);
+
+           //printf("MC data\n");
+
+           if(w>0.0)
+           {
+                   //cout << "tagpi0 = " << tagpi0 << " ; tageta = " << tageta << endl;
+                    if(iCal==1)
+                      {
+                      if(fFlagLS && ibgevent==0 && jbgevent==0 && tagpi0) fInvmassLSmc0->Fill(ptPrim,mass);
+                      if(fFlagULS && ibgevent==0 && jbgevent==0 && tagpi0) fInvmassULSmc0->Fill(ptPrim,mass);
+                      if(fFlagLS && ibgevent==0 && jbgevent==0 && tageta) fInvmassLSmc1->Fill(ptPrim,mass);
+                      if(fFlagULS && ibgevent==0 && jbgevent==0 && tageta) fInvmassULSmc1->Fill(ptPrim,mass);
+                      if(fFlagLS && ibgevent==0 && jbgevent==0 && (p1==p2) && tagpi0) fInvmassLSmc2->Fill(ptPrim,mass);
+                      if(fFlagULS && ibgevent==0 && jbgevent==0 && (p1==p2) && tagpi0) fInvmassULSmc2->Fill(ptPrim,mass);
+                      if(fFlagLS && ibgevent==0 && jbgevent==0 && (p1==p2) && tageta) fInvmassLSmc3->Fill(ptPrim,mass);
+                      if(fFlagULS && ibgevent==0 && jbgevent==0 && (p1==p2) && tageta) fInvmassULSmc3->Fill(ptPrim,mass);
+                      }
+           }
+
+           if(mass<fInvmassCut && fFlagULS && !flagPhotonicElec && (ibgevent==jbgevent)){
+                   //if(mass<fInvmassCut && fFlagULS && !flagPhotonicElec && (p1==p2)){ //<--- only MC train (55,56) v5-03-68-AN , 69 & v5-05-70-AN (till 74)
+                   flagPhotonicElec = kTRUE;
+           }
+           if(mass<fInvmassCut && fFlagLS && !flagConvinatElec && (ibgevent==jbgevent)){
+                   flagConvinatElec = kTRUE;
+           }
+    } 
 
-         if(w>0.0)
-           {
-           //cout << "tagpi0 = " << tagpi0 << " ; tageta = " << tageta << endl;
-           if(fFlagLS && ibgevent==0 && jbgevent==0 && tagpi0) fInvmassLSmc0->Fill(ptPrim,mass,w);
-           if(fFlagULS && ibgevent==0 && jbgevent==0 && tagpi0) fInvmassULSmc0->Fill(ptPrim,mass,w);
-           if(fFlagLS && ibgevent==0 && jbgevent==0 && tageta) fInvmassLSmc1->Fill(ptPrim,mass,w);
-           if(fFlagULS && ibgevent==0 && jbgevent==0 && tageta) fInvmassULSmc1->Fill(ptPrim,mass,w);
-           if(fFlagLS && ibgevent==0 && jbgevent==0 && (p1==p2) && tagpi0) fInvmassLSmc2->Fill(ptPrim,mass,w);
-           if(fFlagULS && ibgevent==0 && jbgevent==0 && (p1==p2) && tagpi0) fInvmassULSmc2->Fill(ptPrim,mass,w);
-           if(fFlagLS && ibgevent==0 && jbgevent==0 && (p1==p2) && tageta) fInvmassLSmc3->Fill(ptPrim,mass,w);
-           if(fFlagULS && ibgevent==0 && jbgevent==0 && (p1==p2) && tageta) fInvmassULSmc3->Fill(ptPrim,mass,w);
-          }
-        if(mass<fInvmassCut && fFlagULS && !flagPhotonicElec && (ibgevent==jbgevent)){
-        //if(mass<fInvmassCut && fFlagULS && !flagPhotonicElec && (p1==p2)){ <--- only MC train (55,56) v5-03-68-AN & 69 for check
-              flagPhotonicElec = kTRUE;
-             }
-        if(mass<fInvmassCut && fFlagLS && !flagConvinatElec && (ibgevent==jbgevent)){
-              flagConvinatElec = kTRUE;
-             }
-        }
+  } // end of associate loop
 
-  }
-  fFlagPhotonicElec = flagPhotonicElec;
-  fFlagConvinatElec = flagConvinatElec;
+  if(numULS>0 || numLS>0)
+    {
+     int numPair = numULS-numLS;
+     if(iCal==1)fpair->Fill(ptEle,numPair);
+    }
+   
+  fFlagPhotonic = flagPhotonicElec;
+  fFlagConvinat = flagConvinatElec;
   
 }
+
 //-------------------------------------------
 
 void AliAnalysisTaskHFECal::FindMother(TParticle* part, int &label, int &pid)
@@ -1819,7 +2143,7 @@ double AliAnalysisTaskHFECal::MCEopMeanCorrection(double pTmc, float central)
  else if(central>50 && central<=70)
    {
     fcorr0->SetParameters(0.989,2.495,2.167);
-    fcorr1->SetParameters(0.961e-1,1.734,1.438e-01);
+    fcorr1->SetParameters(0.961,1.734,1.438e-01);
    }
  else if(central>70 && central<=100)
    {
@@ -1830,6 +2154,9 @@ double AliAnalysisTaskHFECal::MCEopMeanCorrection(double pTmc, float central)
 
  shift = fcorr0->Eval(pTmc)-fcorr1->Eval(pTmc);
 
+ fcorr0->Delete(); 
+ fcorr1->Delete(); 
+
  return shift;
 }