updates salvatore

diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAJF.cxx b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAJF.cxx
index 8f604635dc3e1cc195e7eeb27691c80c625c16ee..fb3ae555826791414b29a70589f10bbe52099ec2 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAJF.cxx
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAJF.cxx
@@ -443,21 +443,18 @@ Bool_t AliAnalysisTaskSAJF::FillHistograms()
 
   GetLeadingJets(maxJetIndex, max2JetIndex);
   
-  if (fSkipEventsWithNoJets && maxJetIndex < 0) {
+  if (maxJetIndex < 0) {
     fHistRejectedEvents->Fill("No jets", 1);
     return kFALSE;
   }
 
   AliEmcalJet* jet = dynamic_cast<AliEmcalJet*>(fJets->At(maxJetIndex));
-  if (fSkipEventsWithNoJets && !jet) {
+  if (!jet) {
     fHistRejectedEvents->Fill("Max Jet not found", 1);
     return kFALSE;
   }
 
-  Float_t maxJetCorrPt = 0; 
-
-  if (jet)
-    maxJetCorrPt = jet->Pt() - fRho * jet->Area();
+  Float_t maxJetCorrPt = jet->Pt() - fRho * jet->Area();
 
   if (fSkipEventsWithNoJets && maxJetCorrPt <= 0) {
     fHistRejectedEvents->Fill("Max Jet <= 0", 1);
@@ -594,7 +591,7 @@ void AliAnalysisTaskSAJF::GetLeadingJets(Int_t &maxJetIndex, Int_t &max2JetIndex
       continue;
     }  
 
-    if (!AcceptJet(jet))
+    if (!AcceptJet(jet, fSkipEventsWithNoJets))
       continue;
 
     Float_t corrPt = jet->Pt() - fRho * jet->Area();
@@ -631,7 +628,7 @@ void AliAnalysisTaskSAJF::DoJetLoop()
       continue;
     }  
 
-    if (!AcceptJet(jet, kFALSE))
+    if (!AcceptJet(jet, fSkipEventsWithNoJets))
       continue;
 
     Float_t corrPt = jet->Pt() - fRho * jet->Area();

diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAJF.h b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAJF.h
index 9a61813f9ec7e5b0aa3b9373bd510aa6b86f8914..f3c4b9b2ebd9a40ee3c0e06609dce87db03bec32 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAJF.h
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAJF.h
@@ -97,6 +97,6 @@ class AliAnalysisTaskSAJF : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskSAJF(const AliAnalysisTaskSAJF&);            // not implemented
   AliAnalysisTaskSAJF &operator=(const AliAnalysisTaskSAJF&); // not implemented
 
-  ClassDef(AliAnalysisTaskSAJF, 6) // jet analysis task
+  ClassDef(AliAnalysisTaskSAJF, 7) // jet analysis task
 };
 #endif

diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.cxx b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.cxx
index 1a1f4426e2d3fe57349a4281e2ddab7308bffbba..8599b0b0a3069ea7148ff632e18708a4c2edd193 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.cxx
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.cxx
@@ -43,7 +43,6 @@ AliAnalysisTaskSAQA::AliAnalysisTaskSAQA() :
   fHistClustersEnergy(0),
   fHistClusPhiEta(0),
   fHistJetsPhiEta(0),
-  fHistJetsPtArea(0),
   fHistCellsEnergy(0),
   fHistChVSneCells(0),
   fHistChVSneClus(0),
@@ -60,6 +59,7 @@ AliAnalysisTaskSAQA::AliAnalysisTaskSAQA() :
     fHistJetsPtTrack[i] = 0;
     fHistJetsPtClus[i] = 0;
     fHistJetsPt[i] = 0;
+    fHistJetsPtArea[i] = 0;
   }
 }
 
@@ -82,7 +82,6 @@ AliAnalysisTaskSAQA::AliAnalysisTaskSAQA(const char *name) :
   fHistClustersEnergy(0),
   fHistClusPhiEta(0),
   fHistJetsPhiEta(0),
-  fHistJetsPtArea(0),
   fHistCellsEnergy(0),
   fHistChVSneCells(0),
   fHistChVSneClus(0),
@@ -99,6 +98,7 @@ AliAnalysisTaskSAQA::AliAnalysisTaskSAQA(const char *name) :
     fHistJetsPtTrack[i] = 0;
     fHistJetsPtClus[i] = 0;
     fHistJetsPt[i] = 0;
+    fHistJetsPtArea[i] = 0;
   }
 }
 
@@ -183,11 +183,6 @@ void AliAnalysisTaskSAQA::UserCreateOutputObjects()
   fHistJetsPhiEta->GetYaxis()->SetTitle("#phi");
   fOutput->Add(fHistJetsPhiEta);
 
-  fHistJetsPtArea = new TH2F("fHistJetsPtArea","p_{T} vs. area of reconstructed jets", fNbins, fMinBinPt, fMaxBinPt, 20, 0, fJetRadius * fJetRadius * TMath::Pi() * 1.5);
-  fHistJetsPtArea->GetXaxis()->SetTitle("p_{T} [GeV/c]");
-  fHistJetsPtArea->GetYaxis()->SetTitle("area");
-  fOutput->Add(fHistJetsPtArea);
-
   if (fAnaType == kEMCAL) {
    
     fHistCellsEnergy = new TH1F("fHistCellsEnergy","Energy spectrum of cells", fNbins, fMinBinPt, fMaxBinPt);
@@ -195,17 +190,20 @@ void AliAnalysisTaskSAQA::UserCreateOutputObjects()
     fHistCellsEnergy->GetYaxis()->SetTitle("counts");
     fOutput->Add(fHistCellsEnergy);
     
-    fHistChVSneCells = new TH2F("fHistChVSneCells","Charged energy vs. neutral (cells) energy", fNbins, fMinBinPt * 4, fMaxBinPt * 4, fNbins, fMinBinPt * 4, fMaxBinPt * 4);
+    fHistChVSneCells = new TH2F("fHistChVSneCells","Charged energy vs. neutral (cells) energy", 
+                               fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5, fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5);
     fHistChVSneCells->GetXaxis()->SetTitle("E [GeV]");
     fHistChVSneCells->GetYaxis()->SetTitle("P [GeV/c]");
     fOutput->Add(fHistChVSneCells);
     
-    fHistChVSneClus = new TH2F("fHistChVSneClus","Charged energy vs. neutral (clusters) energy", fNbins, fMinBinPt * 4, fMaxBinPt * 4, fNbins, fMinBinPt * 4, fMaxBinPt * 4);
+    fHistChVSneClus = new TH2F("fHistChVSneClus","Charged energy vs. neutral (clusters) energy", 
+                              fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5, fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5);
     fHistChVSneClus->GetXaxis()->SetTitle("E [GeV]");
     fHistChVSneClus->GetYaxis()->SetTitle("P [GeV/c]");
     fOutput->Add(fHistChVSneClus);
     
-    fHistChVSneCorrCells = new TH2F("fHistChVSneCorrCells","Charged energy vs. neutral (corrected cells) energy", fNbins, fMinBinPt * 4, fMaxBinPt * 4, fNbins, fMinBinPt * 4, fMaxBinPt * 4);
+    fHistChVSneCorrCells = new TH2F("fHistChVSneCorrCells","Charged energy vs. neutral (corrected cells) energy", 
+                                   fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5, fNbins * 2.5, fMinBinPt , fMaxBinPt * 2.5);
     fHistChVSneCorrCells->GetXaxis()->SetTitle("E [GeV]");
     fHistChVSneCorrCells->GetYaxis()->SetTitle("P [GeV/c]");
     fOutput->Add(fHistChVSneCorrCells);
@@ -239,28 +237,35 @@ void AliAnalysisTaskSAQA::UserCreateOutputObjects()
   TString histname;
 
   for (Int_t i = 0; i < 4; i++) {
-    if (fAnaType == kEMCAL) {
-      histname = "fHistJetsPtClus_";
-      histname += i;
-      fHistJetsPtClus[i] = new TH1F(histname.Data(), histname.Data(), fNbins, fMinBinPt, fMaxBinPt * 2.5);
-      fHistJetsPtClus[i]->GetXaxis()->SetTitle("p_{T} [GeV/c]");
-      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 = "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]);
 
     histname = "fHistJetsPtTrack_";
     histname += i;
-    fHistJetsPtTrack[i] = new TH1F(histname.Data(), histname.Data(), fNbins, fMinBinPt, fMaxBinPt * 2.5);
+    fHistJetsPtTrack[i] = new TH1F(histname.Data(), histname.Data(), fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5);
     fHistJetsPtTrack[i]->GetXaxis()->SetTitle("p_{T} [GeV/c]");
     fHistJetsPtTrack[i]->GetYaxis()->SetTitle("counts");
     fOutput->Add(fHistJetsPtTrack[i]);
 
-    histname = "fHistJetsPt_";
-    histname += i;
-    fHistJetsPt[i] = new TH1F(histname.Data(), histname.Data(), fNbins, fMinBinPt, fMaxBinPt * 2.5);
-    fHistJetsPt[i]->GetXaxis()->SetTitle("p_{T} [GeV/c]");
-    fHistJetsPt[i]->GetYaxis()->SetTitle("counts");
-    fOutput->Add(fHistJetsPt[i]);
+    if (fAnaType == kEMCAL) {
+      histname = "fHistJetsPtClus_";
+      histname += i;
+      fHistJetsPtClus[i] = new TH1F(histname.Data(), histname.Data(), fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5);
+      fHistJetsPtClus[i]->GetXaxis()->SetTitle("p_{T} [GeV/c]");
+      fHistJetsPtClus[i]->GetYaxis()->SetTitle("counts");
+      fOutput->Add(fHistJetsPtClus[i]);
+    }
   }
 
   PostData(1, fOutput); // Post data for ALL output slots >0 here, to get at least an empty histogram
@@ -468,6 +473,7 @@ void AliAnalysisTaskSAQA::DoJetLoop()
       continue;
 
     fHistJetsPt[fCentBin]->Fill(jet->Pt());
+    fHistJetsPtArea[fCentBin]->Fill(jet->Pt(), jet->Area());
 
     if (jet->MaxTrackPt() > fPtBiasJetTrack)
       fHistJetsPtTrack[fCentBin]->Fill(jet->Pt());
@@ -475,7 +481,6 @@ void AliAnalysisTaskSAQA::DoJetLoop()
     if (fAnaType == kEMCAL && jet->MaxClusterPt() > fPtBiasJetClus)
       fHistJetsPtClus[fCentBin]->Fill(jet->Pt());
     
-    fHistJetsPtArea->Fill(jet->Pt(), jet->Area());
     fHistJetsPhiEta->Fill(jet->Eta(), jet->Phi());
   }
 }

diff --git a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.h b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.h
index 4fbe5003a3361c523d7c7187243204cd8a0fcc6c..51c396989e5cf492731a8963ac8a1a72e0e43d4c 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.h
+++ b/PWGGA/EMCALJetTasks/AliAnalysisTaskSAQA.h
@@ -54,7 +54,7 @@ class AliAnalysisTaskSAQA : public AliAnalysisTaskEmcalJet {
   TH1F                       *fHistClustersEnergy;     //!Energy spectrum of clusters
   TH2F                       *fHistClusPhiEta;         //!Phi-Eta distribution of clusters
   TH2F                       *fHistJetsPhiEta;         //!Phi-Eta distribution of jets
-  TH2F                       *fHistJetsPtArea;         //!Pt vs. area 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
@@ -72,6 +72,6 @@ class AliAnalysisTaskSAQA : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskSAQA(const AliAnalysisTaskSAQA&);            // not implemented
   AliAnalysisTaskSAQA &operator=(const AliAnalysisTaskSAQA&); // not implemented
 
-  ClassDef(AliAnalysisTaskSAQA, 6) // Quality task for Emcal analysis
+  ClassDef(AliAnalysisTaskSAQA, 7) // Quality task for Emcal analysis
 };
 #endif