from Megan

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx
index 5262338a3c07a1bb8e153a39a45023dfcc0d56c1..49331855f67d14ec199f4153df91058674f57e64 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx
@@ -43,6 +43,7 @@ AliAnalysisTaskEmcalJetSpectraMECpA::AliAnalysisTaskEmcalJetSpectraMECpA() :
   // Default constructor.
   for (Int_t i = 0;i<7;++i){
     fHistJetPtvsTrackPt[i]      = 0;
+    fHistJetPtScvsTrackPt[i]      = 0;
     fHistRawJetPtvsTrackPt[i]   = 0;
     fHistTrackPt[i]             = 0;
     fHistEP0[i]                 = 0;
@@ -51,6 +52,8 @@ AliAnalysisTaskEmcalJetSpectraMECpA::AliAnalysisTaskEmcalJetSpectraMECpA() :
     fHistEPAvsC[i]              = 0;
     fHistJetPtvsdEP[i]          = 0;
     fHistJetPtvsdEPBias[i]      = 0;
+    fHistJetPtvsEP[i]          = 0;
+    fHistJetPtvsEPBias[i]      = 0;
     fHistRhovsEP[i]             = 0;
     fHistJetPtEtaPhi[i]         = 0;
 
@@ -67,6 +70,7 @@ AliAnalysisTaskEmcalJetSpectraMECpA::AliAnalysisTaskEmcalJetSpectraMECpA(const c
  { 
    for (Int_t i = 0;i<7;++i){
     fHistJetPtvsTrackPt[i]      = 0;
+    fHistJetPtScvsTrackPt[i]      = 0;
     fHistRawJetPtvsTrackPt[i]   = 0;
     fHistTrackPt[i]             = 0;
     fHistEP0[i]                 = 0;
@@ -75,6 +79,8 @@ AliAnalysisTaskEmcalJetSpectraMECpA::AliAnalysisTaskEmcalJetSpectraMECpA(const c
     fHistEPAvsC[i]              = 0;
     fHistJetPtvsdEP[i]          = 0;
     fHistJetPtvsdEPBias[i]      = 0;
+    fHistJetPtvsEP[i]          = 0;
+    fHistJetPtvsEPBias[i]      = 0;
     fHistRhovsEP[i]             = 0;
     fHistJetPtEtaPhi[i]         = 0;
    }

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C
index 0f2a2f0221375e0ac4079cfaceefefa414b7a0e6..81237ddf9e6a7a3f8052e715dc1553aa39506961 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C
@@ -86,17 +86,24 @@ AliAnalysisTaskEmcalJetSpectraMECpA* AddTaskEmcalJetSpectraMECpA(
   deltapt->SetCentralityEstimator(CentEst);
 
   TString emcdeltaname(Form("DeltaPt_%s", nRhosChEm));
-  AliAnalysisTaskDeltaPt* deltaptEMC = AddTaskDeltaPt(usedTracks,outClusName,nJets,"","","","","",nRhosChEm,radius,1,AreaCut,minTrackPt,minClusterPt,AliAnalysisTaskEmcal::kEMCAL,"DeltaPtTask");
+  AliAnalysisTaskDeltaPt* deltaptEMC = AddTaskDeltaPt(usedTracks,outClusName,nJets,"","","","","",nRhosChEm,radius,1,AreaCut,minTrackPt,minClusterPt,AliAnalysisTaskEmcal::kEMCAL,emcdeltaname);
   deltapt->SetCentralityEstimator(CentEst);
 
   gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskScale.C");
 
-  AliAnalysisTaskScale* scaletask = AddTaskScale(usedTracks,outClusName,0.15,0.3);
+
+  Int_t radlabel=(Int_t)floor(radius*100+0.5);
+  Int_t mincluslabel=(Int_t)floor(minClusterPt*1000+0.5);
+  Int_t mintracklabel=(Int_t)floor(minTrackPt*1000+0.5);
+  TString scalename(Form("Scale_R0%d", radlabel));
+
+  AliAnalysisTaskScale* scaletask = AddTaskScale(usedTracks,outClusName,minTrackPt,minClusterPt,scalename);
   scaletask->SetCentralityEstimator(CentEst);
   scaletask->SetScaleFunction(sfunc);
-  
 
+  
   }
+
   cout << "Running non charged jet finders..." <<endl;
   AliEmcalJetTask* jetFinderTaskEm = AddTaskEmcalJet("",outClusName,cANTIKT,radius,cNEUTRALJETS,minTrackPt,minClusterPt);