from Megan

diff --git a/PWGJE/EMCALJetTasks/AliHadCorrTask.cxx b/PWGJE/EMCALJetTasks/AliHadCorrTask.cxx
index 0837e681a0cbf82b26550bd615994e991254dac4..26a303a74e148b0dd79cc7fc2ae0f5d9bb6ee63a 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliHadCorrTask.cxx
+++ b/PWGJE/EMCALJetTasks/AliHadCorrTask.cxx
@@ -48,6 +48,7 @@ AliHadCorrTask::AliHadCorrTask() :
   for(Int_t i=0; i<8; i++) {
     fHistEsubPch[i]    = 0;
     fHistEsubPchRat[i] = 0;
+    fHistEsubPchRatAll[i] = 0;
 
     if (i<4) {
       fHistMatchEvsP[i]    = 0;
@@ -89,6 +90,7 @@ AliHadCorrTask::AliHadCorrTask(const char *name, Bool_t histo) :
   for(Int_t i=0; i<8; i++) {
     fHistEsubPch[i]    = 0;
     fHistEsubPchRat[i] = 0;
+    fHistEsubPchRatAll[i] = 0;
 
     if (i<4) {
       fHistMatchEvsP[i]    = 0;
@@ -377,6 +379,10 @@ void AliHadCorrTask::UserCreateOutputObjects()
     name = Form("fHistEsubPchRat_%i",icent);
     fHistEsubPchRat[icent]=new TH2F(name, name, 400, 0., 200., 1000, 0., 10.);
     fOutput->Add(fHistEsubPchRat[icent]);
+
+    name = Form("fHistEsubPchRatAll_%i",icent);
+    fHistEsubPchRatAll[icent]=new TH2F(name, name, 400, 0., 200., 1000, 0., 10.);
+    fOutput->Add(fHistEsubPchRatAll[icent]);
     
     if (icent<4) {
       for(Int_t itrk=0; itrk<4; ++itrk) {
@@ -618,14 +624,14 @@ Bool_t AliHadCorrTask::Run()
       fHistEbefore->Fill(fCent, cluster->E());
   
     // apply correction / subtraction
-    if (fHadCorr > 0) {
-      // to subtract only the closest track set fHadCor to a %
-      // to subtract all tracks within the cut set fHadCor to %+1
-      if (fHadCorr > 1)
-       energyclus = ApplyHadCorrAllTracks(emccluster, fHadCorr - 1);   
-      else 
-       energyclus = ApplyHadCorrOneTrack(emccluster, fHadCorr);        
-    }
+    // to subtract only the closest track set fHadCor to a %
+    // to subtract all tracks within the cut set fHadCor to %+1
+    if (fHadCorr > 1)
+      energyclus = ApplyHadCorrAllTracks(emccluster, fHadCorr - 1);    
+    else if (fHadCorr > 1)
+      energyclus = ApplyHadCorrOneTrack(emccluster, fHadCorr); 
+    else 
+      energyclus = cluster->E();
 
     if (energyclus < 0) 
       energyclus = 0;
@@ -797,7 +803,10 @@ Double_t AliHadCorrTask::ApplyHadCorrAllTracks(AliEmcalParticle *emccluster, Dou
       
       fHistEsubPchRat[centbinchm]->Fill(totalTrkP, Esub / totalTrkP);
       fHistEsubPch[centbinchm]->Fill(totalTrkP, Esub);
-    } 
+    }
+    if (totalTrkP > 0) {
+      fHistEsubPchRatAll[fCentBin]->Fill(totalTrkP, Esub / totalTrkP);
+    }
   }
 
   // apply the correction

diff --git a/PWGJE/EMCALJetTasks/AliHadCorrTask.h b/PWGJE/EMCALJetTasks/AliHadCorrTask.h
index af8dc00339f51e9800d55171cdd355c000b5a404..dee7140f74dd4d8eb4a1390f0faae752664342cf 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliHadCorrTask.h
+++ b/PWGJE/EMCALJetTasks/AliHadCorrTask.h
@@ -62,11 +62,12 @@ class AliHadCorrTask : public AliAnalysisTaskEmcal {
   TH2F                  *fHistNClusMatchCent;        //!output histograms
   TH1F                  *fHistEsubPch[8];            //!output histograms
   TH2F                  *fHistEsubPchRat[8];         //!output histograms
+  TH2F                  *fHistEsubPchRatAll[8];         //!output histograms
 
  private:
   AliHadCorrTask(const AliHadCorrTask&);            // not implemented
   AliHadCorrTask &operator=(const AliHadCorrTask&); // not implemented
 
-  ClassDef(AliHadCorrTask, 10) // Hadronic correction task
+  ClassDef(AliHadCorrTask, 11) // Hadronic correction task
 };
 #endif

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C
index 81237ddf9e6a7a3f8052e715dc1553aa39506961..9c35bd87acb93353c4d6fa63491ef97ec4c11daf 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C
@@ -54,26 +54,37 @@ AliAnalysisTaskEmcalJetSpectraMECpA* AddTaskEmcalJetSpectraMECpA(
 
 
   gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJet.C");
-  gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskRho.C");
+  gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskRhoSparse.C");
 
   //const char *nJets;
   TString nJets("");
 
   TString scaledname(Form("%s_Scaled", nRhosCh));
+  TString newrhoname(Form("%s_All", nRhosCh));
 
   
   if(!(usedTracks=="")){
     cout << "USEDTRACKS EXISTS" << usedTracks <<endl;
     AliEmcalJetTask* jetFinderTaskChBack = AddTaskEmcalJet(usedTracks,"",cKT,radius,cCHARGEDJETS,minTrackPt, minClusterPt);
 
+    AliEmcalJetTask* jetFinderTaskChBackall = AddTaskEmcalJet(usedTracks,"",cKT,radius,cCHARGEDJETS,minTrackPt, minClusterPt,0.01,"Jets_allpt");
+    jetFinderTaskChBackall->SetMinJetPt(0);
+
+    AliEmcalJetTask* jetFinderTaskChSig = AddTaskEmcalJet(usedTracks,"",cANTIKT,radius,cCHARGEDJETS,minTrackPt, minClusterPt);
+
     AliEmcalJetTask* jetFinderTaskChEmBack = AddTaskEmcalJet(usedTracks,outClusName,cKT,radius,cFULLJETS,minTrackPt, minClusterPt);
+    jetFinderTaskChEmBack->SetMinJetPt(0);
 
   AliEmcalJetTask* jetFinderTask = AddTaskEmcalJet(usedTracks,outClusName,cANTIKT,radius, cFULLJETS,minTrackPt,minClusterPt);
 
-  AliAnalysisTaskRho *rhochtask = AddTaskRho(jetFinderTaskChBack->GetName(),usedTracks,outClusName,nRhosCh,radius,0,0.01,0,sfunc,2,kTRUE,nRhosCh);
+  AliAnalysisTaskRhoSparse *rhochtask = AddTaskRhoSparse(jetFinderTaskChBack->GetName(),jetFinderTaskChSig->GetName(),usedTracks,outClusName,nRhosCh,radius,0,0.01,0,0,sfunc,2,kTRUE,nRhosCh);
   rhochtask->SetCentralityEstimator(CentEst);
 
-  AliAnalysisTaskRho *rhochemtask = AddTaskRho(jetFinderTaskChEmBack->GetName(),usedTracks,outClusName,nRhosChEm,radius,0,0.01,0,0,1,kTRUE,nRhosChEm);
+  AliAnalysisTaskRhoSparse *rhochalltask = AddTaskRhoSparse(jetFinderTaskChBackall->GetName(),jetFinderTaskChSig->GetName(),usedTracks,outClusName,newrhoname,radius,0,0.0,0,0,sfunc,2,kTRUE,newrhoname);
+  rhochtask->SetCentralityEstimator(CentEst);
+
+
+  AliAnalysisTaskRhoSparse *rhochemtask = AddTaskRhoSparse(jetFinderTaskChEmBack->GetName(),jetFinderTask->GetName(),usedTracks,outClusName,nRhosChEm,radius,0,0.01,0,0,0,1,kTRUE,nRhosChEm);
   rhochemtask->SetCentralityEstimator(CentEst);
 
   //nJets=jetFinderTask->GetName();
@@ -111,10 +122,9 @@ AliAnalysisTaskEmcalJetSpectraMECpA* AddTaskEmcalJetSpectraMECpA(
 
   cout << "Running non charged rho task..." <<endl;
 
-  AliAnalysisTaskRho *rhoemtask = AddTaskRho(jetFinderTaskEmBack->GetName(),usedTracks,outClusName,nRhosEm,radius,0,0.01,0,0,1,kTRUE,nRhosEm);
+  AliAnalysisTaskRhoSparse *rhoemtask = AddTaskRhoSparse(jetFinderTaskEmBack->GetName(),jetFinderTaskEm->GetName(),usedTracks,outClusName,nRhosEm,radius,0,0.01,0,0,0,1,kTRUE,nRhosEm);
   rhoemtask->SetCentralityEstimator(CentEst);
 
-  //if((!usedTracks=="")) nJets = jetFinderTaskEm->GetName();
   if(usedTracks=="") nJets +=jetFinderTaskEm->GetName();