add in isolation task histograms dependent on NLM

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx
index 2f5b10e92cdb79f3c63df9abc1d6e76f2ba3baeb..86c7a03cf8acac9bbb8007af446ad6b38c2746b0 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx
+++ b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx
@@ -58,10 +58,11 @@ fNCones(0),                       fNPtThresFrac(0),
 fConeSizes(),                     fPtThresholds(),                 
 fPtFractions(),                   fSumPtThresholds(),
 // Histograms
-fhEIso(0),                        fhPtIso(0),                       
+fhEIso(0),                        fhPtIso(0),                      fhPtNLocMaxIso(0),                       
 fhPhiIso(0),                      fhEtaIso(0),                     fhEtaPhiIso(0), 
 fhEtaPhiNoIso(0), 
-fhPtNoIso(0),                     fhPtDecayIso(0),                 fhPtDecayNoIso(0),
+fhPtNoIso(0),                     fhPtNLocMaxNoIso(0),                     
+fhPtDecayIso(0),                  fhPtDecayNoIso(0),
 fhEtaPhiDecayIso(0),              fhEtaPhiDecayNoIso(0), 
 fhConeSumPt(0),                   fhPtInCone(0),                   
 fhPtInConePileUp(0),              fhPtInConeCent(0),
@@ -878,6 +879,13 @@ TList *  AliAnaParticleIsolation::GetCreateOutputObjects()
     fhPtIso->SetXTitle("p_{T} (GeV/c)");
     outputContainer->Add(fhPtIso) ; 
     
+    fhPtNLocMaxIso  = new TH2F("hPtNLocMax",
+                               Form("Number of isolated particles vs p_{T} for R = %2.2f, p_{T}^{th} = %2.2f vs NLM, p_{T}^{fr} = %2.2f",r,ptthre,ptfrac),
+                               nptbins,ptmin,ptmax,10,0,10); 
+    fhPtNLocMaxIso->SetYTitle("NLM");
+    fhPtNLocMaxIso->SetXTitle("p_{T} (GeV/c)");
+    outputContainer->Add(fhPtNLocMaxIso) ; 
+    
     fhPhiIso  = new TH2F("hPhi",
                          Form("Number of isolated particles vs #phi for R = %2.2f, p_{T}^{th} = %2.2f, p_{T}^{fr} = %2.2f",r,ptthre,ptfrac),
                          nptbins,ptmin,ptmax,nphibins,phimin,phimax); 
@@ -1039,6 +1047,7 @@ TList *  AliAnaParticleIsolation::GetCreateOutputObjects()
       fhPtIsoHadron->SetXTitle("p_{T}(GeV/c)");
       outputContainer->Add(fhPtIsoHadron) ; 
       
+      
       fhPhiIsoHadron  = new TH2F
       ("hPhiMCHadron","Number of isolated non-#gamma particles",nptbins,ptmin,ptmax,nphibins,phimin,phimax); 
       fhPhiIsoHadron->SetYTitle("#phi");
@@ -1064,6 +1073,12 @@ TList *  AliAnaParticleIsolation::GetCreateOutputObjects()
   fhPtNoIso->SetXTitle("p_{T}(GeV/c)");
   outputContainer->Add(fhPtNoIso) ;
   
+  fhPtNLocMaxNoIso  = new TH2F("hPtNLocMaxNoIso",
+                               Form("Number of not isolated particles vs p_{T} for R = %2.2f, p_{T}^{th} = %2.2f vs NLM, p_{T}^{fr} = %2.2f",r,ptthre,ptfrac),
+                               nptbins,ptmin,ptmax,10,0,10); 
+  fhPtNLocMaxNoIso->SetYTitle("NLM");
+  fhPtNLocMaxNoIso->SetXTitle("p_{T} (GeV/c)");
+  outputContainer->Add(fhPtNLocMaxNoIso) ;   
   
   fhEtaPhiNoIso  = new TH2F("hEtaPhiNoIso",
                             Form("Number of not isolated leading particles #eta vs #phi for R = %2.2f, p_{T}^{th} = %2.2f, p_{T}^{fr} = %2.2f",r,ptthre,ptfrac),
@@ -1876,10 +1891,10 @@ void  AliAnaParticleIsolation::MakeAnalysisFillHistograms()
     
     Int_t mcTag = aod->GetTag() ;
     Int_t clID  = aod->GetCaloLabel(0) ;
-    
+    Int_t nlm = aod->GetFiducialArea();
     if(GetDebug() > 0) printf(" AliAnaParticleIsolation::MakeAnalysisFillHistograms() - pt %1.1f, eta %1.1f, phi %1.1f\n",pt, eta, phi);
     
-    FillTrackMatchingShowerShapeControlHistograms(isolation, clID,aod->GetFiducialArea(),mcTag,reftracks,refclusters,aod,GetReader(), GetCaloPID());
+    FillTrackMatchingShowerShapeControlHistograms(isolation, clID,nlm,mcTag,reftracks,refclusters,aod,GetReader(), GetCaloPID());
     
     if(isolation)
     {    
@@ -1894,6 +1909,7 @@ void  AliAnaParticleIsolation::MakeAnalysisFillHistograms()
       fhPhiIso    ->Fill(pt,phi);
       fhEtaIso    ->Fill(pt,eta);
       fhEtaPhiIso ->Fill(eta,phi);
+      fhPtNLocMaxIso->Fill(pt,nlm);
       
       if(decay) 
       {
@@ -1966,7 +1982,8 @@ void  AliAnaParticleIsolation::MakeAnalysisFillHistograms()
       
       fhPtNoIso    ->Fill(pt);
       fhEtaPhiNoIso->Fill(eta,phi);
-      
+      fhPtNLocMaxNoIso->Fill(pt,nlm);
+
       if(decay) 
       {
         fhPtDecayNoIso    ->Fill(pt);

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h
index 634a98da08e0364e98108da3b307859dcef590ff..1dc9e1397b66f68fc8c02c9a543ae8003e21cf98 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h
+++ b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.h
@@ -139,11 +139,13 @@ class AliAnaParticleIsolation : public AliAnaCaloTrackCorrBaseClass {
   
   TH1F *   fhEIso ;                               //! Number of isolated particles
   TH1F *   fhPtIso ;                              //! Number of isolated particles
+  TH2F *   fhPtNLocMaxIso ;                       //! Number of isolated particles vs NLM in cluster
   TH2F *   fhPhiIso ;                             //! Phi of isolated particles
   TH2F *   fhEtaIso ;                             //! eta of isolated particles
   TH2F *   fhEtaPhiIso ;                          //! eta vs phi of isolated particles
   TH2F *   fhEtaPhiNoIso ;                        //! eta vs phi of not isolated leading particles
   TH1F *   fhPtNoIso ;                            //! Number of not isolated leading particles
+  TH2F *   fhPtNLocMaxNoIso ;                     //! Number of not isolated particles vs NLM in cluster
   TH1F *   fhPtDecayIso ;                         //! Number of isolated Pi0 decay particles (invariant mass tag)
   TH1F *   fhPtDecayNoIso ;                       //! Number of not isolated Pi0 decay leading particles (invariant mass tag)
   TH2F *   fhEtaPhiDecayIso ;                     //! eta vs phi of isolated Pi0 decay particles
@@ -305,7 +307,7 @@ class AliAnaParticleIsolation : public AliAnaCaloTrackCorrBaseClass {
   AliAnaParticleIsolation(              const AliAnaParticleIsolation & iso) ; // cpy ctor
   AliAnaParticleIsolation & operator = (const AliAnaParticleIsolation & iso) ; // cpy assignment
   
-  ClassDef(AliAnaParticleIsolation,17)
+  ClassDef(AliAnaParticleIsolation,18)
 } ;
 
 

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx b/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx
index 215b1ab9f434c37a51a963dae6bbade2d8ea2b89..08c49833ac4c17a2eabd7316bfab40b3f643a14f 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx
+++ b/PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx
@@ -1923,6 +1923,9 @@ void  AliAnaPi0EbE::MakeShowerShapeIdentification()
     if(GetDebug() > 1) printf("AliAnaPi0EbE::MakeShowerShapeIdentification() - Pi0 selection cuts passed: pT %3.2f, pdg %d\n",
                               aodpi0.Pt(), aodpi0.GetIdentifiedParticleType());
     
+    // Add number of local maxima to AOD, method name in AOD to be FIXED
+    aodpi0.SetFiducialArea(nMaxima);
+    
     //Play with the MC stack if available
     //Check origin of the candidates
     Int_t tag  = 0 ;