from Megan

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx
index aa7e48a2533e55bc7bbf9d85cf27f57cbe76ebbf..daf1c022e23d679c7e2020f0dfc44ee31f721cb0 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx
@@ -87,6 +87,7 @@ void AliAnalysisTaskEmcalJetSpectraMECpA::UserCreateOutputObjects()
   AliAnalysisTaskEmcalJet::UserCreateOutputObjects();
 
   fHistRhovsCent             = new TH2F("RhovsCent",              "RhovsCent",             100, 0.0, 100.0, 500, 0, 500);
+  fHistRhoScvsCent             = new TH2F("RhoScvsCent",              "RhoScvsCent",             100, 0.0, 100.0, 500, 0, 500);
   fHistNjetvsCent            = new TH2F("NjetvsCent",             "NjetvsCent",            100, 0.0, 100.0, 100, 0, 100);
 
   TString name;
@@ -96,6 +97,12 @@ void AliAnalysisTaskEmcalJetSpectraMECpA::UserCreateOutputObjects()
     title = TString(Form("Jet pT vs Leading Track pT cent bin %i",i));
     fHistJetPtvsTrackPt[i] = new TH2F(name,title,1000,-500,500,100,0,100);
     fOutput->Add(fHistJetPtvsTrackPt[i]);
+ 
+    name = TString(Form("JetPtScvsTrackPt_%i",i));
+    title = TString(Form("Jet pT Rho_scaled vs Leading Track pT cent bin %i",i));
+    fHistJetPtScvsTrackPt[i] = new TH2F(name,title,1000,-500,500,100,0,100);
+    fOutput->Add(fHistJetPtScvsTrackPt[i]);
+
     name = TString(Form("RawJetPtvsTrackPt_%i",i));
     title = TString(Form("Raw Jet pT vs Leading Track pT cent bin %i",i));
     fHistRawJetPtvsTrackPt[i] = new TH2F(name,title,1000,-500,500,100,0,100);
@@ -222,11 +229,24 @@ Bool_t AliAnalysisTaskEmcalJetSpectraMECpA::Run()
   fHistEP0A[centbin]->Fill(fEPV0A);
   fHistEP0C[centbin]->Fill(fEPV0C);
   fHistEPAvsC[centbin]->Fill(fEPV0A,fEPV0C);
-  TString fRhoScaledName = fRhoName;
-  fRho = GetRhoFromEvent(fRhoScaledName);
+
+  fRho = GetRhoFromEvent(fRhoName);
   fRhoVal = fRho->GetVal();
   fHistRhovsCent->Fill(fCent,fRhoVal);
+  fHistRhovsCent->Fill(fCent,fRhoVal);
   fHistRhovsEP[centbin]->Fill(fRhoVal,fEPV0);
+
+  
+  TString fRhoScaledName = fRhoName;
+  fRhoScaledName.Append("_Scaled");
+  Double_t fRhoScVal = 0;
+  AliRhoParameter *fRhoScaled=GetRhoFromEvent(fRhoScaledName);
+  if(fRhoScaled){
+    fRhoScVal=fRhoScaled->GetVal();
+    if(fRhoScVal){
+      fHistRhoScvsCent->Fill(fCent,fRhoScVal);
+    }
+  }
   const Int_t Njets = fJets->GetEntriesFast();
 
   Int_t NjetAcc = 0;
@@ -247,6 +267,13 @@ Bool_t AliAnalysisTaskEmcalJetSpectraMECpA::Run()
      Double_t jetPt = -500;
      jetPt = jet->Pt()-jet->Area()*fRhoVal;    
      fHistJetPtvsTrackPt[centbin]->Fill(jetPt,jet->MaxTrackPt());
+
+     if(fRhoScVal) {
+       Double_t jetPtSc = -500;
+       jetPtSc = jet->Pt()-jet->Area()*fRhoScVal;    
+       fHistJetPtScvsTrackPt[centbin]->Fill(jetPtSc,jet->MaxTrackPt());
+     }
+
      fHistRawJetPtvsTrackPt[centbin]->Fill(jet->Pt(),jet->MaxTrackPt());
 
      fHistJetPtEtaPhi[centbin]->Fill(jet->Pt(),jet->Eta(),jet->Phi());

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.h
index bcc9de12078d7b70437aeffa2095051ffa4e50b9..5b87898c5ffa4fbd1e61e019da876a45c45d1da6 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.h
@@ -27,8 +27,10 @@ class AliAnalysisTaskEmcalJetSpectraMECpA : public AliAnalysisTaskEmcalJet {
 
  private:
   TH2F                  *fHistRhovsCent;  //!
+  TH2F                  *fHistRhoScvsCent;  //!
   TH2F                  *fHistNjetvsCent; //!number of jets versus Centrality
   TH2F                  *fHistJetPtvsTrackPt[6];//!
+  TH2F                  *fHistJetPtScvsTrackPt[6];//!
   TH2F                  *fHistRawJetPtvsTrackPt[6];//!
   TH1F                  *fHistTrackPt[6];//!
   TH1F                  *fHistEP0[6];//!
@@ -48,6 +50,6 @@ class AliAnalysisTaskEmcalJetSpectraMECpA : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskEmcalJetSpectraMECpA(const AliAnalysisTaskEmcalJetSpectraMECpA&); // not implemented
   AliAnalysisTaskEmcalJetSpectraMECpA& operator=(const AliAnalysisTaskEmcalJetSpectraMECpA&); // not implemented
   
-  ClassDef(AliAnalysisTaskEmcalJetSpectraMECpA, 2); // Emcal jet spectra task
+  ClassDef(AliAnalysisTaskEmcalJetSpectraMECpA, 3); // Emcal jet spectra task
 };
 #endif

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C
index 6f00b8de636cb3ceb69efdbead80eea4ede25939..42c7c21dfcf78e7b3e7fbf2abcd3aadaec36d9b4 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSpectraMECpA.C
@@ -3,7 +3,8 @@
 AliAnalysisTaskEmcalJetSpectraMECpA* AddTaskEmcalJetSpectraMECpA(
    const char *outfilename    = "AnalysisOutput.root",
    UInt_t type                = AliAnalysisTaskEmcal::kTPC,
-   const char *nRhosCh        = "rhoChEm",
+   const char *nRhosCh        = "rhoCh",
+   const char *nRhosChEm      = "rhoChEm",
    TF1 *sfunc                 = 0,
    const Double_t radius      = 0.2,
    const Double_t minPhi      = 1.8,
@@ -45,18 +46,28 @@ AliAnalysisTaskEmcalJetSpectraMECpA* AddTaskEmcalJetSpectraMECpA(
     
   float AreaCut = radius*radius*TMath::Pi();
 
-  gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJet.C");
+  sfunc=new TF1("sfunc","[0]*x*x+[1]*x+[2]",-1,100);
+  sfunc->SetParameter(0,0.0);
+  sfunc->SetParameter(1,0.0);
+  sfunc->SetParameter(2,1.5);
 
-    AliEmcalJetTask* jetFinderTaskChBack = AddTaskEmcalJet(usedTracks,"",cKT,radius,cCHARGEDJETS,minTrackPt, minClusterPt);
 
+  gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJet.C");
+  
+  AliEmcalJetTask* jetFinderTaskChBack = AddTaskEmcalJet(usedTracks,"",cKT,radius,cCHARGEDJETS,minTrackPt, minClusterPt);
+  
+  AliEmcalJetTask* jetFinderTaskChEmBack = AddTaskEmcalJet(usedTracks,outClusName,cKT,radius,cFULLJETS,minTrackPt, minClusterPt);
 
   AliEmcalJetTask* jetFinderTask = AddTaskEmcalJet(usedTracks,outClusName,cANTIKT,radius, cFULLJETS,minTrackPt,minClusterPt);
 
   gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskRho.C");
 
-  AliAnalysisTaskRho *rhochtask = AddTaskRho(jetFinderTaskChBack->GetName(),usedTracks,outClusName,nRhosCh,0.2,0,0.01,0,sfunc,0,kTRUE,nRhosCh);
+  AliAnalysisTaskRho *rhochtask = AddTaskRho(jetFinderTaskChBack->GetName(),usedTracks,outClusName,nRhosCh,0.2,0,0.01,0,sfunc,2,kTRUE,nRhosCh);
+  rhochtask->SetCentralityEstimator(CentEst);
   rhochtask->SetCentralityEstimator(CentEst);
 
+  AliAnalysisTaskRho *rhochemtask = AddTaskRho(jetFinderTaskChEmBack->GetName(),usedTracks,outClusName,nRhosChEm,0.2,0,0.01,0,0,1,kTRUE,nRhosChEm);
+  rhochemtask->SetCentralityEstimator(CentEst);
 
   const char *nJets = jetFinderTask->GetName();