AliAnalysisTaskEmcalJetDev: make jet container getters public; fix minor bug when...

AliJetResponseMaker: fix bug that was causing the task to crash when the rho parameter is given

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.cxx b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.cxx
index ffe5ba51ea5124d58472a7cd1df2b9c4e7806528..0fd0e8c7f57fd900233234d490a00d83896c4f02 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.cxx
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.cxx
@@ -289,7 +289,7 @@ AliJetContainer* AliAnalysisTaskEmcalJetDev::AddJetContainer(const char *n, TStr
 AliJetContainer* AliAnalysisTaskEmcalJetDev::GetJetContainer(Int_t i) const{
   // Get i^th jet container
 
-  if(i<0 || i>fJetCollArray.GetEntriesFast()) return 0;
+  if(i<0 || i>=fJetCollArray.GetEntriesFast()) return 0;
   AliJetContainer *cont = static_cast<AliJetContainer*>(fJetCollArray.At(i));
   return cont;
 }
@@ -297,7 +297,7 @@ AliJetContainer* AliAnalysisTaskEmcalJetDev::GetJetContainer(Int_t i) const{
 //________________________________________________________________________
 AliJetContainer* AliAnalysisTaskEmcalJetDev::GetJetContainer(const char* name) const{
   // Get the jet container with name
-
+  
   AliJetContainer *cont = static_cast<AliJetContainer*>(fJetCollArray.FindObject(name));
   return cont;
 }

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.h b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.h
index 865b6816eb4c4b2bed6ef4b384ea4ed893e6e27b..a09bef149b11e4c39e0514d187d28ffda29ed0be 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.h
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.h
@@ -51,7 +51,9 @@ class AliAnalysisTaskEmcalJetDev : public AliAnalysisTaskEmcalDev {
   const TString&      GetRhoName(Int_t c = 0) const;
 
   AliJetContainer    *AddJetContainer(const char *n, TString defaultCutType = "", Float_t jetRadius = 0.4);
-  void                RemoveJetContainer(Int_t i)                  { fJetCollArray.RemoveAt(i);} 
+  void                RemoveJetContainer(Int_t i)                        { fJetCollArray.RemoveAt(i);} 
+  AliJetContainer    *GetJetContainer(Int_t i=0)                                               const;
+  AliJetContainer    *GetJetContainer(const char* name)                                        const;
 
  protected:
   Float_t*                    GenerateFixedBinArray(Int_t n, Float_t min, Float_t max) const;
@@ -66,8 +68,6 @@ class AliAnalysisTaskEmcalJetDev : public AliAnalysisTaskEmcalDev {
   Bool_t                      IsJetCluster(AliEmcalJet* jet, Int_t iclus, Bool_t sorted = kFALSE)      const;
   Bool_t                      RetrieveEventObjects()                                                        ;
   Double_t                    GetJetRadius(Int_t i=0)                                                  const;
-  AliJetContainer            *GetJetContainer(Int_t i=0)                                               const;
-  AliJetContainer            *GetJetContainer(const char* name)                                        const;
   TClonesArray               *GetJetArray(Int_t i=0)                                                   const;
   AliEmcalJet                *GetJetFromArray(Int_t j, Int_t c=0)                                      const;
   AliEmcalJet                *GetAcceptJetFromArray(Int_t j, Int_t c=0)                                const;

diff --git a/PWGJE/EMCALJetTasks/AliJetResponseMaker.cxx b/PWGJE/EMCALJetTasks/AliJetResponseMaker.cxx
index 01a4e3ebce6ad071c8bd08f01352352af5d36e72..6e5924a09987b965e4377a516e68648a33cebb10 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetResponseMaker.cxx
+++ b/PWGJE/EMCALJetTasks/AliJetResponseMaker.cxx
@@ -227,7 +227,7 @@ void AliJetResponseMaker::AllocateTH2()
   fHistJets1PtArea->GetZaxis()->SetTitle("counts");
   fOutput->Add(fHistJets1PtArea);
  
-  if (!fIsJet1Rho) {
+  if (fIsJet1Rho) {
     fHistJets1CorrPtArea = new TH2F("fHistJets1CorrPtArea", "fHistJets1CorrPtArea", 
                                    fNbins/2, 0, 1.5, 2*fNbins, -fMaxBinPt, fMaxBinPt);
     fHistJets1CorrPtArea->GetXaxis()->SetTitle("area");
@@ -267,7 +267,7 @@ void AliJetResponseMaker::AllocateTH2()
   fHistJets2PtArea->GetZaxis()->SetTitle("counts");
   fOutput->Add(fHistJets2PtArea);
 
-  if (!fIsJet2Rho) {
+  if (fIsJet2Rho) {
     fHistJets2CorrPtArea = new TH2F("fHistJets2CorrPtArea", "fHistJets2CorrPtArea", 
                                    fNbins/2, 0, 1.5, 2*fNbins, -fMaxBinPt, fMaxBinPt);
     fHistJets2CorrPtArea->GetXaxis()->SetTitle("area");
@@ -288,7 +288,7 @@ void AliJetResponseMaker::AllocateTH2()
   fHistJets2PtAreaAcceptance->GetZaxis()->SetTitle("counts");
   fOutput->Add(fHistJets2PtAreaAcceptance);
 
-  if (!fIsJet2Rho) {
+  if (fIsJet2Rho) {
     fHistJets2CorrPtAreaAcceptance = new TH2F("fHistJets2CorrPtAreaAcceptance", "fHistJets2CorrPtAreaAcceptance", 
                                              fNbins/2, 0, 1.5, 2*fNbins, -fMaxBinPt, fMaxBinPt);
     fHistJets2CorrPtAreaAcceptance->GetXaxis()->SetTitle("area");