updated

diff --git a/PWGHF/hfe/AliAnalysisTaskElecV2.cxx b/PWGHF/hfe/AliAnalysisTaskElecV2.cxx
index 86924f31bcfe06d326365424f7c66ec41320eaed..5b8e7d50b09a74260ffaa125c40aa279d86f3a9c 100644 (file)
--- a/PWGHF/hfe/AliAnalysisTaskElecV2.cxx
+++ b/PWGHF/hfe/AliAnalysisTaskElecV2.cxx
@@ -442,7 +442,7 @@ void AliAnalysisTaskElecV2::UserExec(Option_t*)
            TParticle *mother = stack->Particle(idMother);
            Int_t motherPDG = mother->GetPdgCode();
            
-           Double_t mc[4]={partPt,fFlagPhotonicElec,IsElec,cent};
+           Double_t mc[9]={partPt,fFlagPhotonicElec,fFlagLS,fFlagULS,IsElec,openingAngle,mass,cent,pt};
            
            if (motherPDG==22 || motherPDG==111 || motherPDG==221) fMCphotoElecPt->Fill(mc);// gamma, pi0, eta
          }
@@ -598,10 +598,10 @@ void AliAnalysisTaskElecV2::UserCreateOutputObjects()
   feTPCV2 = new THnSparseD ("feTPCV2","inclusive electron v2 (TPC)",5,binsv6,xminv6,xmaxv6);
   fOutputList->Add(feTPCV2);
   
-  Int_t binsv7[4]={100,3,3,90}; // pt, IsPhotonicElectron, IsElectron,centrality
-  Double_t xminv7[4]={0,-1,-1,0};
-  Double_t xmaxv7[4]={50,2,2,90}; 
-  fMCphotoElecPt = new THnSparseD ("fMCphotoElecPt", "pt distribution (MC)",4,binsv7,xminv7,xmaxv7);
+  Int_t binsv7[9]={100,3,3,3,3,100,100,90,100}; // partPt,  fFlagPhotonicElec,  fFlagLS,  fFlagULS,  IsElec,  openingAngle,  mass,  cent,  pt
+  Double_t xminv7[9]={0,-1,-1,-1,-1,0,0,0,0};
+  Double_t xmaxv7[9]={50,2,2,2,2,1,0.5,90,50}; 
+  fMCphotoElecPt = new THnSparseD ("fMCphotoElecPt", "pt distribution (MC)",9,binsv7,xminv7,xmaxv7);
   fOutputList->Add(fMCphotoElecPt);
    
   PostData(1,fOutputList);

diff --git a/PWGHF/hfe/AliAnalysisTaskHFECal.cxx b/PWGHF/hfe/AliAnalysisTaskHFECal.cxx
index d82260c11d065c6185f2ec67b3621d3c439c1179..ac8697567e8d53235d56c9588bea139e57d1fac2 100644 (file)
--- a/PWGHF/hfe/AliAnalysisTaskHFECal.cxx
+++ b/PWGHF/hfe/AliAnalysisTaskHFECal.cxx
@@ -371,7 +371,7 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
          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); 
-         if(fqahist==1 && clustE>1.5)fEMCAccE->Fill(calInfo); 
+         //if(fqahist==1 && clustE>1.5)fEMCAccE->Fill(calInfo); 
         }
    }
 
@@ -387,11 +387,13 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
     Bool_t mcDtoE= kFALSE;
     Bool_t mcBtoE= kFALSE;
     double mcele = -1.;
+    double mcpT = 0.0;
     if(fmcData && fMC && stack)
       {
        Int_t label = TMath::Abs(track->GetLabel());
        TParticle* particle = stack->Particle(label);
        int mcpid = particle->GetPdgCode();
+       mcpT = particle->Pt();
        //printf("MCpid = %d",mcpid);
        if(particle->GetFirstMother()>-1)
          {
@@ -481,7 +483,7 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
 
                  double valdedx[16];
                  valdedx[0] = pt; valdedx[1] = dEdx; valdedx[2] = phi; valdedx[3] = eta; valdedx[4] = fTPCnSigma;
-                 valdedx[5] = eop; valdedx[6] = rmatch; valdedx[7] = ncells,  valdedx[8] = m02; valdedx[9] = m20; valdedx[10] = disp;
+                 valdedx[5] = eop; valdedx[6] = rmatch; valdedx[7] = ncells,  valdedx[8] = m02; valdedx[9] = m20; valdedx[10] = mcpT;
                  valdedx[11] = cent; valdedx[12] = charge; valdedx[13] = oppstatus; valdedx[14] = clust->Chi2();
                   valdedx[15] = mcele;
                   if(fqahist==1)fEleInfo->Fill(valdedx);
@@ -549,15 +551,20 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
          }
        if(mcPho)
         {
-         fIncpTMCpho->Fill(cent,pt);    
-         if(fFlagPhotonicElec) fPhoElecPtMC->Fill(cent,pt);
-         if(fFlagConvinatElec) fSameElecPtMC->Fill(cent,pt);
+         double phoval[3];
+         phoval[0] = cent;
+         phoval[1] = pt;
+         phoval[2] = fTPCnSigma;
+
+         fIncpTMCpho->Fill(phoval);    
+         if(fFlagPhotonicElec) fPhoElecPtMC->Fill(phoval);
+         if(fFlagConvinatElec) fSameElecPtMC->Fill(phoval);
 
          if(m20>0.0 && m20<0.3) 
            {
-            fIncpTMCM20pho->Fill(cent,pt);    
-            if(fFlagPhotonicElec) fPhoElecPtMCM20->Fill(cent,pt);
-            if(fFlagConvinatElec) fSameElecPtMCM20->Fill(cent,pt);
+            fIncpTMCM20pho->Fill(phoval);    
+            if(fFlagPhotonicElec) fPhoElecPtMCM20->Fill(phoval);
+            if(fFlagConvinatElec) fSameElecPtMCM20->Fill(phoval);
            }
         } 
       } 
@@ -708,16 +715,16 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fOutputList->Add(fCent);
  
   // Make common binning
-  const Double_t kMinP = 2.;
+  const Double_t kMinP = 0.;
   const Double_t kMaxP = 50.;
   const Double_t kTPCSigMim = 40.;
   const Double_t kTPCSigMax = 140.;
 
   // 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] =  {  480,        200,   60,    20,   600,  300, 100,   40,   200, 200, 200, 100,    3,    5,   10,    8};
-  Double_t min[16] = {kMinP,  kTPCSigMim, 1.0,  -1.0,  -8.0,    0,   0,    0,   0.0, 0.0, 0.0,   0, -1.5, -0.5, -0.5, -1.5};
-  Double_t max[16] = {kMaxP,  kTPCSigMax, 4.0,   1.0,   4.0,  3.0, 0.1,   40,   2.0, 2.0, 2.0, 100,  1.5,  4.5,  9.5,  6.5};
-  fEleInfo = new THnSparseD("fEleInfo", "Electron Info; pT [GeV/c]; TPC signal;phi;eta;nSig; E/p;Rmatch;Ncell;M02;M20;Disp;Centrality;charge;opp;same;trigCond;MCele", 16, nBins, min, max);
+  Int_t nBins[16] =  {  250,        200,   60,    20,   100,  300,  50,   40,   200, 200,  250, 100,    3,    5,   10,    8};
+  Double_t min[16] = {kMinP,  kTPCSigMim, 1.0,  -1.0,  -6.0,    0,   0,    0,   0.0, 0.0,  0.0,   0, -1.5, -0.5, -0.5, -1.5};
+  Double_t max[16] = {kMaxP,  kTPCSigMax, 4.0,   1.0,   4.0,  3.0, 0.1,   40,   2.0, 2.0, 50.0, 100,  1.5,  4.5,  9.5,  6.5};
+  fEleInfo = new THnSparseD("fEleInfo", "Electron Info; pT [GeV/c]; TPC signal;phi;eta;nSig; E/p;Rmatch;Ncell;M02;M20;mcpT;Centrality;charge;opp;same;trigCond;MCele", 16, nBins, min, max);
   if(fqahist==1)fOutputList->Add(fEleInfo);
 
   //<---  Trigger info
@@ -772,22 +779,27 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects()
   fIncpTMCM20hfeAll = new TH2F("fIncpTMCM20hfeAll","MC Alle pid electro vs. centrality with M20",100,0,100,100,0,50);
   fOutputList->Add(fIncpTMCM20hfeAll);
 
-  fIncpTMCpho = new TH2F("fIncpTMCpho","MC Pho pid electro vs. centrality",100,0,100,100,0,50);
+
+  Int_t nBinspho2[3] =  { 100, 100,    7};
+  Double_t minpho2[3] = {  0.,  0., -2.5};   
+  Double_t maxpho2[3] = {100., 50.,  4.5};   
+
+  fIncpTMCpho = new THnSparseD("fIncpTMCpho","MC Pho pid electro vs. centrality",3,nBinspho2,minpho2,maxpho2);
   fOutputList->Add(fIncpTMCpho);
 
-  fIncpTMCM20pho = new TH2F("fIncpTMCM20pho","MC Pho pid electro vs. centrality with M20",100,0,100,100,0,50);
+  fIncpTMCM20pho = new THnSparseD("fIncpTMCM20pho","MC Pho pid electro vs. centrality with M20",3,nBinspho2,minpho2,maxpho2);
   fOutputList->Add(fIncpTMCM20pho);
 
-  fPhoElecPtMC = new TH2F("fPhoElecPtMC", "MC Pho-inclusive electron pt",100,0,100,100,0,50);
+  fPhoElecPtMC = new THnSparseD("fPhoElecPtMC", "MC Pho-inclusive electron pt",3,nBinspho2,minpho2,maxpho2);
   fOutputList->Add(fPhoElecPtMC);
   
-  fPhoElecPtMCM20 = new TH2F("fPhoElecPtMCM20", "MC Pho-inclusive electron pt with M20",100,0,100,100,0,50);
+  fPhoElecPtMCM20 = new THnSparseD("fPhoElecPtMCM20", "MC Pho-inclusive electron pt with M20",3,nBinspho2,minpho2,maxpho2);
   fOutputList->Add(fPhoElecPtMCM20);
 
-  fSameElecPtMC = new TH2F("fSameElecPtMC", "MC Same-inclusive electron pt",100,0,100,100,0,50);
+  fSameElecPtMC = new THnSparseD("fSameElecPtMC", "MC Same-inclusive electron pt",3,nBinspho2,minpho2,maxpho2);
   fOutputList->Add(fSameElecPtMC);
 
-  fSameElecPtMCM20 = new TH2F("fSameElecPtMCM20", "MC Same-inclusive electron pt with M20",100,0,100,100,0,50);
+  fSameElecPtMCM20 = new THnSparseD("fSameElecPtMCM20", "MC Same-inclusive electron pt with M20",3,nBinspho2,minpho2,maxpho2);
   fOutputList->Add(fSameElecPtMCM20);
 
 

diff --git a/PWGHF/hfe/AliAnalysisTaskHFECal.h b/PWGHF/hfe/AliAnalysisTaskHFECal.h
index da5a4f1f4ff82d2329fa804c87f4ed432f7000bb..fd3d3be44a1169e0dbe84a935b506b277035ac11 100644 (file)
--- a/PWGHF/hfe/AliAnalysisTaskHFECal.h
+++ b/PWGHF/hfe/AliAnalysisTaskHFECal.h
@@ -129,12 +129,12 @@ class AliAnalysisTaskHFECal : public AliAnalysisTaskSE {
   TH2F                 *fIncpTMChfeAll;                //! MC HFE pid electron vs centrality
   TH2F                 *fIncpTMCM20hfe;        //! MC HFE pid electron vs centrality
   TH2F                 *fIncpTMCM20hfeAll;     //! MC HFE pid electron vs centrality
-  TH2F                 *fIncpTMCpho;           //! MC HFE pid electron vs centrality
-  TH2F                 *fIncpTMCM20pho;        //! MC HFE pid electron vs centrality
-  TH2F                 *fPhoElecPtMC;          //! Pho inclusive ele pt
-  TH2F                 *fPhoElecPtMCM20;               //! Pho inclusive ele pt
-  TH2F                 *fSameElecPtMC;         //! Same inclusive ele pt
-  TH2F                 *fSameElecPtMCM20;              //! Same inclusive ele pt
+ THnSparseD            *fIncpTMCpho;           //! MC HFE pid electron vs centrality
+ THnSparseD            *fIncpTMCM20pho;        //! MC HFE pid electron vs centrality
+ THnSparseD            *fPhoElecPtMC;          //! Pho inclusive ele pt
+ THnSparseD            *fPhoElecPtMCM20;               //! Pho inclusive ele pt
+ THnSparseD            *fSameElecPtMC;         //! Same inclusive ele pt
+ THnSparseD            *fSameElecPtMCM20;              //! Same inclusive ele pt
   
   AliAnalysisTaskHFECal(const AliAnalysisTaskHFECal&); // not implemented
   AliAnalysisTaskHFECal& operator=(const AliAnalysisTaskHFECal&); // not implemented