X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=PWGJE%2FEMCALJetTasks%2FUserTasks%2FAliAnalysisTaskEmcalJetSpectraMECpA.cxx;h=8050707d5f03649ed99607ea8efb81da89fe82e7;hb=17de48ae2222ce555668afb3a6cad05b5cb38485;hp=daf1c022e23d679c7e2020f0dfc44ee31f721cb0;hpb=e77cf839da188b491f56e0eee8bf80561d6cbc3d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx
index daf1c022e23..8050707d5f0 100644
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetSpectraMECpA.cxx
@@ -1,4 +1,4 @@
-// $Id: AliAnalysisTaskEmcalJetSpectraMECpA.cxx 3010 2012-06-10 05:40:56Z loizides $
+// $Id$
 //
 // Jet spectrum task.
 //
@@ -37,11 +37,13 @@ ClassImp(AliAnalysisTaskEmcalJetSpectraMECpA)
 AliAnalysisTaskEmcalJetSpectraMECpA::AliAnalysisTaskEmcalJetSpectraMECpA() : 
   AliAnalysisTaskEmcalJet("spectra",kFALSE), 
   fHistRhovsCent(0),
+  fHistRhoScvsCent(0),
   fHistNjetvsCent(0)
 {
   // Default constructor.
-  for (Int_t i = 0;i<6;++i){
+  for (Int_t i = 0;i<7;++i){
     fHistJetPtvsTrackPt[i]      = 0;
+    fHistJetPtScvsTrackPt[i]      = 0;
     fHistRawJetPtvsTrackPt[i]   = 0;
     fHistTrackPt[i]             = 0;
     fHistEP0[i]                 = 0;
@@ -50,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;
 
@@ -61,10 +65,12 @@ AliAnalysisTaskEmcalJetSpectraMECpA::AliAnalysisTaskEmcalJetSpectraMECpA() :
 AliAnalysisTaskEmcalJetSpectraMECpA::AliAnalysisTaskEmcalJetSpectraMECpA(const char *name) :
   AliAnalysisTaskEmcalJet(name,kTRUE),
   fHistRhovsCent(0),
+  fHistRhoScvsCent(0),
   fHistNjetvsCent(0)
  { 
-   for (Int_t i = 0;i<6;++i){
+   for (Int_t i = 0;i<7;++i){
     fHistJetPtvsTrackPt[i]      = 0;
+    fHistJetPtScvsTrackPt[i]      = 0;
     fHistRawJetPtvsTrackPt[i]   = 0;
     fHistTrackPt[i]             = 0;
     fHistEP0[i]                 = 0;
@@ -73,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;
    }
@@ -87,12 +95,12 @@ 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);
+  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;
   TString title;
-  for (Int_t i = 0;i<6;++i){
+  for (Int_t i = 0;i<7;++i){
     name = TString(Form("JetPtvsTrackPt_%i",i));
     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);
@@ -159,6 +167,7 @@ void AliAnalysisTaskEmcalJetSpectraMECpA::UserCreateOutputObjects()
 
   
   fOutput->Add(fHistRhovsCent);
+  fOutput->Add(fHistRhoScvsCent);
   fOutput->Add(fHistNjetvsCent);
   
    PostData(1, fOutput);
@@ -181,7 +190,7 @@ Int_t AliAnalysisTaskEmcalJetSpectraMECpA::GetCentBin(Double_t cent) const
     centbin = 3;
   else if (cent>=40 && cent<50)
     centbin = 4;
-  else if (cent>=50 && cent<90)
+  else if (cent>=50 && cent<101)
     centbin = 5;
   return centbin;
 }
@@ -210,21 +219,24 @@ Bool_t AliAnalysisTaskEmcalJetSpectraMECpA::Run()
   Int_t centbin = GetCentBin(fCent);
   //for pp analyses we will just use the first centrality bin
   if (centbin == -1)
-    centbin = 0;
+    centbin = 6;
 
-  if (!fTracks){
-    cout << "Tracks not found: " << fCent << endl;
-    return kTRUE;
-  }
+  //if (!fTracks){
+  //cout << "Tracks not found: " << fCent << endl;
+  //return kTRUE;
+  //}
   
-  const Int_t nTrack = fTracks->GetEntriesFast();
-  for (int i = 0;i<nTrack;i++){
-    AliVParticle *track = static_cast<AliVParticle*>(fTracks->At(i));
-    if (!track)
-      continue;
-    fHistTrackPt[centbin]->Fill(track->Pt());
+  if (fTracks){
+    const Int_t nTrack = fTracks->GetEntriesFast();
+    for (int i = 0;i<nTrack;i++){
+      AliVParticle *track = static_cast<AliVParticle*>(fTracks->At(i));
+      if (!track)
+	continue;
+      fHistTrackPt[centbin]->Fill(track->Pt());
+    }
   }
 
+
   fHistEP0[centbin]->Fill(fEPV0);
   fHistEP0A[centbin]->Fill(fEPV0A);
   fHistEP0C[centbin]->Fill(fEPV0C);
@@ -233,7 +245,6 @@ Bool_t AliAnalysisTaskEmcalJetSpectraMECpA::Run()
   fRho = GetRhoFromEvent(fRhoName);
   fRhoVal = fRho->GetVal();
   fHistRhovsCent->Fill(fCent,fRhoVal);
-  fHistRhovsCent->Fill(fCent,fRhoVal);
   fHistRhovsEP[centbin]->Fill(fRhoVal,fEPV0);
 
   
@@ -241,11 +252,10 @@ Bool_t AliAnalysisTaskEmcalJetSpectraMECpA::Run()
   fRhoScaledName.Append("_Scaled");
   Double_t fRhoScVal = 0;
   AliRhoParameter *fRhoScaled=GetRhoFromEvent(fRhoScaledName);
+
   if(fRhoScaled){
     fRhoScVal=fRhoScaled->GetVal();
-    if(fRhoScVal){
-      fHistRhoScvsCent->Fill(fCent,fRhoScVal);
-    }
+    fHistRhoScvsCent->Fill(fCent,fRhoScVal);
   }
   const Int_t Njets = fJets->GetEntriesFast();
 
@@ -267,14 +277,17 @@ Bool_t AliAnalysisTaskEmcalJetSpectraMECpA::Run()
      Double_t jetPt = -500;
      jetPt = jet->Pt()-jet->Area()*fRhoVal;    
      fHistJetPtvsTrackPt[centbin]->Fill(jetPt,jet->MaxTrackPt());
+     if(centbin<6) fHistJetPtvsTrackPt[6]->Fill(jetPt,jet->MaxTrackPt());
 
      if(fRhoScVal) {
        Double_t jetPtSc = -500;
        jetPtSc = jet->Pt()-jet->Area()*fRhoScVal;    
        fHistJetPtScvsTrackPt[centbin]->Fill(jetPtSc,jet->MaxTrackPt());
+       if(centbin<6) fHistJetPtScvsTrackPt[6]->Fill(jetPtSc,jet->MaxTrackPt());
      }
 
      fHistRawJetPtvsTrackPt[centbin]->Fill(jet->Pt(),jet->MaxTrackPt());
+     if(centbin<6) fHistRawJetPtvsTrackPt[6]->Fill(jet->Pt(),jet->MaxTrackPt());
 
      fHistJetPtEtaPhi[centbin]->Fill(jet->Pt(),jet->Eta(),jet->Phi());