updates from Salvatore

diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.cxx b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.cxx
index 8599b0b0a3069ea7148ff632e18708a4c2edd193..7a2bb352b858c721e47f9781cd6188799ea19a70 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.cxx
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.cxx
@@ -26,7 +26,7 @@ ClassImp(AliAnalysisTaskSAQA)
 
 //________________________________________________________________________
 AliAnalysisTaskSAQA::AliAnalysisTaskSAQA() : 
-  AliAnalysisTaskEmcalJet("AliAnalysisTaskSAQA"),
+  AliAnalysisTaskEmcalJet("AliAnalysisTaskSAQA", kTRUE),
   fCellEnergyCut(0.1),
   fDoTrigger(kFALSE),
   fTrgClusName("ClustersL1GAMMAFEE"),
@@ -56,16 +56,18 @@ AliAnalysisTaskSAQA::AliAnalysisTaskSAQA() :
   }
 
   for (Int_t i = 0; i < 4; i++) {
+    fHistJetsPtNonBias[i] = 0;
     fHistJetsPtTrack[i] = 0;
     fHistJetsPtClus[i] = 0;
     fHistJetsPt[i] = 0;
     fHistJetsPtArea[i] = 0;
+    fHistJetsPtAreaNonBias[i] = 0;
   }
 }
 
 //________________________________________________________________________
 AliAnalysisTaskSAQA::AliAnalysisTaskSAQA(const char *name) : 
-  AliAnalysisTaskEmcalJet(name),
+  AliAnalysisTaskEmcalJet(name, kTRUE),
   fCellEnergyCut(0.1),
   fDoTrigger(kFALSE),
   fTrgClusName("ClustersL1GAMMAFEE"),
@@ -95,10 +97,12 @@ AliAnalysisTaskSAQA::AliAnalysisTaskSAQA(const char *name) :
   }
 
   for (Int_t i = 0; i < 4; i++) {
+    fHistJetsPtNonBias[i] = 0;
     fHistJetsPtTrack[i] = 0;
     fHistJetsPtClus[i] = 0;
     fHistJetsPt[i] = 0;
     fHistJetsPtArea[i] = 0;
+    fHistJetsPtAreaNonBias[i] = 0;
   }
 }
 
@@ -237,19 +241,12 @@ void AliAnalysisTaskSAQA::UserCreateOutputObjects()
   TString histname;
 
   for (Int_t i = 0; i < 4; i++) {
-    histname = "fHistJetsPt_";
+    histname = "fHistJetsPtNonBias_";
     histname += i;
-    fHistJetsPt[i] = new TH1F(histname.Data(), histname.Data(), fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5);
-    fHistJetsPt[i]->GetXaxis()->SetTitle("p_{T} [GeV/c]");
-    fHistJetsPt[i]->GetYaxis()->SetTitle("counts");
-    fOutput->Add(fHistJetsPt[i]);
-
-    histname = "fHistJetsPtArea_";
-    histname += i;
-    fHistJetsPtArea[i] = new TH2F(histname.Data(), histname.Data(), fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5, 20, 0, fJetRadius * fJetRadius * TMath::Pi() * 1.5);
-    fHistJetsPtArea[i]->GetXaxis()->SetTitle("p_{T} [GeV/c]");
-    fHistJetsPtArea[i]->GetYaxis()->SetTitle("area");
-    fOutput->Add(fHistJetsPtArea[i]);
+    fHistJetsPtNonBias[i] = new TH1F(histname.Data(), histname.Data(), fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5);
+    fHistJetsPtNonBias[i]->GetXaxis()->SetTitle("p_{T} [GeV/c]");
+    fHistJetsPtNonBias[i]->GetYaxis()->SetTitle("counts");
+    fOutput->Add(fHistJetsPtNonBias[i]);
 
     histname = "fHistJetsPtTrack_";
     histname += i;
@@ -266,6 +263,27 @@ void AliAnalysisTaskSAQA::UserCreateOutputObjects()
       fHistJetsPtClus[i]->GetYaxis()->SetTitle("counts");
       fOutput->Add(fHistJetsPtClus[i]);
     }
+
+    histname = "fHistJetsPt_";
+    histname += i;
+    fHistJetsPt[i] = new TH1F(histname.Data(), histname.Data(), fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5);
+    fHistJetsPt[i]->GetXaxis()->SetTitle("p_{T} [GeV/c]");
+    fHistJetsPt[i]->GetYaxis()->SetTitle("counts");
+    fOutput->Add(fHistJetsPt[i]);
+
+    histname = "fHistJetsPtAreaNonBias_";
+    histname += i;
+    fHistJetsPtAreaNonBias[i] = new TH2F(histname.Data(), histname.Data(), fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5, 20, 0, fJetRadius * fJetRadius * TMath::Pi() * 1.5);
+    fHistJetsPtAreaNonBias[i]->GetXaxis()->SetTitle("p_{T} [GeV/c]");
+    fHistJetsPtAreaNonBias[i]->GetYaxis()->SetTitle("area");
+    fOutput->Add(fHistJetsPtAreaNonBias[i]);
+
+    histname = "fHistJetsPtArea_";
+    histname += i;
+    fHistJetsPtArea[i] = new TH2F(histname.Data(), histname.Data(), fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5, 20, 0, fJetRadius * fJetRadius * TMath::Pi() * 1.5);
+    fHistJetsPtArea[i]->GetXaxis()->SetTitle("p_{T} [GeV/c]");
+    fHistJetsPtArea[i]->GetYaxis()->SetTitle("area");
+    fOutput->Add(fHistJetsPtArea[i]);
   }
 
   PostData(1, fOutput); // Post data for ALL output slots >0 here, to get at least an empty histogram
@@ -472,8 +490,8 @@ void AliAnalysisTaskSAQA::DoJetLoop()
     if (!AcceptJet(jet, kFALSE))
       continue;
 
-    fHistJetsPt[fCentBin]->Fill(jet->Pt());
-    fHistJetsPtArea[fCentBin]->Fill(jet->Pt(), jet->Area());
+    fHistJetsPtNonBias[fCentBin]->Fill(jet->Pt());
+    fHistJetsPtAreaNonBias[fCentBin]->Fill(jet->Pt(), jet->Area());
 
     if (jet->MaxTrackPt() > fPtBiasJetTrack)
       fHistJetsPtTrack[fCentBin]->Fill(jet->Pt());
@@ -481,6 +499,12 @@ void AliAnalysisTaskSAQA::DoJetLoop()
     if (fAnaType == kEMCAL && jet->MaxClusterPt() > fPtBiasJetClus)
       fHistJetsPtClus[fCentBin]->Fill(jet->Pt());
     
+    if (!AcceptBiasJet(jet))
+      continue;
+
+    fHistJetsPt[fCentBin]->Fill(jet->Pt());
+    fHistJetsPtArea[fCentBin]->Fill(jet->Pt(), jet->Area());
+
     fHistJetsPhiEta->Fill(jet->Eta(), jet->Phi());
   }
 }

diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.h b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.h
index 51c396989e5cf492731a8963ac8a1a72e0e43d4c..0ce4a44bd52c7f4fad58e7eeede61281e7bf87f3 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.h
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.h
@@ -48,16 +48,18 @@ class AliAnalysisTaskSAQA : public AliAnalysisTaskEmcalJet {
   TH2F                       *fHistMaxL1ClusCent;      //!Maximum L1 trigger cluster amplitude vs. centrality
   TH2F                       *fHistMaxL1ThrCent;       //!Maximum L1 trigger threshold vs. centrality
  
-  TH1F                       *fHistTracksPt;           //!Pt spectrum of tracks
-  TH2F                       *fHistTrPhiEta;           //!Phi-Eta distribution of tracks
-  TH2F                       *fHistTrEmcPhiEta;        //!Phi-Eta emcal distribution of tracks
-  TH1F                       *fHistClustersEnergy;     //!Energy spectrum of clusters
-  TH2F                       *fHistClusPhiEta;         //!Phi-Eta distribution of clusters
-  TH2F                       *fHistJetsPhiEta;         //!Phi-Eta distribution of jets
-  TH2F                       *fHistJetsPtArea[4];      //!Pt vs. area of jets
-  TH1F                       *fHistJetsPtClus[4];      //!Inclusive jet pt spectrum cluster biased
-  TH1F                       *fHistJetsPtTrack[4];     //!Inclusive jet pt spectrum track biased
-  TH1F                       *fHistJetsPt[4];          //!Non biased inclusive jet pt spectrum
+  TH1F                       *fHistTracksPt;             //!Pt spectrum of tracks
+  TH2F                       *fHistTrPhiEta;             //!Phi-Eta distribution of tracks
+  TH2F                       *fHistTrEmcPhiEta;          //!Phi-Eta emcal distribution of tracks
+  TH1F                       *fHistClustersEnergy;       //!Energy spectrum of clusters
+  TH2F                       *fHistClusPhiEta;           //!Phi-Eta distribution of clusters
+  TH2F                       *fHistJetsPhiEta;           //!Phi-Eta distribution of jets
+  TH1F                       *fHistJetsPtNonBias[4];     //!Non biased inclusive jet pt spectrum
+  TH1F                       *fHistJetsPtClus[4];        //!Inclusive jet pt spectrum cluster biased
+  TH1F                       *fHistJetsPtTrack[4];       //!Inclusive jet pt spectrum track biased
+  TH1F                       *fHistJetsPt[4];            //!Biased inclusive jet pt spectrum
+  TH2F                       *fHistJetsPtAreaNonBias[4]; //!Non biased pt vs. area of jets
+  TH2F                       *fHistJetsPtArea[4];        //!Biased pt vs. area of jets
 
   TH1F                       *fHistCellsEnergy;        //!Energy spectrum of cells