bug fix in con mc pt sum; addition of a MC histo control; addition of two histograms...

[u/mrichter/AliRoot.git] / PWGGA / EMCALTasks / AliAnalysisTaskEMCALIsoPhoton.cxx

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
index 2b03df1e6d932c09a30332e1ae601d05171eb740..e235a33ce57d125dc5d5e3e523ddb7f46fff19ef 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
@@ -97,6 +97,8 @@ AliAnalysisTaskEMCALIsoPhoton::AliAnalysisTaskEMCALIsoPhoton() :
   fRecoPV(0),
   fPVtxZ(0),
   fTrMultDist(0),
+  fClusEtCPVSBGISO(0),
+  fClusEtCPVBGISO(0),
   fMCDirPhotonPtEtaPhi(0),
   fMCIsoDirPhotonPtEtaPhi(0),
   fMCDirPhotonPtEtIso(0),
@@ -113,6 +115,7 @@ AliAnalysisTaskEMCALIsoPhoton::AliAnalysisTaskEMCALIsoPhoton() :
   fMcPtInConeSBGnoUE(0),
   fMcPtInConeTrBGnoUE(0),
   fMcPtInConeTrSBGnoUE(0),
+  fMcPtInConeMcPhoPt(0),
   fAllIsoEtMcGamma(0),
   fAllIsoNoUeEtMcGamma(0),
   fMCDirPhotonPtEtaPhiNoClus(0),
@@ -198,6 +201,8 @@ AliAnalysisTaskEMCALIsoPhoton::AliAnalysisTaskEMCALIsoPhoton(const char *name) :
   fRecoPV(0),
   fPVtxZ(0),            
   fTrMultDist(0),
+  fClusEtCPVSBGISO(0),
+  fClusEtCPVBGISO(0),
   fMCDirPhotonPtEtaPhi(0),
   fMCIsoDirPhotonPtEtaPhi(0),
   fMCDirPhotonPtEtIso(0),
@@ -214,6 +219,7 @@ AliAnalysisTaskEMCALIsoPhoton::AliAnalysisTaskEMCALIsoPhoton(const char *name) :
   fMcPtInConeSBGnoUE(0),
   fMcPtInConeTrBGnoUE(0),
   fMcPtInConeTrSBGnoUE(0),
+  fMcPtInConeMcPhoPt(0),
   fAllIsoEtMcGamma(0),
   fAllIsoNoUeEtMcGamma(0),
   fMCDirPhotonPtEtaPhiNoClus(0),
@@ -281,6 +287,14 @@ void AliAnalysisTaskEMCALIsoPhoton::UserCreateOutputObjects()
   fTrMultDist = new TH1F("fTrMultDist","track multiplicity;tracks/event;#events",200,0.5,200.5);
   fOutputList->Add(fTrMultDist);
 
+  fClusEtCPVSBGISO = new TH2F("hClusEtCPVSBGISO","ISO^{TRK+EMC} vs. E_{T}^{clus} (after CPV and 0.1<#lambda_{0}^{2}<0.3;E_{T}^{clus} [GeV];ISO^{TRK+EMC} [GeV]",fNBinsPt, fPtBinLowEdge,fPtBinHighEdge,1000,0,100);
+  fClusEtCPVSBGISO->Sumw2();
+  fOutputList->Add(fClusEtCPVSBGISO);
+
+  fClusEtCPVBGISO = new TH2F("hClusEtCPVBGISO","ISO^{TRK+EMC} vs. E_{T}^{clus} (after CPV and 0.5<#lambda_{0}^{2}<2.0;E_{T}^{clus} [GeV];ISO^{TRK+EMC} [GeV]",fNBinsPt, fPtBinLowEdge,fPtBinHighEdge,1000,0,100);
+  fClusEtCPVBGISO->Sumw2();
+  fOutputList->Add(fClusEtCPVBGISO);
+
   fMCDirPhotonPtEtaPhi = new TH3F("hMCDirPhotonPtEtaPhi","photon (gq->#gammaq) p_{T}, #eta, #phi;GeV/c;#eta;#phi",100,-0.5,99.5,154,-0.77,0.77,130,1.38,3.20);
   fMCDirPhotonPtEtaPhi->Sumw2();
   fOutputList->Add(fMCDirPhotonPtEtaPhi);
@@ -334,6 +348,9 @@ void AliAnalysisTaskEMCALIsoPhoton::UserCreateOutputObjects()
   fMcPtInConeTrSBGnoUE  = new TH2F("hMcPtInConeTrSBGnoUE","#sum_{in-cone}p_{T}^{mc-primaries} vs. ISO^{TRK} (SBG range);ISO^{TRK} (GeV);#sum_{in-cone}p_{T}^{mc-primaries}",600,-10,50,1000,0,100);
   fOutputList->Add(fMcPtInConeTrSBGnoUE);
 
+  fMcPtInConeMcPhoPt  = new TH2F("hMcPtInConeMcPhoPt","#sum_{in-cone}p_{T}^{mc-primaries} vs. prompt photon p_{T};p_{T}^{mc-#gamma} (GeV);#sum_{in-cone}p_{T}^{mc-primaries}",fNBinsPt, fPtBinLowEdge,fPtBinHighEdge,200,-0.25,99.75);
+  fOutputList->Add(fMcPtInConeMcPhoPt);
+
   fAllIsoEtMcGamma  = new TH2F("hAllIsoEtMcGammaE","ISO^{TRK+EMC} vs. E_{T}^{clus} for clusters comming from a MC prompt #gamma; E_{T}^{clus} (GeV);ISO^{TRK+EMC} (GeV);",fNBinsPt, fPtBinLowEdge,fPtBinHighEdge,600,-10,50);
   fOutputList->Add(fAllIsoEtMcGamma);
 
@@ -720,6 +737,13 @@ void AliAnalysisTaskEMCALIsoPhoton::FillClusHists()
        fAllIsoNoUeEtMcGamma->Fill(Et, alliso-cecore);
       }
     }
+    Bool_t isCPV = kFALSE;
+    if(TMath::Abs(c->GetTrackDx())<0.03 && TMath::Abs(c->GetTrackDz())<0.02)
+      isCPV = kTRUE;
+    if(c->GetM02()>0.1 && c->GetM02()<0.3 && isCPV)
+      fClusEtCPVSBGISO->Fill(Et,alliso);
+    if(c->GetM02()>0.5 && c->GetM02()<2.0 && isCPV)
+      fClusEtCPVSBGISO->Fill(Et,alliso);
     const Int_t ndims =   fNDimensions;
     Double_t outputValues[ndims];
     if(mcptsum<2)
@@ -1003,6 +1027,7 @@ void AliAnalysisTaskEMCALIsoPhoton ::FillMcHists()
     if((imom==6 || imom==7) && pdgMom==22) {
       fMCDirPhotonPtEtaPhi->Fill(mcp->Pt(),mcp->Eta(),mcp->Phi());
       Float_t ptsum = GetMcPtSumInCone(mcp->Eta(), mcp->Phi(), fIsoConeR);
+      fMcPtInConeMcPhoPt->Fill(mcp->Pt(),ptsum);
       if(ptsum<2)
        fMCIsoDirPhotonPtEtaPhi->Fill(mcp->Pt(),mcp->Eta(),mcp->Phi());
       if(mcphi<(3.14-fIsoConeR) && mcphi>(1.4+fIsoConeR) && TMath::Abs(mceta)<(0.7-fIsoConeR))
@@ -1139,7 +1164,7 @@ Float_t AliAnalysisTaskEMCALIsoPhoton::GetMcPtSumInCone(Float_t etaclus, Float_t
   Int_t nTracks = fStack->GetNtrack();
   Float_t ptsum = 0;
   TString addpartlabels = "";
-  for(Int_t iTrack=8;iTrack<nTracks;iTrack++){
+  for(Int_t iTrack=9;iTrack<nTracks;iTrack++){
     TParticle *mcp = static_cast<TParticle*>(fStack->Particle(iTrack));  
     if(!mcp)
       continue;  
@@ -1155,9 +1180,9 @@ Float_t AliAnalysisTaskEMCALIsoPhoton::GetMcPtSumInCone(Float_t etaclus, Float_t
     }*/
     Float_t dphi = mcp->Phi() - phiclus;
     Float_t deta = mcp->Eta() - etaclus;
-    /*if(fDebug)
+    if(fDebug && TMath::Abs(dphi)<0.01)
       printf("      >>>> mcphi = %1.1f, mceta = %1.1f\n>>>> dphi = %1.1f, deta = %1.1f\n", mcp->Phi(), mcp->Eta(),dphi,deta);
-    */
+    
     if(deta>R || dphi>R)
       continue;
     Float_t dR = TMath::Sqrt(dphi*dphi +  deta*deta);