]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWGHF/hfe/AliAnalysisTaskHFECal.cxx
Update of AddTaskForwardMult to make possible to run without acceptance correction...
[u/mrichter/AliRoot.git] / PWGHF / hfe / AliAnalysisTaskHFECal.cxx
index ffcd9201a7321e5f9d17246698765705c7d2fe11..3ec3b26e99a955b6caa80397f4dafc5006cee6f7 100644 (file)
@@ -86,6 +86,7 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   : AliAnalysisTaskSE(name)
   ,fESD(0)
   ,fMC(0)
+  ,stack(0)
   ,fGeom(0)
   ,fOutputList(0)
   ,fqahist(1) 
@@ -103,6 +104,7 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   ,fInvmassCut(0.01)   
   ,fNoEvents(0)
   ,fEMCAccE(0)
+  ,hEMCAccE(0)
   ,fTrkpt(0)
   ,fTrkEovPBef(0)       
   ,fTrkEovPAft(0)      
@@ -114,6 +116,14 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   ,fInvmassULS(0)              
   ,fInvmassLSmc(0)             
   ,fInvmassULSmc(0)            
+  ,fInvmassLSmc0(0)            
+  ,fInvmassLSmc1(0)            
+  ,fInvmassLSmc2(0)            
+  ,fInvmassLSmc3(0)            
+  ,fInvmassULSmc0(0)           
+  ,fInvmassULSmc1(0)           
+  ,fInvmassULSmc2(0)           
+  ,fInvmassULSmc3(0)           
   ,fOpeningAngleLS(0)  
   ,fOpeningAngleULS(0) 
   ,fPhotoElecPt(0)
@@ -145,6 +155,8 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   ,fIncpTMCM20hfe(0)   
   ,fIncpTMCM20hfeAll(0)        
   ,fIncpTMCM20hfeCheck(0)      
+  ,fInputHFEMC_weight(0)
+  ,fIncpTMCM20hfeCheck_weight(0)
   ,fIncpTMCpho(0)      
   ,fIncpTMCM20pho(0)   
   ,fPhoElecPtMC(0)
@@ -154,11 +166,23 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name)
   ,fIncpTMCM20pho_pi0e(0)      
   ,fPhoElecPtMCM20_pi0e(0)
   ,fSameElecPtMCM20_pi0e(0)
+  ,fIncpTMCM20pho_eta(0)       
+  ,fPhoElecPtMCM20_eta(0)
+  ,fSameElecPtMCM20_eta(0)
+  ,fIncpTMCpho_pi0e_TPC(0)     
+  ,fPhoElecPtMC_pi0e_TPC(0)
+  ,fSameElecPtMC_pi0e_TPC(0)
   ,CheckNclust(0)
   ,CheckNits(0)
   ,Hpi0pTcheck(0)
+  ,HETApTcheck(0)
   ,HphopTcheck(0)
+  ,HDpTcheck(0)
+  ,HBpTcheck(0)
+  ,fpTCheck(0)
   ,fMomDtoE(0) 
+  ,fLabelCheck(0)
+  ,fgeoFake(0)
 {
   //Named constructor
   
@@ -180,6 +204,7 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   : AliAnalysisTaskSE("DefaultAnalysis_AliAnalysisTaskHFECal")
   ,fESD(0)
   ,fMC(0)
+  ,stack(0)
   ,fGeom(0)
   ,fOutputList(0)
   ,fqahist(1)
@@ -197,6 +222,7 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   ,fInvmassCut(0.01)   
   ,fNoEvents(0)
   ,fEMCAccE(0)
+  ,hEMCAccE(0)
   ,fTrkpt(0)
   ,fTrkEovPBef(0)       
   ,fTrkEovPAft(0)       
@@ -208,6 +234,14 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   ,fInvmassULS(0)              
   ,fInvmassLSmc(0)             
   ,fInvmassULSmc(0)            
+  ,fInvmassLSmc0(0)            
+  ,fInvmassLSmc1(0)            
+  ,fInvmassLSmc2(0)            
+  ,fInvmassLSmc3(0)            
+  ,fInvmassULSmc0(0)           
+  ,fInvmassULSmc1(0)           
+  ,fInvmassULSmc2(0)           
+  ,fInvmassULSmc3(0)           
   ,fOpeningAngleLS(0)  
   ,fOpeningAngleULS(0) 
   ,fPhotoElecPt(0)
@@ -239,6 +273,8 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   ,fIncpTMCM20hfe(0)   
   ,fIncpTMCM20hfeAll(0)        
   ,fIncpTMCM20hfeCheck(0)      
+  ,fInputHFEMC_weight(0)
+  ,fIncpTMCM20hfeCheck_weight(0)
   ,fIncpTMCpho(0)      
   ,fIncpTMCM20pho(0)   
   ,fPhoElecPtMC(0)
@@ -248,11 +284,23 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal()
   ,fIncpTMCM20pho_pi0e(0)      
   ,fPhoElecPtMCM20_pi0e(0)
   ,fSameElecPtMCM20_pi0e(0)
+  ,fIncpTMCM20pho_eta(0)       
+  ,fPhoElecPtMCM20_eta(0)
+  ,fSameElecPtMCM20_eta(0)
+  ,fIncpTMCpho_pi0e_TPC(0)     
+  ,fPhoElecPtMC_pi0e_TPC(0)
+  ,fSameElecPtMC_pi0e_TPC(0)
   ,CheckNclust(0)
   ,CheckNits(0)
   ,Hpi0pTcheck(0)
+  ,HETApTcheck(0)
   ,HphopTcheck(0)
+  ,HDpTcheck(0)
+  ,HBpTcheck(0)
+  ,fpTCheck(0)
   ,fMomDtoE(0)
+  ,fLabelCheck(0)
+  ,fgeoFake(0)
 {
        //Default constructor
        fPID = new AliHFEpid("hfePid");
@@ -309,7 +357,7 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
   }
  
   if(fmcData)fMC = MCEvent();
-  AliStack* stack = NULL;
+  //AliStack* stack = NULL;
   if(fmcData && fMC)stack = fMC->Stack();
 
   Float_t cent = -1.;
@@ -335,7 +383,16 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
       //if(!MChijing)printf("not MC hijing");
       int iHijing = 1;
       if(!MChijing)iHijing = 0;
-      if(fPDG==111)Hpi0pTcheck->Fill(pTMC,iHijing);
+      double mcphoinfo[5];
+      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);
+      if(fabs(fPDG)==511 || fabs(fPDG)==513 || fabs(fPDG)==521 || fabs(fPDG)==523 || fabs(fPDG)==531)HBpTcheck->Fill(pTMC,iHijing);
 
       if(particle->GetFirstMother()>-1 && fPDG==22)
         {
@@ -346,11 +403,23 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
       if(particle->GetFirstMother()>-1 && fabs(fPDG)==11)
         {
            int parentPID = stack->Particle(particle->GetFirstMother())->GetPdgCode();  
+           double pTMCparent = stack->Particle(particle->GetFirstMother())->Pt();  
             if((fabs(parentPID)==411 || fabs(parentPID)==413 || fabs(parentPID)==421 || fabs(parentPID)==423 || fabs(parentPID)==431)&& fabs(fPDG)==11)mcInDtoE = kTRUE;
             if((fabs(parentPID)==511 || fabs(parentPID)==513 || fabs(parentPID)==521 || fabs(parentPID)==523 || fabs(parentPID)==531)&& fabs(fPDG)==11)mcInBtoE = kTRUE;
-            if((mcInBtoE || mcInDtoE) && fabs(mcZvertex)<10.0)fInputHFEMC->Fill(cent,pTMC);
+            if((mcInBtoE || mcInDtoE) && fabs(mcZvertex)<10.0)
+               {
+                fInputHFEMC->Fill(cent,pTMC);
+                double mcinfo[5];
+                mcinfo[0] = cent;
+                mcinfo[1] = pTMC;
+                mcinfo[2] = 0.0;
+                mcinfo[3] = iHijing;
+                mcinfo[4] = pTMCparent;
+                fInputHFEMC_weight->Fill(mcinfo);
+               }
          }
 
+
          if(proR<7.0 && fabs(fPDG)==11)fInputAlle->Fill(cent,pTMC);
 
       }
@@ -367,7 +436,7 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
   if(TMath::Abs(pVtxZ)>10) return;
   fNoEvents->Fill(1);
   
-  if(fNOtrks<2) return;
+  if(fNOtrks<1) return;
   fNoEvents->Fill(2);
   
   AliPIDResponse *pidResponse = fInputHandler->GetPIDResponse();
@@ -395,7 +464,7 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
   for(Int_t iCluster=0; iCluster<fESD->GetNumberOfCaloClusters(); iCluster++)
      {
       AliESDCaloCluster *clust = fESD->GetCaloCluster(iCluster);
-      if(clust->IsEMCAL())
+      if(clust && clust->IsEMCAL())
         {
          double clustE = clust->E();
          float  emcx[3]; // cluster pos
@@ -405,8 +474,10 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
          double emceta = clustpos.Eta();
          double calInfo[5];
          calInfo[0] = emcphi; calInfo[1] = emceta; calInfo[2] = clustE; calInfo[3] = cent; calInfo[4] = clust->Chi2(); 
-         //if(clustE>1.5)fEMCAccE->Fill(calInfo); 
+         //fEMCAccE->Fill(calInfo); 
+         //if(clustE>3.0)fEMCAccE->Fill(calInfo); 
          //if(fqahist==1 && clustE>1.5)fEMCAccE->Fill(calInfo); 
+         hEMCAccE->Fill(cent,clustE); 
         }
    }
 
@@ -418,9 +489,15 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
       continue;
     }
    
+    int parentlabel = 99999;
+    int parentPID = 99999;
+    int grand_parentlabel = 99999;
+    int grand_parentPID = 99999;
     Bool_t mcPho = kFALSE;
     Bool_t mcDtoE= kFALSE;
     Bool_t mcBtoE= kFALSE;
+    Bool_t mcOrgPi0 = kFALSE;
+    Bool_t mcOrgEta = kFALSE;
     double mcele = -1.;
     double mcpT = 0.0;
     double mcMompT = 0.0;
@@ -428,58 +505,107 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
     double mcWeight = -10.0;
 
     int iHijing = 1;
+    int mcLabel = -1;
 
     if(fmcData && fMC && stack)
       {
        Int_t label = TMath::Abs(track->GetLabel());
-
-       Bool_t MChijing = fMC->IsFromBGEvent(label);
-       if(!MChijing)iHijing = 0;
-
-       TParticle* particle = stack->Particle(label);
-       int mcpid = particle->GetPdgCode();
-       mcpT = particle->Pt();
-       //printf("MCpid = %d",mcpid);
-       if(particle->GetFirstMother()>-1)
-         {
-          int parentlabel = particle->GetFirstMother();
-          int parentPID = stack->Particle(particle->GetFirstMother())->GetPdgCode();
-          mcMompT = stack->Particle(particle->GetFirstMother())->Pt();
-          if((parentPID==22 || parentPID==111 || parentPID==221)&& fabs(mcpid)==11)mcPho = kTRUE;
-          if((fabs(parentPID)==411 || fabs(parentPID)==413 || fabs(parentPID)==421 || fabs(parentPID)==423 || fabs(parentPID)==431)&& fabs(mcpid)==11)mcDtoE = kTRUE;
-          if((fabs(parentPID)==511 || fabs(parentPID)==513 || fabs(parentPID)==521 || fabs(parentPID)==523 || fabs(parentPID)==531)&& fabs(mcpid)==11)mcBtoE = kTRUE;
-
-          // make D->e pT correlation
-          if(mcDtoE)fMomDtoE->Fill(mcpT,mcMompT); 
-
-          // pi->e (Dalitz)
-          if(parentPID==111 && fabs(mcpid)==11 && mcMompT>0.0)
-              {
-               mcWeight = GetMCweight(mcMompT); 
-              }
-
-          // access grand parent pi0->g->e
-          TParticle* particle_parent = stack->Particle(parentlabel); // get parent pointer
-          if(particle_parent->GetFirstMother()>-1 && parentPID==22 && fabs(mcpid)==11) // get grand parent g->e
-            {
-             int grand_parentPID = stack->Particle(particle_parent->GetFirstMother())->GetPdgCode();
-             if(grand_parentPID==111)
-                {
-                 //mcGrandMompT = stack->Particle(particle_parent->GetFirstMother())->Pt();
-                 double pTtmp = stack->Particle(particle_parent->GetFirstMother())->Pt();
-                 //if(mcGrandMompT>0.0 && mcGrandMompT<5.0)
-                 if(pTtmp>0.0)
-                   { 
-                   mcWeight = GetMCweight(pTtmp); 
-                  }
-                }
-            }
-         } 
-       if(fabs(mcpid)==11 && mcDtoE)mcele= 1.; 
-       if(fabs(mcpid)==11 && mcBtoE)mcele= 2.; 
-       if(fabs(mcpid)==11 && mcPho)mcele= 3.; 
-      }
+       mcLabel = track->GetLabel();
+       
+       //if(mcLabel>-1)
+       {
+      
+              Bool_t MChijing = fMC->IsFromBGEvent(label);
+              if(!MChijing)iHijing = 0;
+
+              TParticle* particle = stack->Particle(label);
+              int mcpid = particle->GetPdgCode();
+              mcpT = particle->Pt();
+              //printf("MCpid = %d",mcpid);
+              if(particle->GetFirstMother()>-1)
+              {
+                      //int parentlabel = particle->GetFirstMother();
+                      //int parentPID = stack->Particle(particle->GetFirstMother())->GetPdgCode();
+                      //mcMompT = stack->Particle(particle->GetFirstMother())->Pt();
+                      FindMother(particle, parentlabel, parentPID);
+                      mcMompT = stack->Particle(parentlabel)->Pt();
+                      if((parentPID==22 || parentPID==111 || parentPID==221)&& fabs(mcpid)==11)mcPho = kTRUE;
+                      if((fabs(parentPID)==411 || fabs(parentPID)==413 || fabs(parentPID)==421 || fabs(parentPID)==423 || fabs(parentPID)==431)&& fabs(mcpid)==11)mcDtoE = kTRUE;
+                      if((fabs(parentPID)==511 || fabs(parentPID)==513 || fabs(parentPID)==521 || fabs(parentPID)==523 || fabs(parentPID)==531)&& fabs(mcpid)==11)mcBtoE = kTRUE;
+
+                      // make D->e pT correlation
+                      if(mcDtoE)fMomDtoE->Fill(mcpT,mcMompT); 
+
+                      //cout << "check PID = " << parentPID << endl;
+                      //cout << "check pho = " << mcPho << endl;
+                      //cout << "check D or B = " << mcDtoE << endl;
+                      // pi->e (Dalitz)
+                      if(parentPID==111 && fabs(mcpid)==11 && mcMompT>0.0)
+                      {
+                              //cout << "find pi0->e " <<  endl;
+                              mcOrgPi0 = kTRUE;
+                              mcWeight = GetMCweight(mcMompT); 
+                      }
+                      // eta->e (Dalitz)
+                      if(parentPID==221 && fabs(mcpid)==11 && mcMompT>0.0)
+                      {
+                              //cout << "find Eta->e " <<  endl;
+                              mcOrgEta = kTRUE;
+                              mcWeight = GetMCweightEta(mcMompT); 
+                      }
+
+                      // access grand parent 
+                      TParticle* particle_parent = stack->Particle(parentlabel); // get parent pointer
+                      //if(particle_parent->GetFirstMother()>-1 && parentPID==22 && fabs(mcpid)==11) // get grand parent g->e
+                      if(particle_parent->GetFirstMother()>-1 && (parentPID==22 || parentPID==111) && fabs(mcpid)==11) // get grand parent g->e
+                      {
+                              //int grand_parentPID = stack->Particle(particle_parent->GetFirstMother())->GetPdgCode();
+                              //double pTtmp = stack->Particle(particle_parent->GetFirstMother())->Pt();
+                              FindMother(particle_parent, grand_parentlabel, grand_parentPID);
+                              double mcGrandpT = stack->Particle(grand_parentlabel)->Pt();
+                              if(grand_parentPID==111 && mcGrandpT>0.0)
+                              {
+                                      // check eta->pi0 decay !
+                                      int grand2_parentlabel = 99999; int grand2_parentPID = 99999;
+                                      TParticle* particle_grand = stack->Particle(grand_parentlabel); // get parent pointer
+                                      FindMother(particle_grand, grand2_parentlabel, grand2_parentPID);
+                                      if(grand2_parentPID==221)
+                                      {
+                                              //cout << "find Eta->e " <<  endl;
+                                              double mcGrandpT2 = stack->Particle(grand2_parentlabel)->Pt();
+                                              mcOrgEta = kTRUE;
+                                              mcWeight = GetMCweight(mcGrandpT2);  
+                                              mcMompT = mcGrandpT2; 
+                                      }
+                                      else
+                                      {
+                                              //cout << "find pi0->e " <<  endl;
+                                              mcOrgPi0 = kTRUE;
+                                              mcWeight = GetMCweight(mcGrandpT);  
+                                              mcMompT = mcGrandpT; 
+                                      }
+                              }
+
+                              if(grand_parentPID==221 && mcGrandpT>0.0)
+                              {
+                                      //cout << "find Eta->e " <<  endl;
+                                      mcOrgEta = kTRUE;
+                                      mcOrgPi0 = kFALSE;
+                                      mcWeight = GetMCweightEta(mcGrandpT); 
+                                      mcMompT = mcGrandpT; 
+                              }
+                      }
+              }
+
+              if(fabs(mcpid)==11 && mcDtoE)mcele= 1.; 
+              if(fabs(mcpid)==11 && mcBtoE)mcele= 2.; 
+              if(fabs(mcpid)==11 && mcPho)mcele= 3.; 
+
+       } // end of mcLabel>-1
+
+      } // end of MC info.
  
+    //cout << "Pi0 = " << mcOrgPi0 << " ; Eta = " << mcOrgEta << endl; 
     //printf("weight = %f\n",mcWeight);
 
     if(TMath::Abs(track->Eta())>0.6) continue;
@@ -522,7 +648,13 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
     eta = track->Eta();
     dEdx = track->GetTPCsignal();
     fTPCnSigma = fPID->GetPIDResponse() ? fPID->GetPIDResponse()->NumberOfSigmasTPC(track, AliPID::kElectron) : 1000;
-    
+    if(mcLabel==-1) // nsigma mean correction
+      {
+       double mean_corr = NsigCorr(cent);
+       printf("correction %f\n",mean_corr);
+       fTPCnSigma -= mean_corr;
+      }    
+
         double ncells = -1.0;
         double m20 = -1.0;
         double m02 = -1.0;
@@ -553,7 +685,7 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
 
                if(fTPCnSigma>-1.5 && fTPCnSigma<3.0)
                {
-                 SelectPhotonicElectron(iTracks,cent,track,stack,fFlagPhotonicElec,fFlagConvinatElec,fTPCnSigma,m20,eop,mcele,mcWeight,iHijing);
+                 SelectPhotonicElectron(iTracks,cent,track,fFlagPhotonicElec,fFlagConvinatElec,fTPCnSigma,m20,eop,mcele,mcWeight,iHijing,mcOrgPi0,mcOrgEta);
                }
                if(fFlagPhotonicElec)oppstatus = 1.0;
                if(fFlagConvinatElec)oppstatus = 2.0;
@@ -581,7 +713,23 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
     if(fTPCnSigma >= -1.0 && fTPCnSigma <= 3)fTrkEovPBef->Fill(pt,eop);
 
     Int_t pidpassed = 1;
-    
+    // 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 >= -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
     AliHFEpidObject hfetrack;
@@ -622,6 +770,13 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
      }
     
     // 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
       {
 
@@ -631,18 +786,19 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
        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)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;
+                fIncpTMCM20hfe->Fill(cent,pt);    
+                fIncpTMCM20hfeCheck->Fill(cent,mcpT);    
+                fIncpTMCM20hfeCheck_weight->Fill(phoval);    
+            }
          }
       
        if(mcPho) // select photonic electrons
         {
-         double phoval[5];
-         phoval[0] = cent;
-         phoval[1] = pt;
-         phoval[2] = fTPCnSigma;
-         phoval[3] = iHijing;
-         phoval[4] = mcMompT;
 
          fIncpTMCpho->Fill(phoval);    
          if(fFlagPhotonicElec) fPhoElecPtMC->Fill(phoval);
@@ -657,9 +813,25 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
             if(mcWeight>-1)
               {
                if(iHijing==1)mcWeight = 1.0; 
-               fIncpTMCM20pho_pi0e->Fill(phoval,mcWeight);    
-               if(fFlagPhotonicElec) fPhoElecPtMCM20_pi0e->Fill(phoval,mcWeight);
-               if(fFlagConvinatElec) fSameElecPtMCM20_pi0e->Fill(phoval,mcWeight);
+               if(mcOrgPi0)
+                 {
+                  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);
+                 }
+               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
               }
            }
         } 
@@ -762,6 +934,9 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fEMCAccE = new THnSparseD("fEMCAccE","EMC acceptance & E;#eta;#phi;Energy;Centrality;trugCondition;",5,binsE,xminE,xmaxE);
   if(fqahist==1)fOutputList->Add(fEMCAccE);
 
+  hEMCAccE = new TH2F("hEMCAccE","Cluster Energy",200,0,100,100,0,20);
+  fOutputList->Add(hEMCAccE);
+
   fTrkpt = new TH1F("fTrkpt","track pt",100,0,50);
   fOutputList->Add(fTrkpt);
   
@@ -797,16 +972,48 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   Double_t maxpho[9] = {100., 50., 0.5, 3.5,   1,  3.5,   2, 6.5,  50};   
 
   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);
-  fOutputList->Add(fInvmassLS);
+  if(fqahist==1)fOutputList->Add(fInvmassLS);
   
   fInvmassULS = new THnSparseD("fInvmassULS", "Inv mass of ULS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2); nSigma; angle; m20cut; eop; MCele", 9, nBinspho,minpho, maxpho);
-  fOutputList->Add(fInvmassULS);
+  if(fqahist==1)fOutputList->Add(fInvmassULS);
   
   fInvmassLSmc = new THnSparseD("fInvmassLSmc", "Inv mass of LS (e,e); cent; p_{T} (GeV/c); mass(GeV/c^2); nSigma; angle; m20cut; eop; Mcele;", 9, nBinspho,minpho, maxpho);
-  fOutputList->Add(fInvmassLSmc);
+  if(fqahist==1)fOutputList->Add(fInvmassLSmc);
   
   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);
-  fOutputList->Add(fInvmassULSmc);
+  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 );
+  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->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->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->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->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->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->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->Sumw2();
+  fOutputList->Add(fInvmassULSmc3);
 
   fOpeningAngleLS = new TH1F("fOpeningAngleLS","Opening angle for LS pairs",100,0,1);
   fOutputList->Add(fOpeningAngleLS);
@@ -900,10 +1107,16 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fIncpTMCM20hfeCheck = new TH2F("fIncpTMCM20hfeCheck","MC HFE pid electro vs. centrality with M20 Check",200,0,100,100,0,50);
   fOutputList->Add(fIncpTMCM20hfeCheck);
 
-  Int_t nBinspho2[5] =  { 200, 100,    7,    3, 100};
+  Int_t nBinspho2[5] =  { 200, 100,    7,    3, 700};
   Double_t minpho2[5] = {  0.,  0., -2.5, -0.5, 0.};   
-  Double_t maxpho2[5] = {100., 50.,  4.5,  2.5, 50.};   
-
+  Double_t maxpho2[5] = {100., 50.,  4.5,  2.5, 70.};   
+  
+  fInputHFEMC_weight = new THnSparseD("fInputHFEMC_weight", "MC HFE electron pt",5,nBinspho2,minpho2,maxpho2);
+  fOutputList->Add(fInputHFEMC_weight);
+  
+  fIncpTMCM20hfeCheck_weight = new THnSparseD("fIncpTMCM20hfeCheck_weight", "HFE electron pt with M20",5,nBinspho2,minpho2,maxpho2);
+  fOutputList->Add(fIncpTMCM20hfeCheck_weight);
+  
   fIncpTMCpho = new THnSparseD("fIncpTMCpho","MC Pho pid electro vs. centrality",5,nBinspho2,minpho2,maxpho2);
   fOutputList->Add(fIncpTMCpho);
 
@@ -933,22 +1146,77 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fSameElecPtMCM20_pi0e = new THnSparseD("fSameElecPtMCM20_pi0e", "MC Same-inclusive electron pt pi0->e",5,nBinspho2,minpho2,maxpho2);
   fSameElecPtMCM20_pi0e->Sumw2();
   fOutputList->Add(fSameElecPtMCM20_pi0e);
+ // 
+  fIncpTMCM20pho_eta = new THnSparseD("fIncpTMCM20pho_eta","MC Pho pi0->e pid electro vs. centrality with M20",5,nBinspho2,minpho2,maxpho2);
+  fIncpTMCM20pho_eta->Sumw2();
+  fOutputList->Add(fIncpTMCM20pho_eta);
+
+  fPhoElecPtMCM20_eta = new THnSparseD("fPhoElecPtMCM20_eta", "MC Pho-inclusive electron pt with M20 pi0->e",5,nBinspho2,minpho2,maxpho2);
+  fPhoElecPtMCM20_eta->Sumw2();
+  fOutputList->Add(fPhoElecPtMCM20_eta);
+
+  fSameElecPtMCM20_eta = new THnSparseD("fSameElecPtMCM20_eta", "MC Same-inclusive electron pt pi0->e",5,nBinspho2,minpho2,maxpho2);
+  fSameElecPtMCM20_eta->Sumw2();
+  fOutputList->Add(fSameElecPtMCM20_eta);
+  // ------------
+  fIncpTMCpho_pi0e_TPC = new THnSparseD("fIncpTMCpho_pi0e_TPC","MC Pho pi0->e pid electro vs. centrality with M20",5,nBinspho2,minpho2,maxpho2);
+  fIncpTMCpho_pi0e_TPC->Sumw2();
+  fOutputList->Add(fIncpTMCpho_pi0e_TPC);
+
+  fPhoElecPtMC_pi0e_TPC = new THnSparseD("fPhoElecPtMC_pi0e_TPC", "MC Pho-inclusive electron pt with  pi0->e",5,nBinspho2,minpho2,maxpho2);
+  fPhoElecPtMC_pi0e_TPC->Sumw2();
+  fOutputList->Add(fPhoElecPtMC_pi0e_TPC);
+
+  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);
+  //-------------
 
   CheckNclust = new TH1D("CheckNclust","cluster check",200,0,200);
   fOutputList->Add(CheckNclust);
 
   CheckNits = new TH1D("CheckNits","ITS cluster check",8,-0.5,7.5);
   fOutputList->Add(CheckNits);
-
+  /*
   Hpi0pTcheck = new TH2D("Hpi0pTcheck","Pi0 pT from Hijing",100,0,50,3,-0.5,2.5);
   fOutputList->Add(Hpi0pTcheck);
 
+  HETApTcheck = new TH2D("HETApTcheck","Eta pT from Hijing",100,0,50,3,-0.5,2.5);
+  fOutputList->Add(HETApTcheck);
+  */
+
+  Int_t nBinspho3[3] =  { 200, 100, 3};
+  Double_t minpho3[3] = {  0.,  0., -0.5};   
+  Double_t maxpho3[3] = {100., 50., 2.5};   
+
+  Hpi0pTcheck = new THnSparseD("Hpi0pTcheck","Pi0 pT from Hijing",3,nBinspho3,minpho3,maxpho3);
+  fOutputList->Add(Hpi0pTcheck);
+
+  HETApTcheck = new THnSparseD("HETApTcheck","Eta pT from Hijing",3,nBinspho3,minpho3,maxpho3);
+  fOutputList->Add(HETApTcheck);
+  //--
   HphopTcheck = new TH2D("HphopTcheck","Pho pT from Hijing",100,0,50,3,-0.5,2.5);
   fOutputList->Add(HphopTcheck);
+  //
+  HDpTcheck = new TH2D("HDpTcheck","D pT from Hijing",100,0,50,3,-0.5,2.5);
+  fOutputList->Add(HDpTcheck);
+
+  HBpTcheck = new TH2D("HBpTcheck","B pT from Hijing",100,0,50,3,-0.5,2.5);
+  fOutputList->Add(HBpTcheck);
+  //
+
+  fpTCheck = new TH1D("fpTCheck","pT check",500,0,50);
+  fOutputList->Add(fpTCheck);
 
   fMomDtoE = new TH2D("fMomDtoE","D->E pT correlations;e p_{T} GeV/c;D p_{T} GeV/c",400,0,40,400,0,40);
   fOutputList->Add(fMomDtoE);
 
+  fLabelCheck = new TH2D("fLabelCheck","MC label",50,0,50,5,-1.5,3.5);
+  fOutputList->Add(fLabelCheck);
+
+  fgeoFake = new TH2D("fgeoFake","Label==0 eta and phi",628,0,6.28,200,-1,1);
+  fOutputList->Add(fgeoFake);
+
   PostData(1,fOutputList);
 }
 
@@ -970,7 +1238,7 @@ Bool_t AliAnalysisTaskHFECal::ProcessCutStep(Int_t cutStep, AliVParticle *track)
 //_________________________________________
 //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, AliStack *stack ,Bool_t &fFlagPhotonicElec, Bool_t &fFlagConvinatElec, Double_t nSig, Double_t shower, Double_t ep, Double_t mce, Double_t w, Int_t ibgevent)
+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)
 {
   //Identify non-heavy flavour electrons using Invariant mass method
   
@@ -984,6 +1252,12 @@ void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent,
   
   const AliESDVertex *pVtx = fESD->GetPrimaryVertex();
   
+  double ptEle = track->Pt();  //add
+  if(ibgevent==0 && w > 0.0)
+     {
+      fpTCheck->Fill(ptEle,w);
+     }
+
   Bool_t flagPhotonicElec = kFALSE;
   Bool_t flagConvinatElec = kFALSE;
   
@@ -1020,7 +1294,8 @@ void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent,
     Double_t mass=999., width = -999;
     Bool_t fFlagLS=kFALSE, fFlagULS=kFALSE;
     
-    ptPrim = track->Pt();
+    //ptPrim = track->Pt();
+    ptPrim = ptEle;
 
     dEdxAsso = trackAsso->GetTPCsignal();
     ptAsso = trackAsso->Pt();
@@ -1084,18 +1359,20 @@ void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent,
     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);
-    
+    if(fFlagULS && ibgevent==0 && jbgevent==0)
+       {
+         fInvmassULSmc->Fill(phoinfo,w);
+       }
     //printf("fInvmassCut %f\n",fInvmassCut);
     //printf("openingAngle %f\n",fOpeningAngleCut);
 
     if(openingAngle > fOpeningAngleCut) continue;
     
     // for real data  
-    printf("mce =%f\n",mce);
+    //printf("mce =%f\n",mce);
     if(mce<-0.5) // mce==-1. is real
        {
-         printf("Real data\n");
+         //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;
@@ -1107,7 +1384,20 @@ void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent,
     // for MC data  
     else
        {
-         printf("MC data\n");
+         //printf("MC data\n");
+
+         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;
@@ -1123,7 +1413,20 @@ void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent,
   
 }
 //-------------------------------------------
-//void AliAnalysisTaskHFECal::GetMCweight(double mcPi0pT)
+
+void AliAnalysisTaskHFECal::FindMother(TParticle* part, int &label, int &pid)
+{
+ //int label = 99999;
+ //int pid = 99999;
+
+ if(part->GetFirstMother()>-1)
+   {
+    label = part->GetFirstMother();
+    pid = stack->Particle(label)->GetPdgCode();
+   }
+   //cout << "Find Mother : label = " << label << " ; pid" << pid << endl;
+}
+
 double AliAnalysisTaskHFECal::GetMCweight(double mcPi0pT)
 {
         double weight = 1.0;
@@ -1139,9 +1442,19 @@ double AliAnalysisTaskHFECal::GetMCweight(double mcPi0pT)
   return weight;
 }
 
+double AliAnalysisTaskHFECal::GetMCweightEta(double mcEtapT)
+{
+  double weight = 1.0;
+
+  weight = 223.3/TMath::Power((TMath::Exp(-0.17*mcEtapT-0.0322*mcEtapT*mcEtapT)+mcEtapT/1.69),5.65);
+  return weight;
+}
+
+
 //_________________________________________
 void AliAnalysisTaskHFECal::FindTriggerClusters()
 {
+  //cout << "finding trigger patch" << endl; 
   // constants
   const int nModuleCols = 2;
   const int nModuleRows = 5;
@@ -1210,9 +1523,11 @@ void AliAnalysisTaskHFECal::FindTriggerClusters()
       //L1 analysis from AliAnalysisTaskEMCALTriggerQA
       Int_t bit = 0;
       fCaloTrigger->GetTriggerBits(bit);
+      //cout << "bit = " << bit << endl;
 
       Int_t ts = 0;
       fCaloTrigger->GetL1TimeSum(ts);
+      //cout << "ts = " << ts << endl;
       if (ts > 0)ftriggers[globCol][globRow] = 1;
       // number of triggered channels in event
       nTrigChannel++;
@@ -1222,6 +1537,9 @@ void AliAnalysisTaskHFECal::FindTriggerClusters()
         iglobCol = globCol;
         iglobRow = globRow;
         nTrigChannelCut++;
+        //cout << "ts cut = " << ts << endl;
+        //cout << "globCol = " << globCol << endl;
+        //cout << "globRow = " << globRow << endl;
         ftriggersCut[globCol][globRow] = 1;
       }
 
@@ -1229,6 +1547,7 @@ void AliAnalysisTaskHFECal::FindTriggerClusters()
   } // has calo trigger entries
 
   // part 2 go through the clusters here -----------------------------------
+  //cout << " part 2 go through the clusters here ----------------------------------- " << endl; 
   Int_t nCluster=0, nCell=0, iCell=0, gCell=0;
   Short_t cellAddr, nSACell, mclabel;
   //Int_t nSACell, iSACell, mclabel;
@@ -1327,6 +1646,9 @@ void AliAnalysisTaskHFECal::FindTriggerClusters()
       fphi = gphi / 2;
       feta = geta / 2;
 
+        //cout << "fphi = " << fphi << endl;
+        //cout << "feta = " << feta << endl;
+
       // try to match with a triggered
       if( ftriggers[feta][fphi]==1)
       {  nClusterTrig++;
@@ -1335,6 +1657,8 @@ void AliAnalysisTaskHFECal::FindTriggerClusters()
       { nClusterTrigCut++;
       }
 
+      //cout << "nClusterTrigCut : " << nClusterTrigCut << endl;
+     
     } // cells
 
 
@@ -1383,7 +1707,16 @@ void AliAnalysisTaskHFECal::FindTriggerClusters()
 }
 
 
-
+double AliAnalysisTaskHFECal::NsigCorr(int cent)
+{
+ double shift = 0.0;
+ if(cent>=20 && cent<30)shift = 0.156;
+ if(cent>=30 && cent<40)shift = 0.316;
+ if(cent>=40 && cent<50)shift = 0.336;
+ if(cent>=50 && cent<70)shift = 0.440;
+ if(cent>=70 && cent<90)shift = 0.534;
+ return shift;
+}